Dear maintainer,
I've prepared an NMU for zynaddsubfx (versioned as 2.4.0-1.2). The diff
is attached to this message.
Regards.
--
Alessio Treglia | www.alessiotreglia.com
Debian Developer | ales...@debian.org
Ubuntu Core Developer | quadris...@ubuntu.com
0FEC 59A5 E18E E04F 6D40 593B 45D4 8C7C DCFC 3FD0
diff -u zynaddsubfx-2.4.0/debian/changelog zynaddsubfx-2.4.0/debian/changelog
--- zynaddsubfx-2.4.0/debian/changelog
+++ zynaddsubfx-2.4.0/debian/changelog
@@ -1,3 +1,12 @@
+zynaddsubfx (2.4.0-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/patches/{05_partui,06_bankui,09_fluid_1.3}.patch:
+ - Fluid 1.3.x no longer produces empty implementations for totally
+ empty functions in .fl files, fix FTBFS (Closes: #633478)
+
+ -- Alessio Treglia <ales...@debian.org> Sun, 21 Aug 2011 10:51:06 +0200
+
zynaddsubfx (2.4.0-1.1) unstable; urgency=low
* Non-maintainer upload.
diff -u zynaddsubfx-2.4.0/debian/patches/06_bankui.patch zynaddsubfx-2.4.0/debian/patches/06_bankui.patch
--- zynaddsubfx-2.4.0/debian/patches/06_bankui.patch
+++ zynaddsubfx-2.4.0/debian/patches/06_bankui.patch
@@ -1,13 +1,23 @@
-diff -urN zynaddsubfx-2.4.0.orig/src/UI/BankUI.fl zynaddsubfx-2.4.0/src/UI/BankUI.fl
---- zynaddsubfx-2.4.0.orig/src/UI/BankUI.fl 2005-03-14 14:54:34.000000000 -0500
-+++ zynaddsubfx-2.4.0/src/UI/BankUI.fl 2007-12-16 20:21:20.000000000 -0500
-@@ -35,6 +35,9 @@
- } {}
+Index: zynaddsubfx-2.4.0/src/UI/BankUI.fl
+===================================================================
+--- zynaddsubfx-2.4.0.orig/src/UI/BankUI.fl 2011-07-10 11:57:12.000000000 -0400
++++ zynaddsubfx-2.4.0/src/UI/BankUI.fl 2011-07-10 12:02:57.000000000 -0400
+@@ -32,9 +32,17 @@
+
+ class BankProcess_ {} {
+ Function {process()} {open return_type {virtual void}
+- } {}
++ } {
++ comment {This body intentionally left blank.} {in_source not_in_header
++ }
++ }
decl {Bank *bank;} {public
}
+ Function {~BankProcess_()} {return_type virtual
-+ } {code {} {}}
-+
++ } {
++ comment {This body intentionally left blank.} {in_source not_in_header
++ }
++ }
}
- class BankSlot {: {public Fl_Button,BankProcess_}
+ class BankSlot {open : {public Fl_Button,BankProcess_}
diff -u zynaddsubfx-2.4.0/debian/patches/05_partui.patch zynaddsubfx-2.4.0/debian/patches/05_partui.patch
--- zynaddsubfx-2.4.0/debian/patches/05_partui.patch
+++ zynaddsubfx-2.4.0/debian/patches/05_partui.patch
@@ -1,13 +1,21 @@
-diff -urN zynaddsubfx-2.4.0.orig/src/UI/PartUI.fl zynaddsubfx-2.4.0/src/UI/PartUI.fl
---- zynaddsubfx-2.4.0.orig/src/UI/PartUI.fl 2005-03-14 14:54:37.000000000 -0500
-+++ zynaddsubfx-2.4.0/src/UI/PartUI.fl 2007-12-16 20:19:18.000000000 -0500
-@@ -86,6 +86,9 @@
+Index: zynaddsubfx-2.4.0/src/UI/PartUI.fl
+===================================================================
+--- zynaddsubfx-2.4.0.orig/src/UI/PartUI.fl 2011-07-10 11:57:12.000000000 -0400
++++ zynaddsubfx-2.4.0/src/UI/PartUI.fl 2011-07-10 12:05:38.000000000 -0400
+@@ -85,7 +85,15 @@
+
class PartUI_ {} {
Function {showparameters(int kititem,int engine)} {return_type virtual
- } {}
-+ Function {~PartUI_()} {return_type virtual} { code {} {}
+- } {}
++ } {
++ comment {This body intentionally left blank.} {in_source not_in_header
++ }
++ }
++ Function {~PartUI_()} {return_type virtual
++ } {
++ comment {This body intentionally left blank.} {in_source not_in_header
++ }
+ }
-+
}
class PartKitItem {: {public Fl_Group}
diff -u zynaddsubfx-2.4.0/debian/patches/series zynaddsubfx-2.4.0/debian/patches/series
--- zynaddsubfx-2.4.0/debian/patches/series
+++ zynaddsubfx-2.4.0/debian/patches/series
@@ -8,0 +9 @@
+09_fluid_1.3.patch
only in patch2:
unchanged:
--- zynaddsubfx-2.4.0.orig/debian/patches/09_fluid_1.3.patch
+++ zynaddsubfx-2.4.0/debian/patches/09_fluid_1.3.patch
@@ -0,0 +1,39 @@
+Index: zynaddsubfx-2.4.0/src/UI/OscilGenUI.fl
+===================================================================
+--- zynaddsubfx-2.4.0.orig/src/UI/OscilGenUI.fl 2011-07-10 12:07:11.000000000 -0400
++++ zynaddsubfx-2.4.0/src/UI/OscilGenUI.fl 2011-07-10 12:08:06.000000000 -0400
+@@ -129,7 +129,11 @@
+
+ class PSlider {: {public Fl_Slider}
+ } {
+- Function {PSlider(int x,int y, int w, int h, const char *label=0):Fl_Slider(x,y,w,h,label)} {} {}
++ Function {PSlider(int x,int y, int w, int h, const char *label=0):Fl_Slider(x,y,w,h,label)} {
++ } {
++ comment {This body intentionally left blank.} {in_source not_in_header
++ }
++ }
+ Function {handle(int event)} {return_type int
+ } {
+ code {int X=x(),Y=y(),W=w(),H=h();
+Index: zynaddsubfx-2.4.0/src/UI/PresetsUI.fl
+===================================================================
+--- zynaddsubfx-2.4.0.orig/src/UI/PresetsUI.fl 2011-07-10 12:07:21.000000000 -0400
++++ zynaddsubfx-2.4.0/src/UI/PresetsUI.fl 2011-07-10 12:08:49.000000000 -0400
+@@ -16,9 +16,15 @@
+
+ class PresetsUI_ {} {
+ Function {refresh()} {open return_type {virtual void}
+- } {}
++ } {
++ comment {This body intentionally left blank.} {in_source not_in_header
++ }
++ }
+ Function {~PresetsUI_()} {open return_type virtual
+- } {}
++ } {
++ comment {This body intentionally left blank.} {in_source not_in_header
++ }
++ }
+ }
+
+ class PresetsUI {} {
