This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository trilead-ssh2.
commit 17727a4f9b51e1da811948a66191cf739fdf1947 Author: Matthew Johnson <[email protected]> Date: Thu Aug 13 00:12:29 2009 +0100 Imported Debian patch 211-2 --- debian/changelog | 8 +++++++ debian/control | 6 +++--- debian/javabuild | 1 + debian/rules | 63 +++++++------------------------------------------------- 4 files changed, 19 insertions(+), 59 deletions(-) diff --git a/debian/changelog b/debian/changelog index 29e1c31..843318a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +trilead-ssh2 (211-2) unstable; urgency=low + + * Change to debhelper 7 + * Add build-dep on gjdoc because that's where dh_javadoc is now + * Change to section java + + -- Matthew Johnson <[email protected]> Thu, 13 Aug 2009 00:12:29 +0100 + trilead-ssh2 (211-1) unstable; urgency=low * Initial release. (Closes: #466694) diff --git a/debian/control b/debian/control index 88a737c..e005e7a 100644 --- a/debian/control +++ b/debian/control @@ -1,9 +1,9 @@ Source: trilead-ssh2 -Section: libs +Section: java Priority: optional Maintainer: Matthew Johnson <[email protected]> -Build-Depends: debhelper (>> 5), javahelper -Build-Depends-Indep: java-gcj-compat-dev +Build-Depends: debhelper (>> 7), javahelper (>=0.20) +Build-Depends-Indep: default-jdk, gjdoc Standards-Version: 3.7.3 Homepage: http://www.trilead.com/Products/Trilead-SSH-2-Java/ diff --git a/debian/javabuild b/debian/javabuild new file mode 100644 index 0000000..0271dc5 --- /dev/null +++ b/debian/javabuild @@ -0,0 +1 @@ +trilead-ssh2.jar src diff --git a/debian/rules b/debian/rules index ccd199b..48b6786 100755 --- a/debian/rules +++ b/debian/rules @@ -1,64 +1,15 @@ #!/usr/bin/make -f -# -# Sample debian/rules that uses javahelper. -# This file was generated by jh_makepkg and may be used -# without restriction. It was inspired by the dh-make -# sample debian/rules # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -export JAVA_HOME=/usr/lib/jvm/java-gcj +export JAVA_HOME=/usr/lib/jvm/default-java -# Put depended upon jars in here -# export CLASSPATH= +%: + dh --with javahelper $@ -build: build-arch-stamp build-indep-stamp -build-arch: build-arch-stamp -build-arch-stamp: - dh_testdir - touch $@ +override_dh_installchangelogs: + dh_installchangelogs HISTORY.txt +override_dh_auto_install: + dh_javadoc --sourcedir=src -build-indep: build-indep-stamp -build-indep-stamp: - dh_testdir - # Build the package - jh_build trilead-ssh2.jar src - touch $@ - -clean: - dh_testdir - dh_testroot - jh_build --clean - dh_clean - rm -f build-arch-stamp build-indep-stamp trilead-ssh2.jar - -install-indep: build-indep - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - -binary-arch: build-arch - # Java packages are arch: all, nothing to do here - -binary-indep: build-indep install-indep - # Create the package here - dh_testdir - dh_testroot - dh_clean -k - dh_install -i - dh_installdocs -i - dh_installchangelogs -i HISTORY.txt - dh_javadoc -i --sourcedir=src - jh_installlibs -i - jh_depends -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -binary: binary-indep binary-arch -.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install-indep -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/trilead-ssh2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
