Author: trygvis-guest
Date: 2007-06-02 13:09:44 +0000 (Sat, 02 Jun 2007)
New Revision: 3565
Modified:
trunk/modello/debian/build.properties
trunk/modello/debian/control
trunk/modello/debian/rules
Log:
o Making this build properly in a pbuilder.
Modified: trunk/modello/debian/build.properties
===================================================================
--- trunk/modello/debian/build.properties 2007-06-02 13:00:07 UTC (rev
3564)
+++ trunk/modello/debian/build.properties 2007-06-02 13:09:44 UTC (rev
3565)
@@ -2,7 +2,7 @@
/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=
Modified: trunk/modello/debian/control
===================================================================
--- trunk/modello/debian/control 2007-06-02 13:00:07 UTC (rev 3564)
+++ trunk/modello/debian/control 2007-06-02 13:09:44 UTC (rev 3565)
@@ -3,18 +3,32 @@
Priority: optional
Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]>
Uploaders: Paul Cager <[EMAIL PROTECTED]>
-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
Modified: trunk/modello/debian/rules
===================================================================
--- trunk/modello/debian/rules 2007-06-02 13:00:07 UTC (rev 3564)
+++ trunk/modello/debian/rules 2007-06-02 13:09:44 UTC (rev 3565)
@@ -10,11 +10,7 @@
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 @@
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
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
