[pkg-java] r3574 - in trunk/plexus-classworlds: . debian

[trygvis-guest at alioth.debian.org]

Author: trygvis-guest
Date: 2007-06-03 15:33:16 +0000 (Sun, 03 Jun 2007)
New Revision: 3574

Modified:
   trunk/plexus-classworlds/
   trunk/plexus-classworlds/debian/changelog
   trunk/plexus-classworlds/debian/rules
Log:
o Cleanup.


Property changes on: trunk/plexus-classworlds
___________________________________________________________________
Name: svn:ignore
   + LICENSE.txt
lib
src
pom.xml


Modified: trunk/plexus-classworlds/debian/changelog
===================================================================
--- trunk/plexus-classworlds/debian/changelog	2007-06-03 15:28:13 UTC (rev 3573)
+++ trunk/plexus-classworlds/debian/changelog	2007-06-03 15:33:16 UTC (rev 3574)
@@ -1,4 +1,4 @@
-plexus-classworlds (1.2+svn5720-1) unstable; urgency=low
+plexus-classworlds (1.2-alpha-7-1) unstable; urgency=low
 
   * Initial release. (Closes: #413528)
 

Modified: trunk/plexus-classworlds/debian/rules
===================================================================
--- trunk/plexus-classworlds/debian/rules	2007-06-03 15:28:13 UTC (rev 3573)
+++ trunk/plexus-classworlds/debian/rules	2007-06-03 15:33:16 UTC (rev 3574)
@@ -5,28 +5,24 @@
 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
-DEB_ANT_BUILD_TARGET := package
+DEB_ANT_BUILD_TARGET := package javadoc
 DEB_ANT_BUILDFILE    := ./debian/build.xml
 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-classworlds/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/$(PACKAGE)/tags/$(PACKAGE)-$(VERSION)
 
-
 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 -r $(REVISION) $(SVN) $(PACKAGE) && \
-		rm  $(PACKAGE)/classworlds-aj.zip $(PACKAGE)/lib/*.jar && \
-		tar czf ../../$(PACKAGE)_$(VERSION).orig.tar.gz $(PACKAGE)
+	svn export -q $(SVN) orig_tmp/$(PACKAGE)
+	rm  orig_tmp/$(PACKAGE)/classworlds-aj.zip orig_tmp/$(PACKAGE)/lib/*.jar
+	cd orig_tmp && 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