[pkg-java] r3665 - trunk/jline/debian

[petere at alioth.debian.org]

Author: petere
Date: 2007-06-16 14:18:47 +0000 (Sat, 16 Jun 2007)
New Revision: 3665

Modified:
   trunk/jline/debian/changelog
   trunk/jline/debian/control
   trunk/jline/debian/rules
Log:
* Simplified rules

Modified: trunk/jline/debian/changelog
===================================================================
--- trunk/jline/debian/changelog	2007-06-16 14:10:13 UTC (rev 3664)
+++ trunk/jline/debian/changelog	2007-06-16 14:18:47 UTC (rev 3665)
@@ -3,6 +3,7 @@
   * Adjusted watch file
   * Updated standards version
   * Moved build dependencies to Build-Depends
+  * Simplified rules
 
  -- Peter Eisentraut <petere at debian.org>  Mon, 14 May 2007 10:40:50 +0200
 

Modified: trunk/jline/debian/control
===================================================================
--- trunk/jline/debian/control	2007-06-16 14:10:13 UTC (rev 3664)
+++ trunk/jline/debian/control	2007-06-16 14:18:47 UTC (rev 3665)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Peter Eisentraut <petere at debian.org>
-Build-Depends: cdbs (>= 0.4.36), debhelper (>= 5), kaffe, jikes, ant, junit
+Build-Depends: cdbs (>= 0.4.39), debhelper (>= 5), ant, jikes, junit, kaffe
 Standards-Version: 3.7.2
 
 Package: libjline-java

Modified: trunk/jline/debian/rules
===================================================================
--- trunk/jline/debian/rules	2007-06-16 14:10:13 UTC (rev 3664)
+++ trunk/jline/debian/rules	2007-06-16 14:18:47 UTC (rev 3665)
@@ -1,11 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-PACKAGE_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: \(.*\)-[^-]*$$/\1/p')
-
 JAVA_HOME = /usr/lib/kaffe
 DEB_JARS = junit
 DEB_ANT_BUILD_TARGET = jars
@@ -17,8 +15,8 @@
 
 install/libjline-java:: DEB_FINALDIR=$(CURDIR)/debian/libjline-java
 install/libjline-java::
-	install -m 644 -D release/jline-0_9_5.jar $(DEB_FINALDIR)/usr/share/java/jline-$(PACKAGE_VERSION).jar
-	dh_link /usr/share/java/jline-$(PACKAGE_VERSION).jar /usr/share/java/jline.jar
+	install -m 644 -D release/jline-0_9_5.jar $(DEB_FINALDIR)/usr/share/java/jline-$(DEB_UPSTREAM_VERSION).jar
+	dh_link /usr/share/java/jline-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jline.jar
 
 
 clean::