[SCM] jxplorer - Java LDAP browser branch, master, updated. debian/3.3.1+dfsg-1-8-gbafb68a

[Gabriele Giacone]

The following commit has been merged in the master branch:
commit bbbd9d4b3c83429c80ba4d3e750aab94e9f38a21
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Wed Apr 24 10:49:31 2013 +0200

    Switch to -project upstream zipfile. Fix watch file and get-orig-source
    target.
    
    https://sourceforge.net/p/jxplorer/bugs/136

diff --git a/debian/changelog b/debian/changelog
index 43d9417..23924db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jxplorer (3.3.1+dfsg-2) UNRELEASED; urgency=low
 
   * Fix icons gamma correction (Closes: #705997).
+  * Switch to -project upstream zipfile.
 
  -- Gabriele Giacone <1o5g4r8o at gmail.com>  Thu, 04 Apr 2013 01:34:46 +0200
 
diff --git a/debian/rules b/debian/rules
index 992a91b..524560b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,20 +57,12 @@ override_dh_install:
 	sed -i '1s/local\///' $(USRSHARE)/jxplorer/language/*pl
 
 NAME=jxplorer
-SRCTGZ=../$(NAME)-$(VERSION)-src.tar.gz
-RESTGZ=../$(NAME)-$(VERSION)-project\ .tar.gz
+PROZIP=../$(NAME)-$(VERSION)-project.zip
 ORGXZ=../../$(NAME)_$(VERSION)+dfsg.orig.tar.xz
 get-orig-source:
-	# 1 - sources tarball 
-	uscan --verbose --force-download --repack --no-symlink --download-version $(VERSION)
-	# 2 - resources tarball 
-	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
+	uscan --verbose --force-download --no-symlink --download-version $(VERSION)
 	-mkdir -p $(TEMPDIR)/$(NAME)/help
-	tar -C $(TEMPDIR) -zxf $(SRCTGZ)
-	tar -C $(TEMPDIR) -zxf $(RESTGZ)
+	unzip $(PROZIP) -d $(TEMPDIR)
 	cd $(TEMPDIR) && unzip $(NAME)/jars/help.jar -d $(NAME)/help
 	cd $(TEMPDIR) && tar --exclude *.jar -Jcf $(ORGXZ) *
-	rm -rf $(TEMPDIR) $(SRCTGZ) $(RESTGZ)
+	rm -rf $(TEMPDIR) $(PROZIP)
diff --git a/debian/watch b/debian/watch
index 79325a3..6e95fcc 100644
--- a/debian/watch
+++ b/debian/watch
@@ -2,4 +2,4 @@ version=3
 opts="dversionmangle=s/\+dfsg//,\
 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
+http://sf.net/jxplorer/jxplorer-([\d\.]+[rc\d]*[b\d]*)-project.zip

-- 
jxplorer - Java LDAP browser