[med-svn] [libjung-java] 01/03: rename package libjung-free-java

[Olivier Sallou]

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

osallou pushed a commit to branch master
in repository libjung-java.

commit 6eec340a4267274b7dcdffb9c3b9b7ad6e5a5b53
Author: Olivier Sallou <osallou at debian.org>
Date:   Fri Aug 21 11:26:13 2015 +0000

    rename package libjung-free-java
---
 debian/changelog                                       |  2 +-
 debian/control                                         | 11 +++++------
 debian/javabuild                                       |  2 --
 debian/libjung-contrib-java.jlibs                      |  2 --
 debian/libjung-free-java-doc.javadoc                   |  1 +
 debian/{libjung-java.jlibs => libjung-free-java.jlibs} |  0
 debian/libjung-java-doc.javadoc                        |  1 -
 debian/rules                                           |  9 ++++++++-
 8 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cc7758c..efd04c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libjung-java (2.0.1-1) UNRELEASED; urgency=low
+libjung-free-java (2.0.1-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #368931)
 
diff --git a/debian/control b/debian/control
index 6c98148..0e3086c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,13 @@
-Source: libjung-java
+Source: libjung-free-java
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Michael R. Crusoe <mcrusoe at msu.edu>
 Section: java
 Priority: optional
 Build-Depends: debhelper (>= 9),
                javahelper,
-               unzip,
-               libjai-core-java
+               unzip
 Build-Depends-Indep: default-jdk,
-                     libcolt-java,
+                     libcolt-free-java,
                      libcommons-collections4-java,
                      libjava3d-java,
                      libvecmath-java
@@ -17,7 +16,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-med/libjung-java.git
 Vcs-Git: git://anonscm.debian.org/debian-med/libjung-java.git
 Homepage: http://jung.sourceforge.net/
 
-Package: libjung-java
+Package: libjung-free-java
 Architecture: all
 Depends: ${java:Depends},
          ${misc:Depends}
@@ -78,7 +77,7 @@ Description: Java Universal Network/Graph Framework contrib classes
  .
  This package contains the Java classes with non-free dependencies.
 
-Package: libjung-java-doc
+Package: libjung-free-java-doc
 Architecture: all
 Section: doc
 Depends: ${java:Depends},
diff --git a/debian/javabuild b/debian/javabuild
index 00d10ee..2466f3b 100644
--- a/debian/javabuild
+++ b/debian/javabuild
@@ -8,5 +8,3 @@ jung-3d-2.0.1.jar jung-3d-2.0.1-sources
 jung-3d-demos-2.0.1.jar jung-3d-demos-2.0.1-sources
 jung-algorithms-contrib-2.0.1.jar jung-algorithms-contrib-2.0.1-sources
 jung-io-contrib-2.0.1.jar jung-io-contrib-2.0.1-sources
-jung-jai-contrib-2.0.1.jar jung-jai-contrib-2.0.1-sources
-jung-jai-samples-contrib-2.0.1.jar jung-jai-samples-contrib-2.0.1-sources
diff --git a/debian/libjung-contrib-java.jlibs b/debian/libjung-contrib-java.jlibs
index e6e5286..168e48d 100644
--- a/debian/libjung-contrib-java.jlibs
+++ b/debian/libjung-contrib-java.jlibs
@@ -1,4 +1,2 @@
 jung-algorithms-contrib-2.0.1.jar
 jung-io-contrib-2.0.1.jar
-jung-jai-contrib-2.0.1.jar
-jung-jai-samples-contrib-2.0.1.jar
diff --git a/debian/libjung-free-java-doc.javadoc b/debian/libjung-free-java-doc.javadoc
new file mode 100644
index 0000000..c7b83ec
--- /dev/null
+++ b/debian/libjung-free-java-doc.javadoc
@@ -0,0 +1 @@
+internal /usr/share/doc/libjung-free-java/api
diff --git a/debian/libjung-java.jlibs b/debian/libjung-free-java.jlibs
similarity index 100%
rename from debian/libjung-java.jlibs
rename to debian/libjung-free-java.jlibs
diff --git a/debian/libjung-java-doc.javadoc b/debian/libjung-java-doc.javadoc
deleted file mode 100644
index cb9fb3f..0000000
--- a/debian/libjung-java-doc.javadoc
+++ /dev/null
@@ -1 +0,0 @@
-internal /usr/share/doc/libjung-java/api
diff --git a/debian/rules b/debian/rules
index 462b99c..36f992d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,17 @@
 DH_VERBOSE := 1
 
 export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/commons-collections4.jar:/usr/share/java/colt.jar:/usr/share/java/jai_core-1.1.4.jar:/usr/share/java/j3dcore.jar:/usr/share/java/vecmath.jar:/usr/share/java/j3dutils.jar:./jung-api-2.0.1.jar:./jung-algorithms-2.0.1.jar:./jung-visualization-2.0.1.jar:./jung-graph-impl-2.0.1.jar:./jung-3d-2.0.1.jar:./jung-io-2.0.1.jar:./jung-jai-contrib-2.0.1.jar
+export CLASSPATH=/usr/share/java/commons-collections4.jar:/usr/share/java/colt.jar:/usr/share/java/jai_core-1.1.4.jar:/usr/share/java/j3dcore.jar:/usr/share/java/vecmath.jar:/usr/share/java/j3dutils.jar:./jung-api-2.0.1.jar:./jung-algorithms-2.0.1.jar:./jung-visualization-2.0.1.jar:./jung-graph-impl-2.0.1.jar:./jung-3d-2.0.1.jar:./jung-io-2.0.1.jar
 
 %:
 	dh $@ --with javahelper --parallel
 
+override_dh_clean:
+	rm -rf jung-3d-2.0.1-sources jung-3d-demos-2.0.1-sources jung-algorithms-2.0.1-sources jung-algorithms-contrib-2.0.1-sources
+	rm -rf jung-api-2.0.1-sources jung-graph-impl-2.0.1-sources jung-io-2.0.1-sources jung-io-contrib-2.0.1-sources jung-jai-contrib-2.0.1-sources
+	rm -rf jung-jai-samples-contrib-2.0.1-sources jung-samples-2.0.1-sources jung-samples-contrib-2.0.1-sources jung-visualization-2.0.1-sources
+	dh_clean
+
 override_dh_auto_build:
 	for jar in *.jar; do mkdir $${jar%%.jar}; cd $${jar%%.jar}; \
 		unzip ../$${jar}; find . -type f | xargs sed -i -e \
@@ -42,4 +48,5 @@ override_dh_auto_build:
 		jung-samples-2.0.1-sources/edu/uci/ics/jung/samples/GraphEditorDemo.java \
 		jung-samples-2.0.1-sources/edu/uci/ics/jung/samples/PluggableRendererDemo.java \
 		jung-samples-contrib-2.0.1-sources/edu/uci/ics/jung/samples/
+	rm -rf jung-jai-contrib-2.0.1-sources jung-jai-samples-contrib-2.0.1-sources
 	dh_auto_build

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