[pkg-java] r7916 - trunk/clojure/debian

[pcc-guest at alioth.debian.org]

Author: pcc-guest
Date: 2009-02-01 18:07:10 +0000 (Sun, 01 Feb 2009)
New Revision: 7916

Modified:
   trunk/clojure/debian/changelog
   trunk/clojure/debian/rules
Log:
Do not repack clojure.jar

Modified: trunk/clojure/debian/changelog
===================================================================
--- trunk/clojure/debian/changelog	2009-02-01 12:53:33 UTC (rev 7915)
+++ trunk/clojure/debian/changelog	2009-02-01 18:07:10 UTC (rev 7916)
@@ -1,4 +1,4 @@
-clojure (0.0.20081217-1) unstable; urgency=low
+clojure (0.0.20081217.dfsg-1) unstable; urgency=low
 
   * Initial release (closes: #454566, #510356)
 

Modified: trunk/clojure/debian/rules
===================================================================
--- trunk/clojure/debian/rules	2009-02-01 12:53:33 UTC (rev 7915)
+++ trunk/clojure/debian/rules	2009-02-01 18:07:10 UTC (rev 7916)
@@ -1,7 +1,10 @@
 #!/usr/bin/make -f
 
 VERSION = $(shell dpkg-parsechangelog | grep ^Version | sed "s/Version: //")
-UPSTREAM_VERSION = $(shell echo $(VERSION) | sed s/-.*//)
+ORIG_VERSION = $(shell echo $(VERSION) | sed s/-.*//)
+PRISTINE_VERSION = $(shell echo $(ORIG_VERSION) | sed s/\.dfsg//)
+UPSTREAM_VERSION = $(shell echo $(PRISTINE_VERSION) | sed s/^0\.0\.//)
+SRCDIR_NAME = clojure-$(ORIG_VERSION).orig
 
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
@@ -13,10 +16,10 @@
 DEB_JARS  := asm3 asm3-commons
 
 get-orig-source:
-	-uscan --verbose --force-download --repack --upstream-version $(UPSTREAM_VERSION)
-
-makebuilddir/clojure::
-	if [ ! -e clojure.jar.dist ] ; then mv clojure.jar clojure.jar.dist ; fi
-
-cleanbuilddir/clojure::
-	if [ -e clojure.jar.dist ] ; then mv clojure.jar.dist clojure.jar ; fi
+	-uscan --verbose --force-download --no-symlink --upstream-version $(PRISTINE_VERSION)
+	mkdir debian/repack
+	unzip -d debian/repack ../clojure_$(UPSTREAM_VERSION).zip
+	mv debian/repack/* debian/repack/$(SRCDIR_NAME)
+	rm debian/repack/$(SRCDIR_NAME)/clojure.jar
+	tar czf ../clojure_$(ORIG_VERSION).orig.tar.gz -C debian/repack $(SRCDIR_NAME)
+	rm -rf debian/repack