[pkg-java] r5520 - trunk/pj/debian

[hauro-guest at alioth.debian.org]

Author: hauro-guest
Date: 2008-01-20 21:00:59 +0000 (Sun, 20 Jan 2008)
New Revision: 5520

Modified:
   trunk/pj/debian/changelog
   trunk/pj/debian/rules
Log:
Packaged new upstream version. Minor changes in debian/rules to deal with version numbers correctly.


Modified: trunk/pj/debian/changelog
===================================================================
--- trunk/pj/debian/changelog	2008-01-20 20:58:29 UTC (rev 5519)
+++ trunk/pj/debian/changelog	2008-01-20 21:00:59 UTC (rev 5520)
@@ -1,3 +1,11 @@
+pj (0.0~20080119-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/rules: Changed rules to use either the Debian or upstream version
+  * debian/repack.sh: Fixed issues in dealing with version numbers
+
+ -- Manuel Prinz <debian at pinguinkiste.de>  Sun, 20 Jan 2008 21:54:43 +0100
+
 pj (0.0~20071212-1) unstable; urgency=low
 
   * Initial release (Closes: #434496)

Modified: trunk/pj/debian/rules
===================================================================
--- trunk/pj/debian/rules	2008-01-20 20:58:29 UTC (rev 5519)
+++ trunk/pj/debian/rules	2008-01-20 21:00:59 UTC (rev 5520)
@@ -14,18 +14,19 @@
 DEB_ANT_BUILD_TARGET := jar
 
 PACKAGE := pj
-VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 | cut -d- -f1)
+DEBIAN_VERSION   := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 | cut -d- -f1)
+UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 | cut -d- -f1 | cut -d~ -f2)
 
-ANT_ARGS += -Dapp.version=$(VERSION)
+ANT_ARGS += -Dapp.version=$(DEBIAN_VERSION)
 
-pjsrc$(VERSION).jar:
-	wget http://www.cs.rit.edu/~ark/pjsrc$(VERSION).jar
+pjsrc$(UPSTREAM_VERSION).jar:
+	wget http://www.cs.rit.edu/~ark/pjsrc$(UPSTREAM_VERSION).jar
 
-pj_$(VERSION).orig.tar.gz: pjsrc$(VERSION).jar
-	sh debian/repack.sh $(VERSION)
+pj_$(DEBIAN_VERSION).orig.tar.gz: pjsrc$(UPSTREAM_VERSION).jar
+	sh debian/repack.sh $(UPSTREAM_VERSION)
 
-get-orig-source: pj_$(VERSION).orig.tar.gz
+get-orig-source: pj_$(DEBIAN_VERSION).orig.tar.gz
 
 install/lib$(PACKAGE)-java::
-	install -m 0644 lib/$(PACKAGE)-$(VERSION).jar debian/$(cdbs_curpkg)/usr/share/java/$(PACKAGE)-$(VERSION).jar
-	ln -s $(PACKAGE)-$(VERSION).jar debian/$(cdbs_curpkg)/usr/share/java/$(PACKAGE).jar
+	install -m 0644 lib/$(PACKAGE)-$(DEBIAN_VERSION).jar debian/$(cdbs_curpkg)/usr/share/java/$(PACKAGE)-$(DEBIAN_VERSION).jar
+	ln -s $(PACKAGE)-$(DEBIAN_VERSION).jar debian/$(cdbs_curpkg)/usr/share/java/$(PACKAGE).jar