[geogebra] 01/01: Fix compilation of JUNG code.

[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 0458a12e0affa1baf276aae35e300632cc1619c6
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sat May 25 09:18:58 2013 +0200

    Fix compilation of JUNG code.
---
 debian/get_orig_source.sh |   39 ++++++++++++++++++++++++++++++++++++++-
 debian/rules              |    4 ++++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/debian/get_orig_source.sh b/debian/get_orig_source.sh
index d93e642..44dc067 100755
--- a/debian/get_orig_source.sh
+++ b/debian/get_orig_source.sh
@@ -13,7 +13,44 @@ DESTTGZ="../tarballs/geogebra_$VERSION.orig.tar.gz"
 TEMPDIR="$(mktemp -d)"
 
 # Files that need to be retained from the JUNG library
-JUNG_FILES="AbstractGraph.java EdgeType.java Pair.java Graph.java MultiGraph.java Hypergraph.java SparseMultigraph.java Distance.java ShortestPath.java MapBinaryHeap.java BasicMapEntry.java DijkstraShortestPath.java DijkstraDistance.java"
+JUNG_FILES="
+AbstractGraph.java
+AbstractIterativeScorer.java
+AbstractIterativeScorerWithPriors.java
+AbstractLayout.java
+BasicMapEntry.java
+BetweennessCentrality.java
+DelegateToEdgeTransformer.java
+DijkstraDistance.java
+DijkstraShortestPath.java
+DirectedGraph.java
+Distance.java
+EdgeScorer.java
+EdgeType.java
+GraphDecorator.java
+GraphEvent.java
+GraphEventListener.java
+Graph.java
+HITS.java
+HITSWithPriors.java
+Hypergraph.java
+IterativeContext.java
+IterativeProcess.java
+KStepMarkov.java
+Layout.java
+MapBinaryHeap.java
+MultiGraph.java
+PageRankWithPriors.java
+Pair.java
+RandomLocationTransformer.java
+Relaxer.java
+ScoringUtils.java
+ShortestPath.java
+SparseMultigraph.java
+UndirectedGraph.java
+UniformDegreeWeight.java
+VEPair.java
+VertexScorer.java"
 
 if [ "x$ONLYFILTER" == "x" ] ; then
 	# Downloads code from SVN repository
diff --git a/debian/rules b/debian/rules
index cd723a8..4024306 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,6 +31,10 @@ override_dh_auto_configure:
 	cp -rl desktop/geogebra src
 	cp -rl desktop/edu src
 
+	# Don't ask me why upstream is keeping the code like this
+	cp -a src/geogebra/jung/* src
+	rm -fr src/geogebra/jung
+
 	# Create a hook class for the Debian package
 	./debian/create_debian_class.sh $$(dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2) > src/geogebra/GeoGebraDebian.java
 

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