[modello] 10/32: o Cleanup.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch modello-1.1
in repository modello.

commit 04cd8a7be4bc2ee73a9183dd78c17dbd1bae205a
Author: Trygve Laugstøl <trygvis at inamo.no>
Date:   Sun Jun 3 15:28:13 2007 +0000

    o Cleanup.
---
 debian/rules | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index 3903773..172f3ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,10 @@ include /usr/share/cdbs/1/class/ant.mk
 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 @@ SVN                  := https://svn.codehaus.org/modello/tags/modello-$(VERSION)
 
 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::

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/modello.git