This is an automated email from the git hooks/post-receive script. xhaakon-guest pushed a commit to branch master in repository sacjava.
commit 2a87bc682aa650fc94b15043370eb738d5fd53b1 Author: Niels Thykier <[email protected]> Date: Mon Jun 25 08:01:40 2012 +0000 Fix FTBFS with gcj and add missing mh_clean target --- debian/changelog | 11 +++++++++++ debian/control | 3 ++- debian/rules | 22 +++++++++++++++------- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index b5ea729..41cf17d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +sacjava (1.3-6) UNRELEASED; urgency=low + + * Team upload. + * Skip javadoc compilation in build-arch target. + (Closes: #678905) + * Add missing call to mh_clean. + * Add versioned Build-Depends on dpkg-dev to ensure + build-arch is available. + + -- Niels Thykier <[email protected]> Mon, 25 Jun 2012 09:46:11 +0200 + sacjava (1.3-5) unstable; urgency=low * Team upload. diff --git a/debian/control b/debian/control index 1a41cf7..163ee06 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,8 @@ Source: sacjava Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Rene Engelhard <[email protected]> -Build-Depends: debhelper (>= 8), default-jdk, gcj-native-helper, maven-repo-helper +Build-Depends: debhelper (>= 8), default-jdk, dpkg-dev (>= 1.16.2), + gcj-native-helper, maven-repo-helper Standards-Version: 3.9.2 Section: java Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/sacjava diff --git a/debian/rules b/debian/rules index 65e357b..1c42b1f 100755 --- a/debian/rules +++ b/debian/rules @@ -10,30 +10,38 @@ configure-stamp: build: build-arch build-indep build-arch: build-stamp -build-indep: build-stamp +build-indep: build-stamp build-indep-stamp + +build-indep-stamp: configure-stamp + if [ ! -d doc ]; then mkdir doc; fi + /usr/lib/jvm/default-java/bin/javadoc -source 1.5 -d doc `find org -name "*.java" | xargs` + + touch $@ + build-stamp: configure-stamp dh_testdir /usr/lib/jvm/default-java/bin/javac -source 1.5 -target 1.5 `find org -name "*.java" | xargs` /usr/lib/jvm/default-java/bin/jar cvf sac-1.3.jar `find org -name "*.class" | xargs` - if [ ! -d doc ]; then mkdir doc; fi - /usr/lib/jvm/default-java/bin/javadoc -source 1.5 -d doc `find org -name "*.java" | xargs` touch $@ clean: dh_testdir dh_testroot - rm -f build-stamp configure-stamp + rm -f build-stamp build-indep-stamp configure-stamp rm -f sac.jar sac-1.3.jar -find org -name "*.class" | xargs rm # remove this; will be rebuilt rm -rf doc + mh_clean dh_clean -install: build +install: + @[ -f build-stamp -o -f build-indep-stamp ] || \ + ( echo "Package has not been build! Use binary{,-arch,-indep} target" >&2 ) dh_testdir dh_testroot dh_prep @@ -42,7 +50,7 @@ install: build mh_installpom -plibsac-java debian/pom.xml mh_installjar -plibsac-java -l debian/pom.xml sac-1.3.jar -binary-indep: build install +binary-indep: build-indep install dh_testdir dh_testroot dh_installchangelogs -i @@ -55,7 +63,7 @@ binary-indep: build install dh_md5sums -i dh_builddeb -i -binary-arch: build install +binary-arch: build-arch install dh_testdir dh_testroot dh_installchangelogs -s -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sacjava.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
