[SCM] ll-scope/master: Convert patch to the quilt format.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 469600fbc62bd4d7f54790d1e33baa16c01656dd
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Mar 24 13:26:23 2011 +0100

    Convert patch to the quilt format.

diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 9e8a6ae..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-destdir
-sigcnamespace
diff --git a/debian/patches/destdir.dpatch b/debian/patches/destdir.dpatch
deleted file mode 100644
index 3d0d05d..0000000
--- a/debian/patches/destdir.dpatch
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/sh -e
-## destdir.dpatch by Free Ekanayaka <free at agnula.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
---- a/Makefile	2007-06-04 23:48:24.000000000 +0200
-+++ b/Makefile	2007-06-04 23:49:24.000000000 +0200
-@@ -1,4 +1,5 @@
--INSTALL_DIR=/usr/local/lib/dssi
-+DESTDIR=
-+INSTALL_DIR=/usr/lib/dssi
- 
- all:	ll-scope.so ll-scope_gtk
- 
-@@ -16,7 +17,7 @@
- 	rm -f ll-scope.so ll-scope_gtk *.o
- 
- install:	ll-scope.so ll-scope_gtk
--	mkdir -p $(INSTALL_DIR)
--	cp -f ll-scope.so $(INSTALL_DIR)
--	mkdir -p $(INSTALL_DIR)/ll-scope
--	cp -f ll-scope_gtk ll-scope.glade pixmaps/icon.png $(INSTALL_DIR)/ll-scope/
-+	mkdir -p $(DESTDIR)$(INSTALL_DIR)
-+	cp -f ll-scope.so $(DESTDIR)$(INSTALL_DIR)
-+	mkdir -p $(DESTDIR)$(INSTALL_DIR)/ll-scope
-+	cp -f ll-scope_gtk ll-scope.glade pixmaps/icon.png $(DESTDIR)$(INSTALL_DIR)/ll-scope/
diff --git a/debian/patches/destdir.patch b/debian/patches/destdir.patch
new file mode 100644
index 0000000..5e9b415
--- /dev/null
+++ b/debian/patches/destdir.patch
@@ -0,0 +1,28 @@
+Subject: Prepend DESTDIR to the installation path.
+Author: Free Ekanayaka <free at agnula.org>
+Forwarded: no
+---
+ Makefile |   11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+--- ll-scope.orig/Makefile
++++ ll-scope/Makefile
+@@ -1,4 +1,5 @@
+-INSTALL_DIR=/usr/local/lib/dssi
++DESTDIR=
++INSTALL_DIR=/usr/lib/dssi
+ 
+ all:	ll-scope.so ll-scope_gtk
+ 
+@@ -16,7 +17,7 @@ clean:
+ 	rm -f ll-scope.so ll-scope_gtk *.o
+ 
+ install:	ll-scope.so ll-scope_gtk
+-	mkdir -p $(INSTALL_DIR)
+-	cp -f ll-scope.so $(INSTALL_DIR)
+-	mkdir -p $(INSTALL_DIR)/ll-scope
+-	cp -f ll-scope_gtk ll-scope.glade pixmaps/icon.png $(INSTALL_DIR)/ll-scope/
++	mkdir -p $(DESTDIR)$(INSTALL_DIR)
++	cp -f ll-scope.so $(DESTDIR)$(INSTALL_DIR)
++	mkdir -p $(DESTDIR)$(INSTALL_DIR)/ll-scope
++	cp -f ll-scope_gtk ll-scope.glade pixmaps/icon.png $(DESTDIR)$(INSTALL_DIR)/ll-scope/
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f6aa0be
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+destdir.patch
+sigcnamespace.patch
diff --git a/debian/patches/sigcnamespace.dpatch b/debian/patches/sigcnamespace.patch
similarity index 68%
rename from debian/patches/sigcnamespace.dpatch
rename to debian/patches/sigcnamespace.patch
index 23ec94c..9a36000 100644
--- a/debian/patches/sigcnamespace.dpatch
+++ b/debian/patches/sigcnamespace.patch
@@ -1,14 +1,15 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## sigcnamespace.dpatch by Chris Lamb <lamby at debian.org>
-##
-## DP: Specify sigc:: namespace to avoid conflicts with signal(2)
+Author: Chris Lamb <lamby at debian.org>
+Description: Specify sigc:: namespace to avoid conflicts with signal(2)
+Bug-Debian: http://bugs.debian.org/521962
+Forwarded: no
+---
+ dssiuiclient.hpp |    8 ++++----
+ scopewidget.hpp  |    2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
 
- at 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 @@
+--- ll-scope.orig/dssiuiclient.hpp
++++ ll-scope/dssiuiclient.hpp
+@@ -89,13 +89,13 @@ public:
    // 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. */
@@ -25,7 +26,7 @@ diff -Nru a/dssiuiclient.hpp b/dssiuiclient.hpp
    /** 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 @@
+@@ -124,7 +124,7 @@ public:
    void* allocate_shared_memory(int bytes);
    
    /** Emitted when the plugin has attached to the shared memory segment. */
@@ -34,10 +35,9 @@ diff -Nru a/dssiuiclient.hpp b/dssiuiclient.hpp
    
    /** 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 @@
+--- ll-scope.orig/scopewidget.hpp
++++ ll-scope/scopewidget.hpp
+@@ -59,7 +59,7 @@ public:
    void clear();
    
    // signals

-- 
ll-scope packaging