[modello] 11/32: Corrected get-orig-source Corrected build dependencies / classpath

[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 0bdcc2b12aa6f2660b18f0d9c24edd78ed61de97
Author: Paul Cager <paul-debian at home.paulcager.org>
Date:   Wed Jun 6 09:12:21 2007 +0000

    Corrected get-orig-source
    Corrected build dependencies / classpath
---
 debian/build.properties | 1 +
 debian/control          | 9 ++++-----
 debian/rules            | 7 ++++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/build.properties b/debian/build.properties
index 55aa618..8e23044 100644
--- a/debian/build.properties
+++ b/debian/build.properties
@@ -2,6 +2,7 @@ classpath.compile=\
            /usr/share/java/plexus-component-api.jar:\
            /usr/share/java/plexus-container-default.jar:\
            /usr/share/java/plexus-utils.jar:\
+           /usr/share/java/libplexus-utils.jar:\
            ${basedir}/modello-core/build/modello-core-${version}.jar:\
            ${basedir}/modello-plugins/modello-plugin-xml/build/modello-plugin-xml-${version}.jar:\
            /usr/share/java/commons-lang.jar
diff --git a/debian/control b/debian/control
index 2724c2b..e0f8f78 100644
--- a/debian/control
+++ b/debian/control
@@ -6,17 +6,16 @@ Uploaders: Paul Cager <paul-debian at home.paulcager.org>
 Build-Depends-Indep: ant-optional,
                      classpath-doc,
                      java-gcj-compat-dev (>=1.0.65),
-                     gcj,
                      libbcpg-java,
                      libbcpg-java-doc,
                      libbcprov-java,
                      libbcprov-java-doc,
                      libdom4j-java,
                      libdom4j-java-doc,
-                     libclassworlds-java,
-                     libclassworlds-java-doc,
-#                     libplexus-classworlds-java,
-#                     libplexus-classworlds-java-doc,
+#                     libclassworlds-java,
+#                     libclassworlds-java-doc,
+                     libplexus-classworlds-java,
+                     libplexus-classworlds-java-doc,
 #                     libplexus-component-api-java,
 #                     libplexus-component-api-java-doc,
                      libplexus-container-default-java,
diff --git a/debian/rules b/debian/rules
index 172f3ed..ce50d73 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,9 +21,10 @@ get-orig-source:
 	echo "Getting version $(VERSION) from $(SVN)"
 	rm -rf orig_tmp
 	mkdir orig_tmp
-	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)
+	cd orig_tmp && \
+		svn export -q $(SVN) $(PACKAGE) && \
+		rm -rf modello/modello-maven-plugin modello/modello-plugins-sandbox modello/modello-site && \
+		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