[med-svn] [libjung-java] 03/03: avoid non DFSG files, add unzip target, remove deps
Michael Crusoe
misterc-guest at moszumanska.debian.org
Thu Jan 14 10:47:21 UTC 2016
This is an automated email from the git hooks/post-receive script.
misterc-guest pushed a commit to branch master
in repository libjung-java.
commit 7e6c39e60e2367b5e7a3fa3221366d519b58ac57
Author: Michael R. Crusoe <crusoe at ucdavis.edu>
Date: Thu Jan 14 01:00:38 2016 -0800
avoid non DFSG files, add unzip target, remove deps
---
debian/changelog | 7 ++-
debian/control | 3 +-
debian/copyright | 24 ++------
debian/javabuild | 2 -
debian/libjung-free-java.jlibs | 2 -
debian/patches/use-apache-commons-collections | 79 ---------------------------
debian/rules | 14 ++---
debian/watch | 4 +-
8 files changed, 20 insertions(+), 115 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b178d0a..f2e6d8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-libjung-free-java (2.0.1-1) unstable; urgency=low
+libjung-free-java (2.0.1+dfsg-1) unstable; urgency=low
* Initial release (Closes: #368931)
+ * Removed 3d classes for due to the licence of
+ "edu/uci/ics/jung/visualization3d/control/*"
+
[ Olivier Sallou ]
* Remove jai classes for licensing reasons. Thoses classes are independent
and do not prevent use of the provided classes.
- -- Michael R. Crusoe <mcrusoe at msu.edu> Fri, 13 Feb 2015 11:52:45 -0500
+ -- Michael R. Crusoe <crusoe at ucdavis.edu> Thu, 14 Jan 2016 01:08:31 -0800
diff --git a/debian/control b/debian/control
index 40d7262..be847f0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
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>,
+Uploaders: Michael R. Crusoe <crusoe at ucdavis.edu>,
Olivier Sallou <osallou at debian.org>
Section: java
Priority: optional
@@ -10,7 +10,6 @@ Build-Depends: debhelper (>= 9),
Build-Depends-Indep: default-jdk,
libcolt-free-java,
libcommons-collections4-java,
- libjava3d-java,
libvecmath-java
Standards-Version: 3.9.6
Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/libjung-java.git
diff --git a/debian/copyright b/debian/copyright
index 6ee0f98..9f5dcd8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,10 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: JUNG
Source: http://sourceforge.net/projects/jung/files/jung/jung-2.0.1/jung2-2_0_1-sources.zip/download
+Files-Excluded: jung-3d-2.0.1-sources.jar
+ jung-3d-demos-2.0.1-sources.jar
+ jung-jai-2.0.1-sources.jar
+ jung-jai-samples-2.0.1-sources.jar
Files: *
Copyright: © 2003-2004, Regents of the University of California and the JUNG Project
@@ -9,27 +13,9 @@ License: BSD-3-clause
Files: debian/*
Copyright: 2014 Michigan State University
2015 Olivier Sallou <osallou@ðebian.org>
+ 2016 Regents of the University of California
License: BSD-3-clause
-Files: debian/patches/collections15
-Copyright: 1999-2004, The Apache Software Foundation
-Comment: Source http://sourceforge.net/projects/collections/
-License: Apache-2.0
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- .
- http://www.apache.org/licenses/LICENSE-2.0
- .
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- .
- On Debian systems, the complete text of the Apache License version 2.0
- can be found in "/usr/share/common-licenses/Apache-2.0".
-
License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
diff --git a/debian/javabuild b/debian/javabuild
index 5b505dd..c417f88 100644
--- a/debian/javabuild
+++ b/debian/javabuild
@@ -4,5 +4,3 @@ jung-graph-impl-2.0.1.jar jung-graph-impl-2.0.1-sources
jung-io-2.0.1.jar jung-io-2.0.1-sources
jung-visualization-2.0.1.jar jung-visualization-2.0.1-sources
jung-samples-2.0.1.jar jung-samples-2.0.1-sources
-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
diff --git a/debian/libjung-free-java.jlibs b/debian/libjung-free-java.jlibs
index 9fb22ce..c1d34d3 100644
--- a/debian/libjung-free-java.jlibs
+++ b/debian/libjung-free-java.jlibs
@@ -4,5 +4,3 @@ jung-graph-impl-2.0.1.jar
jung-io-2.0.1.jar
jung-visualization-2.0.1.jar
jung-samples-2.0.1.jar
-jung-3d-2.0.1.jar
-jung-3d-demos-2.0.1.jar
diff --git a/debian/patches/use-apache-commons-collections b/debian/patches/use-apache-commons-collections
index 5494a7f..fc5431c 100644
--- a/debian/patches/use-apache-commons-collections
+++ b/debian/patches/use-apache-commons-collections
@@ -181,85 +181,6 @@ and http://commons.apache.org/proper/commons-collections/release_4_0.html
new ToStringLabeller<String>(),
new Transformer<String,String>() {
public String transform(String input) {
---- a/jung-3d-2.0.1-sources/edu/uci/ics/jung/algorithms/layout3d/SpringLayout.java
-+++ b/jung-3d-2.0.1-sources/edu/uci/ics/jung/algorithms/layout3d/SpringLayout.java
-@@ -159,7 +159,7 @@
-
- try {
- for(E e : graph.getEdges()) {
-- SpringEdgeData<E> sed = getSpringData(e);
-+ SpringEdgeData<E> sed = getSpringEData(e);
- calcEdgeLength(sed, lengthFunction);
- }
- } catch(ConcurrentModificationException cme) {
-@@ -184,7 +184,7 @@
- step++;
- try {
- for(V v : getGraph().getVertices()) {
-- SpringVertexData svd = getSpringData(v);
-+ SpringVertexData svd = getSpringVData(v);
- // System.err.println("svd = "+svd);
- if (svd == null) {
- continue;
-@@ -224,7 +224,7 @@
- double vz = p1.getZ() - p2.getZ();
- double len = Math.sqrt(vx * vx + vy * vy + vz * vz);
-
-- SpringEdgeData<E> sed = getSpringData(e);
-+ SpringEdgeData<E> sed = getSpringEData(e);
- if (sed == null) {
- continue;
- }
-@@ -243,8 +243,8 @@
- double dy = f * vy;
- double dz = f * vz;
- SpringVertexData v1D, v2D;
-- v1D = getSpringData(v1);
-- v2D = getSpringData(v2);
-+ v1D = getSpringVData(v1);
-+ v2D = getSpringVData(v2);
-
- sed.f = f;
-
-@@ -265,7 +265,7 @@
- for (V v : getGraph().getVertices()) {
- if (isLocked(v)) continue;
-
-- SpringVertexData svd = getSpringData(v);
-+ SpringVertexData svd = getSpringVData(v);
- if(svd == null) continue;
- double dx = 0, dy = 0, dz = 0;
-
-@@ -308,7 +308,7 @@
- try {
- for (V v : getGraph().getVertices()) {
- if (isLocked(v)) continue;
-- SpringVertexData vd = getSpringData(v);
-+ SpringVertexData vd = getSpringVData(v);
- if(vd == null) continue;
- Point3f xyd = transform(v);
-
-@@ -352,11 +352,11 @@
- }
- }
-
-- public SpringVertexData getSpringData(V v) {
-+ public SpringVertexData getSpringVData(V v) {
- return springVertexData.get(v);
- }
-
-- public SpringEdgeData<E> getSpringData(E e) {
-+ public SpringEdgeData<E> getSpringEData(E e) {
- return springEdgeData.get(e);
- }
-
-@@ -477,4 +477,4 @@
- // locations.clear();
- // initialize();
- }
--}
-\ No newline at end of file
-+}
--- a/jung-samples-2.0.1-sources/edu/uci/ics/jung/samples/GraphEditorDemo.java
+++ b/jung-samples-2.0.1-sources/edu/uci/ics/jung/samples/GraphEditorDemo.java
@@ -146,11 +146,11 @@
diff --git a/debian/rules b/debian/rules
index 2477c17..2f2823a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
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
+export CLASSPATH=/usr/share/java/commons-collections4.jar:/usr/share/java/colt.jar:/usr/share/java/vecmath.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-io-2.0.1.jar
%:
dh $@ --with javahelper --parallel
@@ -14,9 +14,8 @@ override_dh_clean:
rm -rf jung-samples-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 \
+override_dh_auto_build: unzip
+ for jar in *.jar; do cd $${jar%%.jar}; find . -type f | xargs sed -i -e \
's/org.apache.commons.collections15/org.apache.commons.collections4/' \
-e 's/org.apache.commons.collections4.Buffer/java.util.Queue/' \
-e 's/org.apache.commons.collections4.buffer.UnboundedFifoBuffer/java.util.LinkedList/' \
@@ -31,7 +30,8 @@ override_dh_auto_build:
-e 's/TruePredicate.getInstance/TruePredicate.truePredicate/' ; \
cd ..; done;
patch -p1 < debian/patches/use-apache-commons-collections
- mv jung-jai-2.0.1-sources jung-jai-contrib-2.0.1-sources
- mv jung-jai-samples-2.0.1-sources jung-jai-samples-contrib-2.0.1-sources
- rm -rf jung-jai-contrib-2.0.1-sources jung-jai-samples-contrib-2.0.1-sources
dh_auto_build
+
+unzip:
+ for jar in *.jar; do mkdir $${jar%%.jar}; cd $${jar%%.jar}; \
+ unzip ../$${jar}; cd ..; done
diff --git a/debian/watch b/debian/watch
index 9aac64a..f17d5df 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=3
-# Uncomment to find new files on sourceforge
-http://sf.net/jung/jung2-(\d)_(\d)_(\d)-sources\.zip
+opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g" \
+ http://sf.net/jung/jung2-(\d)_(\d)_(\d)-sources\.zip
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libjung-java.git
More information about the debian-med-commit
mailing list