[pkg-java] r3576 - trunk/plexus-container-default/debian

[trygvis-guest at alioth.debian.org]

Author: trygvis-guest
Date: 2007-06-03 15:38:02 +0000 (Sun, 03 Jun 2007)
New Revision: 3576

Modified:
   trunk/plexus-container-default/debian/build.properties
   trunk/plexus-container-default/debian/build.xml
   trunk/plexus-container-default/debian/control
   trunk/plexus-container-default/debian/rules
Log:
o Cleaning up and making it build properly in pbuilder.

Modified: trunk/plexus-container-default/debian/build.properties
===================================================================
--- trunk/plexus-container-default/debian/build.properties	2007-06-03 15:34:19 UTC (rev 3575)
+++ trunk/plexus-container-default/debian/build.properties	2007-06-03 15:38:02 UTC (rev 3576)
@@ -1,4 +1,4 @@
-classpath.compile=/usr/share/java/plexus-classworlds.jar:\
+classpath.compile=/usr/share/java/classworlds.jar:\
                   /usr/share/java/plexus-utils.jar:\
                   /usr/share/java/plexus-component-api.jar:\
                   /usr/share/java/junit.jar

Modified: trunk/plexus-container-default/debian/build.xml
===================================================================
--- trunk/plexus-container-default/debian/build.xml	2007-06-03 15:34:19 UTC (rev 3575)
+++ trunk/plexus-container-default/debian/build.xml	2007-06-03 15:38:02 UTC (rev 3576)
@@ -5,7 +5,6 @@
     <property file="debian/build.properties"/>
     <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
     <property name="maven.test.exclude" value="**/PlexusHierarchyTest.java"/>
-    <property name="maven.build.xml" value="/home/trygvis/dev/org.debian.svn/pkg-java/trunk/maven-ant-helper-1.0/maven-build.xml"/>
     <property name="maven.build.xml" value="/usr/share/maven-ant-helper/maven-build.xml"/>
 
     <target name="clean">

Modified: trunk/plexus-container-default/debian/control
===================================================================
--- trunk/plexus-container-default/debian/control	2007-06-03 15:34:19 UTC (rev 3575)
+++ trunk/plexus-container-default/debian/control	2007-06-03 15:38:02 UTC (rev 3576)
@@ -3,21 +3,23 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Paul Cager <paul-debian at home.paulcager.org>
-Build-Depends-Indep: java-gcj-compat-dev (>=1.0.65), ant-optional, libxalan2-java,
-                     libplexus-classworlds-java, libplexus-classworlds-java-doc,
-		     libplexus-utils-java, libplexus-utils-java-doc,
-		     libplexus-component-api-java, libplexus-component-api-java-doc,
-		     junit, junit-doc
+Build-Depends-Indep: ant-optional,
+                     java-gcj-compat-dev (>=1.0.65),
+                     junit,
+                     junit-doc,
+                     libclassworlds-java,
+                     libplexus-utils-java,
+                     libplexus-utils-java-doc,
+                     libxalan2-java,
+                     maven-ant-helper
 Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
 Standards-Version: 3.7.2
 
 Package: libplexus-container-default-java
 Architecture: all
 Section: libs
-Depends: libplexus-classworlds-java,
-         libplexus-utils-java,
-	 libplexus-component-api-java,
-	 junit
+Depends: libplexus-utils-java,
+         libclassworlds-java (>=1.1-alpha-2)
 Suggests: libplexus-container-default-java-doc
 Description: utilities for the Plexus framework
  The Plexus project provides a full software stack for creating and executing
@@ -45,8 +47,8 @@
 Package: libplexus-container-default-java-doc
 Architecture: all
 Section: doc
-Depends: classpath-doc, libplexus-classworlds-java-doc,
-         libplexus-utils-java-doc, libplexus-component-api-java-doc
+Depends: classpath-doc, libclassworlds-java-doc,
+         libplexus-utils-java-doc
 Suggests: libplexus-container-default-java
 Description: API Documentation for plexus-container-default
  The Plexus project provides a full software stack for creating and executing

Modified: trunk/plexus-container-default/debian/rules
===================================================================
--- trunk/plexus-container-default/debian/rules	2007-06-03 15:34:19 UTC (rev 3575)
+++ trunk/plexus-container-default/debian/rules	2007-06-03 15:38:02 UTC (rev 3576)
@@ -20,7 +20,7 @@
 	echo "Getting from $(SVN)"
 	mkdir orig_tmp
 	cd orig_tmp && \
-		svn export -q -r $(REVISION) $(SVN) $(PACKAGE) && \
+		svn export -q $(SVN) $(PACKAGE) && \
 		tar czf ../../$(PACKAGE)_$(VERSION).orig.tar.gz $(PACKAGE)
 	rm -rf orig_tmp