Package: stk
Version: 4.2.0-9
Severity: normal
Tags: patch
Hi,
Attached is the diff for my stk 4.2.0-9.1 NMU, uploaded to DELAYED/2.
--
| Lucas Nussbaum
| [EMAIL PROTECTED] http://www.lucas-nussbaum.net/ |
| jabber: [EMAIL PROTECTED] GPG: 1024D/023B3F4F |
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-9.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/rules: fixed bashism (use of {,}). Closes: #378528.
+ * Fixed FTBFS with gcc 4.3 (patch from Martin Michlmayr added
+ as 01_includes_gcc43.patch). Closes: #417704.
+ * Fixed debian/watch to read
+ http://ccrma.stanford.edu/software/stk/download.html instead of directly
+ trying to list the content of
+ http://ccrma.stanford.edu/software/stk/release/. Closes: #449826.
+ * Investigated FTBFS when built twice in a row. It was actually caused
+ by cdbs' bug #387103, fixed in cdbs 0.4.48. I'm not build-depending
+ on cdbs >= 0.4.48 since this bug doesn't prevent to build the package.
+ Closes: #424233.
+
+ -- Lucas Nussbaum <[EMAIL PROTECTED]> Wed, 16 Jan 2008 12:10:29 +0100
+
stk (4.2.0-9) unstable; urgency=low
* acknowledged NMU
diff -u stk-4.2.0/debian/rules stk-4.2.0/debian/rules
--- stk-4.2.0/debian/rules
+++ stk-4.2.0/debian/rules
@@ -7,7 +7,7 @@
# config.status in the upstream source is in our way. remove it
post-patches:: pre-build
- cp /usr/share/misc/config.{guess,sub} $(DEB_BUILDDIR)
+ cp /usr/share/misc/config.guess /usr/share/misc/config.sub $(DEB_BUILDDIR)
-rm $(DEB_BUILDDIR)/config.status
include /usr/share/cdbs/1/rules/tarball.mk
diff -u stk-4.2.0/debian/watch stk-4.2.0/debian/watch
--- stk-4.2.0/debian/watch
+++ stk-4.2.0/debian/watch
@@ -2 +2,2 @@
-http://www-ccrma.stanford.edu/software/stk/release/stk-(.*)\.tar\.gz
+
+http://ccrma.stanford.edu/software/stk/download.html .*/stk-(.*)\.tar\.gz
only in patch2:
unchanged:
--- stk-4.2.0.orig/debian/patches/01_includes_gcc43.patch
+++ stk-4.2.0/debian/patches/01_includes_gcc43.patch
@@ -0,0 +1,12 @@
+diff -Nur stk-4.2.0.old/src/RtAudio.cpp stk-4.2.0/src/RtAudio.cpp
+--- stk-4.2.0.old/src/RtAudio.cpp 2004-10-04 03:24:40.000000000 +0200
++++ stk-4.2.0/src/RtAudio.cpp 2008-01-16 11:59:02.000000000 +0100
+@@ -41,6 +41,8 @@
+
+ #include "RtAudio.h"
+ #include <iostream>
++#include <cstdlib>
++#include <climits>
+ #include <stdio.h>
+
+ // Static variable definitions.
