[med-svn] [libjung-java] 01/01: fix FTBS

[Michael Crusoe]

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 b60dd86372cf31f1e299d383348f843ebaa08a27
Author: Michael R. Crusoe <mcrusoe at msu.edu>
Date:   Sun Feb 15 21:31:22 2015 -0500

    fix FTBS
---
 debian/control | 16 +++++++++++-----
 debian/rules   | 18 ++----------------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/debian/control b/debian/control
index a0bbfb7..d749d46 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,23 @@
 Source: libjung-java
-Section: java
-Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Michael R. Crusoe <mcrusoe at msu.edu>
-Build-Depends: debhelper (>= 9), javahelper
+Section: java
+Priority: optional
+Build-Depends: debhelper (>= 9),
+               javahelper,
+               unzip
+Build-Depends-Indep: default-jdk,
+                     libcolt-java
 Standards-Version: 3.9.6
 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
-Architecture: any
-Depends: ${java:Depends}, ${misc:Depends}
+Architecture: all
+Depends: ${java:Depends},
+         ${misc:Depends}
+Recommends: ${java:Recommends}
 Description: Java Universal Network/Graph Framework
  JUNG provides a common and extendible language for the modeling, analysis, and
  visualization of data that can be represented as a graph or network.
diff --git a/debian/rules b/debian/rules
index dac7856..35b1ebe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,20 +2,6 @@
 
 DH_VERBOSE := 1
 
-# some helpful variables - uncomment them if needed
-# shamelessly stolen from http://jmtd.net/log/awk/
-#DEBVERS        := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
-#VERSION        := $(shell echo '$(DEBVERS)' | sed -e 's/^[0-9]*://' -e 's/-.*//')
-#DEBFLAVOR      := $(shell dpkg-parsechangelog | awk '/^Distribution:/ {print $$2}')
-#DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
-#DEBIAN_BRANCH  := $(shell awk 'BEGIN{FS="[= ]+"} /debian-branch/ {print $$2}' debian/gbp.conf)
-#GIT_TAG        := $(subst ~,_,$(VERSION))
-
-# alternatively to manually set those variables you can
-#  include /usr/share/cdbs/1/rules/buildvars.mk
-# and use what is set there.  Any hint whether dh might set variables in
-# a similar manner are welcome.
-
 export JAVA_HOME=/usr/lib/jvm/default-java
 export CLASSPATH=/usr/share/java/commons-collections4.jar:/usr/share/java/colt.jar:./collections15.jar:./jung-api-2.0.1.jar
 
@@ -23,8 +9,8 @@ export CLASSPATH=/usr/share/java/commons-collections4.jar:/usr/share/java/colt.j
 	dh $@ --with javahelper
 
 override_dh_auto_build:
-	for jar in *.jar; do mkdir $${jar%%.jar}; pushd $${jar%%.jar}; \
-		unzip ../$${jar}; popd; done
+	for jar in *.jar; do mkdir $${jar%%.jar}; cd $${jar%%.jar}; \
+		unzip ../$${jar}; cd ..; done
 		#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/' \

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