[pkg-java] r2578 - branches/libjaxen-java/feature/debian/debian

[Marcus Better]

Author: marcusb-guest
Date: 2006-10-09 16:58:08 +0000 (Mon, 09 Oct 2006)
New Revision: 2578

Modified:
   branches/libjaxen-java/feature/debian/debian/changelog
   branches/libjaxen-java/feature/debian/debian/rules
Log:
Finish packaging.


Modified: branches/libjaxen-java/feature/debian/debian/changelog
===================================================================
--- branches/libjaxen-java/feature/debian/debian/changelog	2006-10-09 16:57:46 UTC (rev 2577)
+++ branches/libjaxen-java/feature/debian/debian/changelog	2006-10-09 16:58:08 UTC (rev 2578)
@@ -1,7 +1,6 @@
 libjaxen-java (1.1~beta11-1) unstable; urgency=low
 
   [ Wolfgang Baer ]
-  * New upstream release
   * libsaxpath-java code is now included in the jaxen source base
     + No more libsaxpath-java binary from this source
     + Added conflicts, replaces with libsaxpath-java
@@ -15,8 +14,10 @@
   [ Marcus Better ]
   * New upstream release.
   * debian/rules: Don't use cdbs. Build with gcj instead of kaffe.
+  * Don't use dpatch.
+  * debian/copyright: Updated information.
 
- -- Marcus Better <marcus at better.se>  Mon,  9 Oct 2006 11:08:37 +0200
+ -- Marcus Better <marcus at better.se>  Mon,  9 Oct 2006 12:18:00 +0200
 
 libjaxen-java (1.0FCS-3) unstable; urgency=low
 

Modified: branches/libjaxen-java/feature/debian/debian/rules
===================================================================
--- branches/libjaxen-java/feature/debian/debian/rules	2006-10-09 16:57:46 UTC (rev 2577)
+++ branches/libjaxen-java/feature/debian/debian/rules	2006-10-09 16:58:08 UTC (rev 2578)
@@ -22,12 +22,13 @@
 INSTALLDIR	:= $(CURDIR)/debian/$(PKGNAME)
 JAVALIBDIR	:= $(INSTALLDIR)/usr/share/java
 
-VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\- | cut -f1 -d\+)
+VERSION  := $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\- | cut -f1 -d\+)
+UVERSION := $(subst ~beta,-beta-,$(VERSION))
 
 build: build-stamp
 build-stamp:
 	dh_testdir
-	$(ANT_INVOKE) all javadoc test
+	$(ANT_INVOKE) jar javadoc test
 	touch build-stamp
 
 clean:
@@ -42,7 +43,7 @@
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
-	install -m 644 target/jaxen-1.1-beta-11.jar $(JAVALIBDIR)/jaxen-$(VERSION).jar
+	install -m 644 target/jaxen-$(UVERSION).jar $(JAVALIBDIR)/jaxen-$(VERSION).jar
 	ln -s jaxen-$(VERSION).jar $(JAVALIBDIR)/jaxen.jar
 
 binary-indep: build install