Hi Kumar,
I've slightly modified Martin's original patch to apply and did apply your
upload patch, attached.
The package now builds, please tell me if I can go ahead and sign/do the
upload.
thanks,
filippo
--
Filippo Giunchedi - http://esaurito.net - 0x6B79D401
Man was made at the end of the week's work when God was tired.
-- Mark Twain
diff -u stk-4.2.0/debian/changelog stk-4.2.0/debian/changelog
--- stk-4.2.0/debian/changelog
+++ stk-4.2.0/debian/changelog
@@ -1,3 +1,20 @@
+stk (4.2.0-10) unstable; urgency=low
+
+ * QA upload.
+ * Include patch from Martin Michlmayr to fix FTBFS with GCC 4.4.
+ (Closes: #504965)
+ * debian/control:
+ + Make QA the maintainer.
+ + Standards Version now 3.8.4 (No changes needed).
+ + Add Homepage field.
+ + Add ${misc:Depends} to all packages.
+ + Build-Depend on debhelper 5 and bump compat to 5.
+ + Add ${binary:Version} to libstk dependencies.
+ * debian/copyright: Add (C) to copyright.
+ * debian/stk.menu: Move to Applications category
+
+ -- Kumar Appaiah <aku...@debian.org> Sat, 30 Jan 2010 23:53:35 -0600
+
stk (4.2.0-9.2) unstable; urgency=medium
* Non-maintainer upload.
diff -u stk-4.2.0/debian/copyright stk-4.2.0/debian/copyright
--- stk-4.2.0/debian/copyright
+++ stk-4.2.0/debian/copyright
@@ -7,5 +7,6 @@
-Copyright:
- This software was designed and created to be made publicly available for free, primarily for academic purposes, so if you use it, pass it on with this
- documentation, and for free.
+Copyright (C) Perry Cook and Gary P. Scavone
+ This software was designed and created to be made publicly available
+ for free, primarily for academic purposes, so if you use it, pass it
+ on with this documentation, and for free.
diff -u stk-4.2.0/debian/compat stk-4.2.0/debian/compat
--- stk-4.2.0/debian/compat
+++ stk-4.2.0/debian/compat
@@ -1 +1 @@
-4
+5
diff -u stk-4.2.0/debian/control stk-4.2.0/debian/control
--- stk-4.2.0/debian/control
+++ stk-4.2.0/debian/control
@@ -1,13 +1,14 @@
Source: stk
Section: sound
Priority: optional
-Maintainer: Guenter Geiger (Debian/GNU) <gei...@debian.org>
-Build-Depends: debhelper (>= 4.0.0), cdbs, libasound2-dev, libjack0.100.0-dev, libreadline5-dev, autotools-dev, autoconf
-Standards-Version: 3.7.2
+Maintainer: Debian QA Group <packa...@qa.debian.org>
+Build-Depends: debhelper (>= 5.0.0), cdbs, libasound2-dev, libjack0.100.0-dev, libreadline5-dev, autotools-dev, autoconf
+Standards-Version: 3.8.4
+Homepage: http://ccrma.stanford.edu/software/stk/
Package: libstk0-dev
Architecture: any
-Depends: libstk0c2a
+Depends: libstk0c2a (= ${binary:Version}), ${misc:Depends}
Description: sound synthesis toolkit development files
This package provides the development files for the sound synthesis toolkit.
If you want to develop with the sound synthesis toolkit you need these
@@ -17,7 +18,7 @@
Conflicts: libstk0, libstk0c2
Replaces: libstk0, libstk0c2
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Sound Synthesis Toolkit
The Sound Synthesis Toolkit is a C++ library with implementations
of several sound synthesis algorithms, starting from Frequency
@@ -26,15 +27,14 @@
Package: stk
Architecture: any
-Depends: libstk0c2a, tk8.4, ${shlibs:Depends}
+Depends: libstk0c2a (= ${binary:Version}), tk8.4, ${shlibs:Depends}, ${misc:Depends}
Description: Sound Synthesis Toolkit example applications
The example applications and synthesisers that come with the sound
synthesis toolkit.
- .
- Homepage: http://ccrma.stanford.edu/software/stk/
Package: stk-doc
Architecture: all
+Depends: ${misc:Depends}
Description: documentation for the sound synthesis toolkit (STK)
This package contains the documentation for the sound synthesis
toolkit. The documentation is developer oriented and covers all
diff -u stk-4.2.0/debian/stk.menu stk-4.2.0/debian/stk.menu
--- stk-4.2.0/debian/stk.menu
+++ stk-4.2.0/debian/stk.menu
@@ -1,3 +1,3 @@
-?package(stk):needs="X11" section="Apps/Sound"\
+?package(stk):needs="X11" section="Applications/Sound"\
title="STKDemo" command="/usr/bin/STKDemo"
only in patch2:
unchanged:
--- stk-4.2.0.orig/debian/patches/02_gcc43_fix.patch
+++ stk-4.2.0/debian/patches/02_gcc43_fix.patch
@@ -0,0 +1,22 @@
+diff -Nur -x '*.orig' -x '*~' stk-4.2.0/build-tree/stk-4.2.0/src/WvIn.cpp stk-4.2.0.new/build-tree/stk-4.2.0/src/WvIn.cpp
+--- stk-4.2.0/src/WvIn.cpp 2010-02-06 21:50:42.596950440 +0100
++++ stk-4.2.0/src/WvIn.cpp 2010-02-06 21:51:22.698054690 +0100
+@@ -45,6 +45,7 @@
+ #include "WvIn.h"
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <cstdio>
+ #include <cstring>
+ #include <math.h>
+
+diff -Nur -x '*.orig' -x '*~' stk-4.2.0/build-tree/stk-4.2.0/src/WvOut.cpp stk-4.2.0.new/build-tree/stk-4.2.0/src/WvOut.cpp
+--- stk-4.2.0/src/WvOut.cpp 2010-02-06 21:50:42.596950440 +0100
++++ stk-4.2.0/src/WvOut.cpp 2010-02-06 21:51:52.977031107 +0100
+@@ -35,6 +35,7 @@
+
+ #include "WvOut.h"
+ #include <math.h>
++#include <cstdio>
+ #include <cstring>
+
+ const WvOut::FILE_TYPE WvOut :: WVOUT_RAW = 1;
