Package: cdrdao
Version: 1:1.2.2-18.2
Tags: patch
Hi,
I've prepared an NMU for cdrdao to fix the outstanding RC bug and
uploaded it to DELAYED/2. Please let me know if you'd like me to cancel
it so you can upload yourself or delay it further.
The diff for my NMU is attached.
Regards,
Adam
diff -u cdrdao-1.2.2/debian/changelog cdrdao-1.2.2/debian/changelog
--- cdrdao-1.2.2/debian/changelog
+++ cdrdao-1.2.2/debian/changelog
@@ -1,3 +1,11 @@
+cdrdao (1:1.2.2-18.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS with sigc++ 2.2.4.2. Thanks to Steve Langasek for the
+ patch. (Closes: #569396)
+
+ -- Adam D. Barratt <a...@adam-barratt.org.uk> Tue, 27 Apr 2010 20:09:13 +0100
+
cdrdao (1:1.2.2-18.1) unstable; urgency=low
* Non-maintainer upload.
diff -u cdrdao-1.2.2/debian/patches/series cdrdao-1.2.2/debian/patches/series
--- cdrdao-1.2.2/debian/patches/series
+++ cdrdao-1.2.2/debian/patches/series
@@ -13,0 +14 @@
+SigC_namespace
only in patch2:
unchanged:
--- cdrdao-1.2.2.orig/debian/patches/SigC_namespace
+++ cdrdao-1.2.2/debian/patches/SigC_namespace
@@ -0,0 +1,15 @@
+Author: Steve Langasek <steve.langa...@ubuntu.com>
+Description: Fix build failures with sigc++ 2.2.4.2. (LP: #534300).
+
+Index: cdrdao/xdao/xcdrdao.cc
+===================================================================
+--- cdrdao.orig/xdao/xcdrdao.cc
++++ cdrdao/xdao/xcdrdao.cc
+@@ -136,7 +136,7 @@
+ installSignalHandler(SIGCHLD, signalHandler);
+
+ // setup periodic GUI updates
+- Glib::signal_timeout().connect(SigC::slot(&guiUpdatePeriodic), 2000);
++ Glib::signal_timeout().connect(sigc::slot<bool>(&guiUpdatePeriodic), 2000);
+
+ installSignalHandler(SIGPIPE, SIG_IGN);
