[SCM] swtchart packaging branch, master, updated. upstream/0.8.0-5-g7cb9f13

Jakub Adam jakub.adam at ktknet.cz
Wed Apr 25 16:02:44 UTC 2012


The following commit has been merged in the master branch:
commit f49d0cf94cd970d09bf426c393b53443b296f030
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Wed Apr 25 17:20:28 2012 +0200

    Don't copy d/build.xml into package root dir

diff --git a/debian/build.xml b/debian/build.xml
index 47f302c..d7128fa 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project basedir="." default="build" name="org.swtchart">
+<project basedir=".." default="build" name="org.swtchart">
     <target name="init">
         <mkdir dir="org.swtchart/bin"/>
         <copy file="org.swtchart/META-INF/MANIFEST.MF"
diff --git a/debian/rules b/debian/rules
index d9772e3..bb32585 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,10 +3,11 @@
 JAVA_HOME=/usr/lib/jvm/default-java
 
 %:
-	cp debian/build.xml .
 	dh $@ --with javahelper
 
+override_dh_auto_build:
+	ant -f debian/build.xml
+
 override_dh_auto_clean:
-	dh_auto_clean
-	rm -f build.xml
+	ant -f debian/build.xml clean
 	rm -rf api

-- 
swtchart packaging



More information about the pkg-java-commits mailing list