[pkg-java] r3660 - trunk/plexus-interactivity-api/debian

[paulcager-guest at alioth.debian.org]

Author: paulcager-guest
Date: 2007-06-15 22:11:35 +0000 (Fri, 15 Jun 2007)
New Revision: 3660

Modified:
   trunk/plexus-interactivity-api/debian/changelog
   trunk/plexus-interactivity-api/debian/rules
Log:
plexus-interactivity-api (1.0-alpha-6-1) unstable; urgency=low

  * Revert to stable release.
  * Sanitise rules.

 -- Paul Cager <paul-debian at home.paulcager.org>  Fri, 15 Jun 2007 23:05:15 +0100


Modified: trunk/plexus-interactivity-api/debian/changelog
===================================================================
--- trunk/plexus-interactivity-api/debian/changelog	2007-06-15 21:01:40 UTC (rev 3659)
+++ trunk/plexus-interactivity-api/debian/changelog	2007-06-15 22:11:35 UTC (rev 3660)
@@ -1,3 +1,10 @@
+plexus-interactivity-api (1.0-alpha-6-1) unstable; urgency=low
+
+  * Revert to stable release.
+  * Sanitise rules.
+
+ -- Paul Cager <paul-debian at home.paulcager.org>  Fri, 15 Jun 2007 23:05:15 +0100
+
 plexus-interactivity-api (1.0+svn5974-1) unstable; urgency=low
 
   * Initial release. (Closes: #413525)

Modified: trunk/plexus-interactivity-api/debian/rules
===================================================================
--- trunk/plexus-interactivity-api/debian/rules	2007-06-15 21:01:40 UTC (rev 3659)
+++ trunk/plexus-interactivity-api/debian/rules	2007-06-15 22:11:35 UTC (rev 3660)
@@ -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:' | sed "s,Version: \(.*\)-.*,\1,g")
 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 \
@@ -16,25 +16,21 @@
 DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
 #DEB_ANT_INVOKE       := ant -verbose -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -f $(BUILD_FILE)
 API_DOCS             := build/doc/api
-SVN                  := http://svn.codehaus.org/plexus/plexus-components/trunk/plexus-interactivity/plexus-interactivity-api
-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-components/tags/plexus-interactivity-$(VERSION)/plexus-interactivity-api/
 
 
+
 get-orig-source:
-	echo "Getting revision $(REVISION) from $(SVN)"
+	echo "Getting 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/lib$(PACKAGE)-java::
-	echo "build/$(PACKAGE)-$(VERSION).jar usr/share/java" >debian/lib$(PACKAGE)-java.install
-	echo "/usr/share/java/$(PACKAGE)-$(VERSION).jar /usr/share/java/$(PACKAGE).jar" >debian/lib$(PACKAGE)-java.links
+binary-post-install/lib$(PACKAGE)-java::
+	dh_install -plib$(PACKAGE)-java build/$(PACKAGE)-$(VERSION).jar usr/share/java
+	dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-$(VERSION).jar usr/share/java/$(PACKAGE).jar;
 
-makebuilddir/lib$(PACKAGE)-java-doc::
-	echo "$(API_DOCS) usr/share/doc/lib$(PACKAGE)-java" >debian/lib$(PACKAGE)-java-doc.install
-
-cleanbuilddir/lib$(PACKAGE)-java::
-	cd debian && rm -f lib$(PACKAGE)-java-doc.install lib$(PACKAGE)-java.links lib$(PACKAGE)-java.install
+binary-post-install/lib$(PACKAGE)-java-doc::
+	dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java