[SCM] Mathpiper: a Java Computer Algebra System branch, master, updated. debian/0.0.svn2556-3-16-g8b41131

[Giovanni Mascellani]

The following commit has been merged in the master branch:
commit 638348e5a5b44a615c3a066a06b10f8823699af2
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Wed Nov 23 08:46:50 2011 +0100

    Fix build system for new upstream version.

diff --git a/debian/TODO.Debian b/debian/TODO.Debian
index bcc866f..3ae00bf 100644
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@ -1,4 +1,6 @@
 
  * Document removed feature in README.Debian
  * Write README.source
+ * Verify dependencies
+ * Update debian/copyright
 
diff --git a/debian/changelog b/debian/changelog
index 183daec..3bb000b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mathpiper (0.81f+dfsg1-1) unstable; urgency=low
+
+  * New upstream version, from SVN revision 4053.
+  * Remove watch file, which is not reliable.
+  * Use javahelper to build the library instead of relying on its build.xml script.
+  * Switch from CDBS to debhelper 7.
+
+ -- Giovanni Mascellani <gio at debian.org>  Wed, 23 Nov 2011 08:39:59 +0100
+
 mathpiper (0.0.svn2556-3) unstable; urgency=low
 
   * Add real watch file.
diff --git a/debian/control b/debian/control
index 024da64..dcc2194 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: java
 Priority: extra
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Giovanni Mascellani <gio at debian.org>
-Build-Depends: ant, ant-optional, cdbs, debhelper (>= 7), default-jdk,
- libjfreechart-java, libjcommon-java
+Build-Depends: debhelper (>= 7), javahelper, default-jdk, libjfreechart-java,
+ libjdom1-java, libjas-java, libjlatexmath-java
 Standards-Version: 3.9.2
 Homepage: http://mathrider.org/
 Vcs-Git: git://git.debian.org/git/pkg-java/mathpiper.git
@@ -12,8 +12,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-java/mathpiper.git
 
 Package: mathpiper
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, libjfreechart-java,
- libjcommon-java
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${java:Depends}
 Description: Java Computer Algebra System
  Mathpiper is a CAS (Computer Algebra System), written in Java. It is part
  of the mathrider suite, a mathematics computing environment for
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index a188e06..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-docs/*
diff --git a/debian/install b/debian/install
deleted file mode 100644
index 99b1f99..0000000
--- a/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-build/dist/mathpiper.jar usr/share/java
diff --git a/debian/javabuild b/debian/javabuild
new file mode 100644
index 0000000..5f540fe
--- /dev/null
+++ b/debian/javabuild
@@ -0,0 +1 @@
+mathpiper.jar src/
diff --git a/debian/jlibs b/debian/jlibs
new file mode 100644
index 0000000..31d38f7
--- /dev/null
+++ b/debian/jlibs
@@ -0,0 +1 @@
+mathpiper.jar
diff --git a/debian/rules b/debian/rules
index e885de0..02e24a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,15 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-JAVA_HOME := /usr/lib/jvm/default-java
+export JAVA_HOME=/usr/lib/jvm/default-java
+export CLASSPATH=/usr/share/java/jdom1.jar:/usr/share/java/jas.jar:/usr/share/java/jfreechart.jar:/usr/share/java/jlatexmath.jar
 
-DEB_JARS := /usr/share/java/jfreechart.jar
-DEB_JARS += /usr/share/java/jcommon.jar
+%:
+	dh $@ --with javahelper
 
+# Avoid the default build.xml file
+override_dh_auto_build:
+	true
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index 87cec0f..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,4 +0,0 @@
-version=3
-opts="uversionmangle=s|_|~|g" \
-  http://code.google.com/p/mathpiper/downloads/list \
-  //mathpiper.googlecode.com/files/mathpiperide_unix_mac_dist_v.([-0-9a-z._]*).tar.bz2

-- 
Mathpiper: a Java Computer Algebra System