[pkg-java] r3572 - trunk/plexus-i18n/debian

[trygvis-guest at alioth.debian.org]

Author: trygvis-guest
Date: 2007-06-03 15:27:27 +0000 (Sun, 03 Jun 2007)
New Revision: 3572

Modified:
   trunk/plexus-i18n/debian/control
   trunk/plexus-i18n/debian/rules
Log:
o Adding dependency on maven-ant-helper.

Modified: trunk/plexus-i18n/debian/control
===================================================================
--- trunk/plexus-i18n/debian/control	2007-06-03 15:26:38 UTC (rev 3571)
+++ trunk/plexus-i18n/debian/control	2007-06-03 15:27:27 UTC (rev 3572)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Trygve Laugstol <trygvis at inamo.no>
 Build-Depends-Indep: java-gcj-compat-dev (>=1.0.65), ant-optional, libxalan2-java,
-                     libplexus-container-default-java, junit, junit-doc
+                     libplexus-container-default-java, junit, junit-doc, maven-ant-helper
 Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
 Standards-Version: 3.7.2
 

Modified: trunk/plexus-i18n/debian/rules
===================================================================
--- trunk/plexus-i18n/debian/rules	2007-06-03 15:26:38 UTC (rev 3571)
+++ trunk/plexus-i18n/debian/rules	2007-06-03 15:27:27 UTC (rev 3572)
@@ -7,23 +7,21 @@
 PACKAGE              := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
 VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | sed "s,Version: \(.*\)-.*,\1,g")
 JAVA_HOME            := /usr/lib/jvm/java-gcj
-JAVA_HOME            := /usr/local/java
 ANT_HOME             := /usr/share/ant
-DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar $(ANT_HOME)/lib/ant-junit.jar /usr/share/java/junit.jar
+DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar $(ANT_HOME)/lib/ant-junit.jar /usr/share/lib/junit.jar
 DEB_ANT_BUILD_TARGET := package javadoc
 DEB_ANT_BUILDFILE    := ./debian/build.xml
 DEB_ANT_ARGS         := -DartifactId=$(PACKAGE) -Dversion=$(VERSION)
 #DEB_ANT_INVOKE       := ant -verbose -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -f $(BUILD_FILE)
 API_DOCS             := build/javadoc
 SVN                  := http://svn.codehaus.org/plexus/plexus-components/tags/$(PACKAGE)-$(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 from $(SVN)"
+	rm -rf orig_tmp
 	mkdir orig_tmp
-	cd orig_tmp && \
-		svn export -q $(SVN) $(PACKAGE) && \
-		tar czf ../../$(PACKAGE)_$(VERSION).orig.tar.gz $(PACKAGE)
+	svn export -q $(SVN) orig_tmp/$(PACKAGE)
+	cd orig_tmp && tar czf ../../$(PACKAGE)_$(VERSION).orig.tar.gz $(PACKAGE)
 	rm -rf orig_tmp
 
 binary-post-install/lib$(PACKAGE)-java::