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

[paulcager-guest at alioth.debian.org]

Author: paulcager-guest
Date: 2007-06-06 09:12:21 +0000 (Wed, 06 Jun 2007)
New Revision: 3599

Modified:
   trunk/modello/debian/build.properties
   trunk/modello/debian/control
   trunk/modello/debian/rules
Log:
Corrected get-orig-source
Corrected build dependencies / classpath

Modified: trunk/modello/debian/build.properties
===================================================================
--- trunk/modello/debian/build.properties	2007-06-05 22:14:47 UTC (rev 3598)
+++ trunk/modello/debian/build.properties	2007-06-06 09:12:21 UTC (rev 3599)
@@ -2,6 +2,7 @@
            /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

Modified: trunk/modello/debian/control
===================================================================
--- trunk/modello/debian/control	2007-06-05 22:14:47 UTC (rev 3598)
+++ trunk/modello/debian/control	2007-06-06 09:12:21 UTC (rev 3599)
@@ -6,17 +6,16 @@
 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,

Modified: trunk/modello/debian/rules
===================================================================
--- trunk/modello/debian/rules	2007-06-05 22:14:47 UTC (rev 3598)
+++ trunk/modello/debian/rules	2007-06-06 09:12:21 UTC (rev 3599)
@@ -21,9 +21,10 @@
 	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::