[SCM] jxplorer - Java LDAP browser branch, master, updated. debian/3.2.2_rc1+dfsg-3-15-g03b0afc

[Gabriele Giacone]

The following commit has been merged in the master branch:
commit 345a129d26a60a8d029ea2a124004f6ff5806e71
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Wed Aug 8 03:23:58 2012 +0200

    Fix get-orig-source and d/watch.

diff --git a/debian/rules b/debian/rules
index 811d5cc..483d957 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,17 +55,21 @@ override_dh_auto_install:
 	install -d -m 755 $(DESTDIR)/usr/share/jxplorer/plugins
 	dh_installchangelogs RELEASE.TXT
 
+NAME=jxplorer
+SRCTGZ=../$(NAME)-$(VERSION)-src.tar.gz
+RESTGZ=../$(NAME)-$(VERSION)-project\ .tar.gz
+ORGXZ=../../$(NAME)_$(VERSION)+dfsg.orig.tar.xz
 get-orig-source:
 	# 1 - sources tarball 
-	uscan --verbose --force-download --repack --no-symlink
+	uscan --verbose --force-download --repack --no-symlink --download-version $(VERSION)
 	# 2 - resources tarball 
-	sed -i 's/src/deploy/' debian/watch
-	uscan --verbose --force-download --repack --no-symlink
-	sed -i 's/deploy/src/' debian/watch
+	sed -i 's/src/project/' debian/watch
+	uscan --verbose --force-download --repack --no-symlink --download-version $(VERSION)
+	sed -i 's/project/src/' debian/watch
 	# 2a - resources tarball - repack without jars and binaries
-	-mkdir -p $(TEMPDIR)/jxplorer/help
-	tar -C $(TEMPDIR) -zxf ../JXv$(VERSION)src.tar.gz
-	tar -C $(TEMPDIR) -zxf ../JXv$(VERSION)deploy.tar.gz
-	cd $(TEMPDIR) && unzip jxplorer/jars/help.jar -d jxplorer/help -x SearchData/*
-	cd $(TEMPDIR) && GZIP="-9" tar --exclude *.jar -zcf ../../jxplorer_$(VERSION)+dfsg.orig.tar.gz *
-	rm -rf $(TEMPDIR) ../JXv$(VERSION)src.tar.gz ../JXv$(VERSION)deploy.tar.gz
+	-mkdir -p $(TEMPDIR)/$(NAME)/help
+	tar -C $(TEMPDIR) -zxf $(SRCTGZ)
+	tar -C $(TEMPDIR) -zxf $(RESTGZ)
+	cd $(TEMPDIR) && unzip $(NAME)/jars/help.jar -d $(NAME)/help
+	cd $(TEMPDIR) && tar --exclude *.jar -Jcf $(ORGXZ) *
+	rm -rf $(TEMPDIR) $(SRCTGZ) $(RESTGZ)
diff --git a/debian/watch b/debian/watch
index 1b24c8c..79325a3 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,5 @@
 version=3
 opts="dversionmangle=s/\+dfsg//,\
-uversionmangle=s/rc/\~rc/,\
-filenamemangle=s/rc/\~rc/" \
-http://sf.net/jxplorer/JXv(.*)src.tar.bz2
+uversionmangle=s/rc/\~rc/;s/b/\~b/;s/\.0/\./,\
+filenamemangle=s/(rc\d)/\~$1/;s/(b\d)/\~$1/;s/\.0/\./" \
+http://sf.net/jxplorer/jxplorer-([\d\.]+[rc\d]*[b\d]*)-src.tar.bz2

-- 
jxplorer - Java LDAP browser