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

[Peter Collingbourne]

Author: pcc-guest
Date: 2009-05-07 15:54:55 +0000 (Thu, 07 May 2009)
New Revision: 8230

Removed:
   trunk/clojure/debian/source.lintian-overrides
Modified:
   trunk/clojure/debian/changelog
   trunk/clojure/debian/rules
   trunk/clojure/debian/watch
Log:
debian/rules, debian/watch: s/.dfsg/+dfsg/; changes required to deal with new version numbering scheme and source code layout

Modified: trunk/clojure/debian/changelog
===================================================================
--- trunk/clojure/debian/changelog	2009-05-07 15:54:53 UTC (rev 8229)
+++ trunk/clojure/debian/changelog	2009-05-07 15:54:55 UTC (rev 8230)
@@ -1,6 +1,8 @@
 clojure (1.0.0+dfsg-1) unstable; urgency=low
 
   * New upstream release.
+  * debian/rules, debian/watch: s/.dfsg/+dfsg/; changes required to deal
+    with new version numbering scheme and source code layout
 
  -- Peter Collingbourne <peter at pcc.me.uk>  Thu, 07 May 2009 15:09:44 +0100
 

Modified: trunk/clojure/debian/rules
===================================================================
--- trunk/clojure/debian/rules	2009-05-07 15:54:53 UTC (rev 8229)
+++ trunk/clojure/debian/rules	2009-05-07 15:54:55 UTC (rev 8230)
@@ -2,7 +2,7 @@
 
 VERSION = $(shell dpkg-parsechangelog | grep ^Version | sed "s/Version: //")
 ORIG_VERSION = $(shell echo $(VERSION) | sed s/-.*//)
-PRISTINE_VERSION = $(shell echo $(ORIG_VERSION) | sed s/\.dfsg//)
+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
 
@@ -10,16 +10,13 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_INSTALL_CHANGELOGS_ALL := changes.txt
-
 JAVA_HOME := /usr/lib/jvm/java-6-openjdk
 DEB_JARS  := asm3 asm3-commons
 
 get-orig-source:
 	-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
+	mkdir debian/$(SRCDIR_NAME)
+	unzip -d debian/$(SRCDIR_NAME) ../clojure_$(UPSTREAM_VERSION).zip
+	rm debian/$(SRCDIR_NAME)/clojure-$(UPSTREAM_VERSION).jar
+	tar czf ../clojure_$(ORIG_VERSION).orig.tar.gz -C debian $(SRCDIR_NAME)
+	rm -rf debian/$(SRCDIR_NAME)

Deleted: trunk/clojure/debian/source.lintian-overrides
===================================================================
--- trunk/clojure/debian/source.lintian-overrides	2009-05-07 15:54:53 UTC (rev 8229)
+++ trunk/clojure/debian/source.lintian-overrides	2009-05-07 15:54:55 UTC (rev 8230)
@@ -1,3 +0,0 @@
-# Clojure currently uses a date-based version numbering scheme therefore
-# the string sorting problem will not occur
-clojure source: dfsg-version-with-period 0.0.20*

Modified: trunk/clojure/debian/watch
===================================================================
--- trunk/clojure/debian/watch	2009-05-07 15:54:53 UTC (rev 8229)
+++ trunk/clojure/debian/watch	2009-05-07 15:54:55 UTC (rev 8230)
@@ -1,2 +1,2 @@
 version=3
-opts="dversionmangle=s/\.dfsg//,uversionmangle=s/^/0.0./" http://code.google.com/p/clojure/downloads/list .*clojure_([\d]*)\.zip
+opts="dversionmangle=s/\+dfsg//,uversionmangle=s/^(\d{8})$/0.0.$1/" http://code.google.com/p/clojure/downloads/list .*clojure_([\d.]*)\.zip