[geogebra] 05/06: Added a patch to use libcommons-collections3-java instead of libcollections15-java

[Giovanni Mascellani]

This is an automated email from the git hooks/post-receive script.

gio pushed a commit to branch master
in repository geogebra.

commit a2f86722f5967ba96eace53f76f5fd1ccd65277d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Apr 7 22:31:26 2014 +0200

    Added a patch to use libcommons-collections3-java instead of libcollections15-java
---
 debian/changelog | 2 ++
 debian/control   | 2 +-
 debian/rules     | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c9854d..a9eb747 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 geogebra (4.0.34.0+dfsg1-3) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Added a patch to use libcommons-collections3-java instead of
+    libcollections15-java
   * debian/control:
     - Standards-Version updated to 3.9.5 (no changes)
     - Use canonical URLs for the Vcs-* fields
diff --git a/debian/control b/debian/control
index 3b8ece9..7324451 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
  xsltproc,
  docbook-xsl,
  mathpiper (>= 0.81f+svn4469+dfsg3),
- libcollections15-java,
+ libcommons-collections3-java,
  libcommons-math-java,
  libfreehep-xml-java,
  libfreehep-util-java,
diff --git a/debian/rules b/debian/rules
index bc56c26..acec05d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,11 +8,12 @@ TG_BRANCHES := patch/ScientificFormat.java
 TG_BRANCHES += patch/applet_export
 TG_BRANCHES += patch/no_mac
 TG_BRANCHES += patch/version
+TG_BRANCHES += patch/use_apache_commons_collections
 
 -include /usr/share/topgit/tg2quilt.mk
 
 export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/mathpiper.jar:/usr/share/java/commons-math.jar:/usr/share/java/freehep-xml.jar:/usr/share/java/freehep-util.jar:/usr/share/java/freehep-graphics2d.jar:/usr/share/java/freehep-io.jar:/usr/share/java/freehep-graphicsio.jar:/usr/share/java/freehep-graphicsio-svg.jar:/usr/share/java/freehep-graphicsio-pdf.jar:/usr/share/java/freehep-graphicsio-emf.jar:/usr/share/icedtea-web/plugin.jar:/usr/share/java/jlatexmath.jar:/usr/share/java/collections15.jar:/usr/share [...]
+export CLASSPATH=/usr/share/java/mathpiper.jar:/usr/share/java/commons-math.jar:/usr/share/java/freehep-xml.jar:/usr/share/java/freehep-util.jar:/usr/share/java/freehep-graphics2d.jar:/usr/share/java/freehep-io.jar:/usr/share/java/freehep-graphicsio.jar:/usr/share/java/freehep-graphicsio-svg.jar:/usr/share/java/freehep-graphicsio-pdf.jar:/usr/share/java/freehep-graphicsio-emf.jar:/usr/share/icedtea-web/plugin.jar:/usr/share/java/jlatexmath.jar:/usr/share/java/commons-collections3.jar:/us [...]
 
 %:
 	dh $@ --with javahelper

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