r35276 - in /packages/jeuclid/trunk/debian: control libjeuclid-core-java.dirs orig-tar.sh rules

[twerner at users.alioth.debian.org]

Author: twerner
Date: Fri Oct 17 21:49:03 2008
New Revision: 35276

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35276
Log:
* change build deps to openjdk
* minor cleanups

Removed:
    packages/jeuclid/trunk/debian/libjeuclid-core-java.dirs
Modified:
    packages/jeuclid/trunk/debian/control
    packages/jeuclid/trunk/debian/orig-tar.sh
    packages/jeuclid/trunk/debian/rules

Modified: packages/jeuclid/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/jeuclid/trunk/debian/control?rev=35276&op=diff
==============================================================================
--- packages/jeuclid/trunk/debian/control (original)
+++ packages/jeuclid/trunk/debian/control Fri Oct 17 21:49:03 2008
@@ -4,7 +4,7 @@
 Maintainer:  Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Sylvestre Ledru <sylvestre.ledru at inria.fr>
 Build-Depends: debhelper (>= 5), autotools-dev, cdbs, 
- default-jdk-builddep, ant, junit, libxmlgraphics-commons-java (>= 1.3.0), 
+ openjdk-6-jdk, ant, junit, libxmlgraphics-commons-java (>= 1.3.0), 
  libcommons-logging-java, libbatik-java (>= 1.7), libcommons-cli-java, 
  libcommons-lang-java, fop (>= 0.95)
 Standards-Version: 3.8.0

Modified: packages/jeuclid/trunk/debian/orig-tar.sh
URL: http://svn.debian.org/wsvn/debian-science/packages/jeuclid/trunk/debian/orig-tar.sh?rev=35276&op=diff
==============================================================================
--- packages/jeuclid/trunk/debian/orig-tar.sh (original)
+++ packages/jeuclid/trunk/debian/orig-tar.sh Fri Oct 17 21:49:03 2008
@@ -16,4 +16,3 @@
     echo "moved $TAR to $origDir"
 fi
 
-exit 0

Modified: packages/jeuclid/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/jeuclid/trunk/debian/rules?rev=35276&op=diff
==============================================================================
--- packages/jeuclid/trunk/debian/rules (original)
+++ packages/jeuclid/trunk/debian/rules Fri Oct 17 21:49:03 2008
@@ -4,14 +4,13 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME                  := /usr/lib/jvm/java-6-openjdk
-DEB_ANT_BUILDFILE    	   := $(CURDIR)/debian/build.xml
-DEB_JARS                   := ant-nodeps junit commons-lang commons-cli fop
-DEB_ANT_BUILD_TARGET       := compile-core compile-mathviewer compile-cli compile-fop
-DEB_ANT_CLEAN_TARGET       := clean
+JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
+DEB_ANT_BUILDFILE    := $(CURDIR)/debian/build.xml
+DEB_JARS             := ant-nodeps junit commons-lang commons-cli fop
+DEB_ANT_BUILD_TARGET := compile-core compile-mathviewer compile-cli compile-fop
 
 install/libjeuclid-core-java::
-	install -m 644 target/jeuclid-core.jar debian/libjeuclid-core-java/usr/share/java/jeuclid-core-${DEB_UPSTREAM_VERSION}.jar
+	install -m 644 -D target/jeuclid-core.jar debian/libjeuclid-core-java/usr/share/java/jeuclid-core-${DEB_UPSTREAM_VERSION}.jar
 	ln -s jeuclid-core-${DEB_UPSTREAM_VERSION}.jar debian/libjeuclid-core-java/usr/share/java/jeuclid-core.jar
 
 install/jeuclid-mathviewer::
@@ -28,5 +27,5 @@
 
 
 get-orig-source:
-	-uscan --upstream-version 0 --rename    
+	uscan --force-download --rename