[modello] 09/32: o Making this build properly in a pbuilder.

[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 db996455aa5238060471d6ae12fe67a4d8acbb6a
Author: Trygve Laugstøl <trygvis at inamo.no>
Date:   Sat Jun 2 13:09:44 2007 +0000

    o Making this build properly in a pbuilder.
---
 debian/build.properties |  4 ++--
 debian/control          | 38 ++++++++++++++++++++++++++------------
 debian/rules            |  7 +------
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/debian/build.properties b/debian/build.properties
index e129520..55aa618 100644
--- a/debian/build.properties
+++ b/debian/build.properties
@@ -2,7 +2,7 @@ classpath.compile=\
            /usr/share/java/plexus-component-api.jar:\
            /usr/share/java/plexus-container-default.jar:\
            /usr/share/java/plexus-utils.jar:\
-           /home/trygvis/dev/org.debian.svn/pkg-java/trunk/modello/modello-core/build/modello-core-${version}.jar:\
-           /home/trygvis/dev/org.debian.svn/pkg-java/trunk/modello/modello-plugins/modello-plugin-xml/build/modello-plugin-xml-${version}.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
 classpath.test=
diff --git a/debian/control b/debian/control
index f3d856c..2724c2b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,32 @@ Section: devel
 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,
-                     libbcpg-java, libbcpg-java-doc,
-		     libbcprov-java, libbcprov-java-doc,
-		     classpath-doc,
-		     libplexus-utils-java, libplexus-utils-java-doc,
-		     libplexus-classworlds-java, libplexus-classworlds-java-doc,
-		     libplexus-component-api-java, libplexus-component-api-java-doc,
-		     libplexus-container-default-java, libplexus-container-default-java-doc,
-		     libplexus-interactivity-api-java, libplexus-interactivity-api-java-doc,
-		     libdom4j-java, libdom4j-java-doc,
-		     velocity, velocity-doc,
-		     maven-ant-helper
+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,
+#                     libplexus-component-api-java,
+#                     libplexus-component-api-java-doc,
+                     libplexus-container-default-java,
+                     libplexus-container-default-java-doc,
+#                     libplexus-interactivity-api-java,
+#                     libplexus-interactivity-api-java-doc,
+                     libplexus-utils-java,
+                     libplexus-utils-java-doc,
+                     libxalan2-java,
+                     maven-ant-helper,
+                     velocity,
+                     velocity-doc
 Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
 Standards-Version: 3.7.2
 
diff --git a/debian/rules b/debian/rules
index 1a84307..3903773 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,11 +10,7 @@ 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 \
-			$(shell find /usr/share/java -type f -name 'wagon*' -print) \
-			$(shell find /usr/share/java -type f -name 'plexus*' -print) \
-			/usr/share/java/libplexus-utils.jar \
-                        /usr/share/java/commons-lang.jar
+						/usr/share/java/junit.jar
 
 DEB_ANT_BUILD_TARGET := package javadoc
 DEB_ANT_BUILDFILE    := ./debian/build.xml
@@ -23,7 +19,6 @@ DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
 API_DOCS             := build/javadoc
 SVN                  := https://svn.codehaus.org/modello/tags/modello-$(VERSION)
 
-
 get-orig-source:
 	echo "Getting version $(VERSION) from $(SVN)"
 	mkdir orig_tmp

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