[pkg-java] r6029 - trunk/jarjar/debian

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2008-03-26 06:02:03 +0000 (Wed, 26 Mar 2008)
New Revision: 6029

Removed:
   trunk/jarjar/debian/libjarjar-java.dirs
   trunk/jarjar/debian/libjarjar-java.install
   trunk/jarjar/debian/libjarjar-java.links
Modified:
   trunk/jarjar/debian/changelog
   trunk/jarjar/debian/rules
   trunk/jarjar/debian/watch
Log:
jarjar (1.0~rc7.dfsg-1) unstable; urgency=low

  * New upstream version.
  * Updated watch file again to check for source download.

 -- Michael Koch <konqueror at gmx.de>  Sat, 22 Mar 2008 17:23:24 +0100



Modified: trunk/jarjar/debian/changelog
===================================================================
--- trunk/jarjar/debian/changelog	2008-03-23 09:35:42 UTC (rev 6028)
+++ trunk/jarjar/debian/changelog	2008-03-26 06:02:03 UTC (rev 6029)
@@ -1,8 +1,9 @@
-jarjar (1.0~rc6.dfsg-2) UNRELEASED; urgency=low
+jarjar (1.0~rc7.dfsg-1) unstable; urgency=low
 
-  * Updated watch file again.
+  * New upstream version.
+  * Updated watch file again to check for source download.
 
- -- Michael Koch <konqueror at gmx.de>  Wed, 20 Feb 2008 21:20:32 +0100
+ -- Michael Koch <konqueror at gmx.de>  Sat, 22 Mar 2008 17:23:24 +0100
 
 jarjar (1.0~rc6.dfsg-1) unstable; urgency=low
 

Deleted: trunk/jarjar/debian/libjarjar-java.dirs
===================================================================
--- trunk/jarjar/debian/libjarjar-java.dirs	2008-03-23 09:35:42 UTC (rev 6028)
+++ trunk/jarjar/debian/libjarjar-java.dirs	2008-03-26 06:02:03 UTC (rev 6029)
@@ -1 +0,0 @@
-usr/share/java

Deleted: trunk/jarjar/debian/libjarjar-java.install
===================================================================
--- trunk/jarjar/debian/libjarjar-java.install	2008-03-23 09:35:42 UTC (rev 6028)
+++ trunk/jarjar/debian/libjarjar-java.install	2008-03-26 06:02:03 UTC (rev 6029)
@@ -1 +0,0 @@
-dist/jarjar-1.0rc6.jar			/usr/share/java/

Deleted: trunk/jarjar/debian/libjarjar-java.links
===================================================================
--- trunk/jarjar/debian/libjarjar-java.links	2008-03-23 09:35:42 UTC (rev 6028)
+++ trunk/jarjar/debian/libjarjar-java.links	2008-03-26 06:02:03 UTC (rev 6029)
@@ -1 +0,0 @@
-/usr/share/java/jarjar-1.0rc6.jar	/usr/share/java/jarjar.jar

Modified: trunk/jarjar/debian/rules
===================================================================
--- trunk/jarjar/debian/rules	2008-03-23 09:35:42 UTC (rev 6028)
+++ trunk/jarjar/debian/rules	2008-03-26 06:02:03 UTC (rev 6029)
@@ -4,7 +4,13 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
+VERSION=`echo $(DEB_UPSTREAM_VERSION) | sed -e s/~// | sed -e s/\.dfsg//`
+
 JAVA_HOME := /usr/lib/jvm/java-gcj
 
 DEB_JARS := asm3 asm3-commons
 DEB_ANT_BUILD_TARGET := jar javadoc
+
+install/libjarjar-java::
+	install -m 644 -D dist/jarjar-$(VERSION).jar debian//libjarjar-java/usr/share/java/jarjar-$(VERSION).jar
+	dh_link -plibjarjar-java /usr/share/java/jarjar-$(VERSION).jar /usr/share/java/jarjar.jar

Modified: trunk/jarjar/debian/watch
===================================================================
--- trunk/jarjar/debian/watch	2008-03-23 09:35:42 UTC (rev 6028)
+++ trunk/jarjar/debian/watch	2008-03-26 06:02:03 UTC (rev 6029)
@@ -1,3 +1,3 @@
 version=3
-opts=dversionmangle=s/\~*([\w\d\.]*)\.dfsg+$/$1/ \
-  http://code.google.com/p/jarjar/downloads/list http://jarjar.googlecode.com/files/jarjar-(.*)\.jar
+opts=dversionmangle=s/\~*([\w\d\.]*)\.dfsg$/$1/ \
+  http://code.google.com/p/jarjar/downloads/list http://jarjar.googlecode.com/files/jarjar-src-(.*)\.zip