[SCM] sooperlooper packaging branch, master, updated. 1.6.14+dfsg-1-2-g690080a

[quadrispro-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 690080acc80ec0258fb99f83ee3e6267a02b3270
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Tue Mar 23 18:24:12 2010 +0100

    These changes should be applied with the next upload.

diff --git a/debian/rules b/debian/rules
index e5f637a..15fcc5e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,13 +14,14 @@ override_dh_auto_configure:
 	ln -s -f /usr/share/misc/config.sub
 	dh_auto_configure -- --enable-gtk2
 
+# For the next releases we should replace '+dfsg' with '~dfsg'.
 get-orig-source:
 	cd $(DEBIAN_DIR)/.. && uscan --force-download
 	tar xf ../sooperlooper-$(UPSTREAM_VERSION).tar.gz
 	rm ../sooperlooper-$(UPSTREAM_VERSION).tar.gz \
 	../sooperlooper_$(UPSTREAM_VERSION).orig.tar.gz
-	mv sooperlooper-$(UPSTREAM_VERSION) sooperlooper-$(UPSTREAM_VERSION)~dfsg
-	tar cf ../sooperlooper_$(UPSTREAM_VERSION)~dfsg.orig.tar \
-	--exclude=libs/pbd/dmalloc.cc sooperlooper-$(UPSTREAM_VERSION)~dfsg
-	gzip -9fn ../sooperlooper_$(UPSTREAM_VERSION)~dfsg.orig.tar
-	rm -r sooperlooper-$(UPSTREAM_VERSION)~dfsg
+	mv sooperlooper-$(UPSTREAM_VERSION) sooperlooper-$(UPSTREAM_VERSION)+dfsg
+	tar cf ../sooperlooper_$(UPSTREAM_VERSION)+dfsg.orig.tar \
+	--exclude=libs/pbd/dmalloc.cc sooperlooper-$(UPSTREAM_VERSION)+dfsg
+	gzip -9fn ../sooperlooper_$(UPSTREAM_VERSION)+dfsg.orig.tar
+	rm -r sooperlooper-$(UPSTREAM_VERSION)+dfsg
diff --git a/debian/watch b/debian/watch
index 9c8b0f4..b6815b2 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,5 @@
 version=3
-opts=dversionmangle=s/\~dfsg// \
+# opts=dversionmangle=s/\~dfsg// \
+# For the next releases we should use the previous line
+opts=dversionmangle=s/\+dfsg// \
 http://www.essej.net/sooperlooper/download.html sooperlooper-(.*)\.tar\.gz

-- 
sooperlooper packaging