[libjaxen-java] 17/49: Finish packaging.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libjaxen-java.

commit e86d13b4e7aa44e5b734647ec65cbe666c6cb2f3
Author: Marcus Better <marcus at better.se>
Date:   Mon Oct 9 16:58:08 2006 +0000

    Finish packaging.
---
 debian/changelog | 5 +++--
 debian/rules     | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ce3542d..e3ee698 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 @@ libjaxen-java (1.1~beta11-1) unstable; urgency=low
   [ 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
 
diff --git a/debian/rules b/debian/rules
index 467fa1a..6d6ad75 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,12 +22,13 @@ PKGNAME		:= libjaxen-java
 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 @@ install: build
 	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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjaxen-java.git