[pkg-java] r3609 - trunk/libplexus-utils/debian

[paulcager-guest at alioth.debian.org]

Author: paulcager-guest
Date: 2007-06-06 15:39:30 +0000 (Wed, 06 Jun 2007)
New Revision: 3609

Modified:
   trunk/libplexus-utils/debian/build.xml
   trunk/libplexus-utils/debian/changelog
   trunk/libplexus-utils/debian/rules
Log:
libplexus-utils (1:1.4.1-1) unstable; urgency=low

  * Revert to last stable version (1.4.1)
    Added epoch 1

  * Corrected name of Jar:
        Was: libplexus-utils.jar
        Now: plexus-utils.jar
    Symlink retained to old name for compatability.

  * Changed to use direct calls of dh_install/link

 -- Paul Cager <paul-debian at home.paulcager.org>  Wed, 06 Jun 2007 12:07:28 +0100



Modified: trunk/libplexus-utils/debian/build.xml
===================================================================
--- trunk/libplexus-utils/debian/build.xml	2007-06-06 15:37:40 UTC (rev 3608)
+++ trunk/libplexus-utils/debian/build.xml	2007-06-06 15:39:30 UTC (rev 3609)
@@ -35,7 +35,7 @@
 <target name="init">
 	<property name="src.dir" value="src"/>
 	<property name="build.dir" value="build"/>
-	<property name="jar" value="${build.dir}/${package}-${version}.jar"/>
+	<property name="jar" value="${build.dir}/plexus-utils-${version}.jar"/>
 	<property name="javadoc.dir" value="${build.dir}/doc/api"/>
 </target>
 

Modified: trunk/libplexus-utils/debian/changelog
===================================================================
--- trunk/libplexus-utils/debian/changelog	2007-06-06 15:37:40 UTC (rev 3608)
+++ trunk/libplexus-utils/debian/changelog	2007-06-06 15:39:30 UTC (rev 3609)
@@ -1,3 +1,17 @@
+libplexus-utils (1:1.4.1-1) unstable; urgency=low
+
+  * Revert to last stable version (1.4.1)
+    Added epoch 1
+
+  * Corrected name of Jar:
+        Was: libplexus-utils.jar
+        Now: plexus-utils.jar
+    Symlink retained to old name for compatability.
+
+  * Changed to use direct calls of dh_install/link
+
+ -- Paul Cager <paul-debian at home.paulcager.org>  Wed, 06 Jun 2007 12:07:28 +0100
+
 libplexus-utils (1.4.1+svn6048-1) unstable; urgency=low
 
   * New upstream version, required for maven2 packaging

Modified: trunk/libplexus-utils/debian/rules
===================================================================
--- trunk/libplexus-utils/debian/rules	2007-06-06 15:37:40 UTC (rev 3608)
+++ trunk/libplexus-utils/debian/rules	2007-06-06 15:39:30 UTC (rev 3609)
@@ -5,7 +5,7 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 PACKAGE              := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
-VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d-)
+VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d- | sed 's/^[0-9]*://')
 JAVA_HOME            := /usr/lib/jvm/java-gcj
 ANT_HOME             := /usr/share/ant
 DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar xalan2
@@ -13,25 +13,24 @@
 BUILD_FILE           := ./debian/build.xml
 DEB_ANT_INVOKE       := ant -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -f $(BUILD_FILE)
 API_DOCS             := build/doc/api
-SVN                  := http://svn.codehaus.org/plexus/plexus-utils/trunk/
-REVISION             := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d- | sed 's/.*svn//' | sed 's/[^0-9].*//')
+SVN                  := http://svn.codehaus.org/plexus/plexus-utils/tags/plexus-utils-$(VERSION)
+#REVISION             := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d- | sed 's/.*svn//' | sed 's/[^0-9].*//')
 
 
 get-orig-source:
-	echo "Getting revision $(REVISION) from $(SVN)"
+	echo "Getting sources $(REVISION) from $(SVN)"
 	mkdir orig_tmp
 	cd orig_tmp && \
-		svn export -q -r $(REVISION) $(SVN) $(PACKAGE) && \
+		svn export -q $(SVN) $(PACKAGE) && \
 		tar czf ../../$(PACKAGE)_$(VERSION).orig.tar.gz $(PACKAGE)
 	rm -rf orig_tmp
 	
 
-makebuilddir/$(PACKAGE)-java::
-	echo "build/$(PACKAGE)-$(VERSION).jar usr/share/java" >debian/$(PACKAGE)-java.install
-	echo "/usr/share/java/$(PACKAGE)-$(VERSION).jar /usr/share/java/$(PACKAGE).jar" >debian/$(PACKAGE)-java.links
+binary-post-install/libplexus-utils-java::
+	dh_install -plibplexus-utils-java build/plexus-utils-$(VERSION).jar usr/share/java
+	dh_link -plibplexus-utils-java usr/share/java/plexus-utils-$(VERSION).jar usr/share/java/plexus-utils.jar
+	dh_link -plibplexus-utils-java usr/share/java/plexus-utils-$(VERSION).jar usr/share/java/libplexus-utils.jar
 
-makebuilddir/$(PACKAGE)-java-doc::
-	echo "$(API_DOCS) usr/share/doc/$(PACKAGE)-java" >debian/$(PACKAGE)-java-doc.install
 
-cleanbuilddir/$(PACKAGE)-java::
-	cd debian && rm -f $(PACKAGE)-java-doc.install $(PACKAGE)-java.links $(PACKAGE)-java.install
+binary-post-install/libplexus-utils-java-doc::
+	dh_install -plibplexus-utils-java-doc $(API_DOCS) usr/share/doc/libplexus-utils-java