[pkg-java] r3573 - trunk/modello/debian

[trygvis-guest at alioth.debian.org]

Author: trygvis-guest
Date: 2007-06-03 15:28:13 +0000 (Sun, 03 Jun 2007)
New Revision: 3573

Modified:
   trunk/modello/debian/rules
Log:
o Cleanup.

Modified: trunk/modello/debian/rules
===================================================================
--- trunk/modello/debian/rules	2007-06-03 15:27:27 UTC (rev 3572)
+++ trunk/modello/debian/rules	2007-06-03 15:28:13 UTC (rev 3573)
@@ -5,12 +5,10 @@
 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' ' | sed 's/-[0-9]*$$//')
+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_JARS             := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar xalan2 \
-						/usr/share/java/junit.jar
+DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar /usr/share/java/junit.jar
 
 DEB_ANT_BUILD_TARGET := package javadoc
 DEB_ANT_BUILDFILE    := ./debian/build.xml
@@ -21,11 +19,11 @@
 
 get-orig-source:
 	echo "Getting version $(VERSION) from $(SVN)"
+	rm -rf orig_tmp
 	mkdir orig_tmp
-	cd orig_tmp && \
-		svn export -q $(SVN) $(PACKAGE) && \
-		cd modello; rm -rf modello-maven-plugin modello-plugins-sandbox modello-site; cd .. && \
-		tar czf ../../$(PACKAGE)_$(VERSION).orig.tar.gz $(PACKAGE)
+	svn export -q $(SVN) $(PACKAGE)
+	rm -rf modello/modello-maven-plugin modello/modello-plugins-sandbox modello/modello-site
+	cd ori_tmp; tar czf ../../$(PACKAGE)_$(VERSION).orig.tar.gz $(PACKAGE)
 	rm -rf orig_tmp
 
 binary-post-install/lib$(PACKAGE)-java::