tags 521962 + pending
thanks
Hi,
The attached file is the diff for my ll-scope 0.2.1-2.1 NMU. The associated
changelog entry is:
ll-scope (0.2.1-2.1) unstable; urgency=medium
* Non-maintainer upload.
* Add sigcnamespace.dpatch patch that specifies sigc:: namespace to avoid
conflict with signal(2). (Closes: #521962)
It will be uploaded to DELAYED/2. Please let me know ASAP if you wish
me to cancel it (or simply upload your own fix).
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` lamby@debian.org
`-
diff -Nru ll-scope-0.2.1/debian/changelog ll-scope-0.2.1/debian/changelog --- ll-scope-0.2.1/debian/changelog 2009-08-16 21:45:07.000000000 +0100 +++ ll-scope-0.2.1/debian/changelog 2009-08-16 21:45:07.000000000 +0100 @@ -1,3 +1,11 @@ +ll-scope (0.2.1-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add sigcnamespace.dpatch patch that specifies sigc:: namespace to avoid + conflict with signal(2). (Closes: #521962) + + -- Chris Lamb <lamby@debian.org> Sun, 16 Aug 2009 21:34:45 +0100 + ll-scope (0.2.1-2) unstable; urgency=low * Fixed broken INSTALL_DIR variable in Makefile diff -Nru ll-scope-0.2.1/debian/patches/00list ll-scope-0.2.1/debian/patches/00list --- ll-scope-0.2.1/debian/patches/00list 2009-08-16 21:45:07.000000000 +0100 +++ ll-scope-0.2.1/debian/patches/00list 2009-08-16 21:45:07.000000000 +0100 @@ -1 +1,2 @@ destdir +sigcnamespace diff -Nru ll-scope-0.2.1/debian/patches/sigcnamespace.dpatch ll-scope-0.2.1/debian/patches/sigcnamespace.dpatch --- ll-scope-0.2.1/debian/patches/sigcnamespace.dpatch 1970-01-01 01:00:00.000000000 +0100 +++ ll-scope-0.2.1/debian/patches/sigcnamespace.dpatch 2009-08-16 21:45:07.000000000 +0100 @@ -0,0 +1,48 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## sigcnamespace.dpatch by Chris Lamb <lamby@debian.org> +## +## DP: Specify sigc:: namespace to avoid conflicts with signal(2) + +@DPATCH@ + +diff -Nru a/dssiuiclient.hpp b/dssiuiclient.hpp +--- a/dssiuiclient.hpp 2005-05-31 11:31:25.000000000 +0100 ++++ b/dssiuiclient.hpp 2009-08-16 21:37:13.000000000 +0100 +@@ -89,13 +89,13 @@ + // Host to UI + /** This signal is emitted when the host sends a new control value. + The parameters are the control port number and the new control value. */ +- signal<void, int, float> control_received; ++ sigc::signal<void, int, float> control_received; + /** Emitted when the host sends a program change. The parameters are the + bank and program numbers. */ +- signal<void, int, int> program_received; ++ sigc::signal<void, int, int> program_received; + /** Emitted when the host sends a configuration value. The parameters are + the configuration key and the configuration value. */ +- signal<void, const string, const string> configure_received; ++ sigc::signal<void, const string, const string> configure_received; + /** Emitted when the host wants the UI to be visible. A DSSI GUI should not + show any windows until this signal is emitted. */ + Dispatcher show_received; +@@ -124,7 +124,7 @@ + void* allocate_shared_memory(int bytes); + + /** Emitted when the plugin has attached to the shared memory segment. */ +- signal<void> plugin_attached; ++ sigc::signal<void> plugin_attached; + + /** Returns true if the plugin has attached to the shared memory segment. */ + bool plugin_has_attached(); +diff -Nru ll-scope-0.2.1/scopewidget.hpp ll-scope-0.2.1/scopewidget.hpp +--- ll-scope-0.2.1/scopewidget.hpp 2005-05-31 11:31:25.000000000 +0100 ++++ ll-scope-0.2.1/scopewidget.hpp 2009-08-16 21:37:13.000000000 +0100 +@@ -59,7 +59,7 @@ + void clear(); + + // signals +- signal<void> middle_button_pressed; ++ sigc::signal<void> middle_button_pressed; + + private: +
Attachment:
signature.asc
Description: PGP signature