This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository jabref.
commit 43b0681ec5aae5b488232409675b628010a62f50 Author: gregor herrmann <[email protected]> Date: Sat Sep 12 21:45:52 2009 +0000 Switch to debhelper 7; adjust debian/{compat,control,rules}. --- debian/changelog | 3 +-- debian/compat | 2 +- debian/control | 6 ++--- debian/jabref.docs | 1 + debian/jabref.manpages | 1 + debian/rules | 59 ++++++-------------------------------------------- 6 files changed, 14 insertions(+), 58 deletions(-) diff --git a/debian/changelog b/debian/changelog index b07ac52..8f581d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,8 +29,7 @@ jabref (2.5-1) UNRELEASED; urgency=low - remove 04_HONOR_DISPLAY_PROPERTIES.patch, not needed any more - remove 06_forms_groups.patch, applied upstream - add new 06_BibtexEntry.patch - * debian/rules: install new version of changelog; don't use the deprecated - dh_dektop any more. + * Switch to debhelper 7; adjust debian/{compat,control,rules}. * Set Standards-Version to 3.8.3. * Thanks a lot to Philip Rinn for his great help in preparing this release, especially with the patches, dependencies, and the wrapper script! diff --git a/debian/compat b/debian/compat index 1e8b314..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -6 +7 diff --git a/debian/control b/debian/control index e628a88..dbf933d 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: contrib/tex Priority: optional Maintainer: gregor herrmann <[email protected]> Uploaders: tony mancill <[email protected]> -Build-Depends: debhelper (>= 6), quilt, ant +Build-Depends: debhelper (>= 7.3.7), quilt (>= 0.46-7), ant Build-Depends-Indep: default-jdk-builddep, imagemagick, liblog4j1.2-java, antlr, antlr3, libjgoodies-looks-java, libjgoodies-forms-java, libspin-java, libglazedlists-java, libmicroba-java, libpdfbox-java, libjempbox-java (>= 0.2.0), @@ -16,8 +16,8 @@ Vcs-Browser: http://svn.toastfreeware.priv.at/wsvn/ToastfreewareDebian/jabref/tr Package: jabref Architecture: all -Depends: openjdk-6-jre | sun-java6-jre | sun-java5-jre, antlr, antlr3, - libjgoodies-looks-java, libjgoodies-forms-java, libspin-java, +Depends: ${misc:Depends}, openjdk-6-jre | sun-java6-jre | sun-java5-jre, + antlr, antlr3, libjgoodies-looks-java, libjgoodies-forms-java, libspin-java, libglazedlists-java, libmicroba-java, libpdfbox-java, libjempbox-java (>= 0.2.0), java-wrappers (>= 0.1.6), libmysql-java, libcommons-logging-java, libjpf-java, libjpfcodegen-java, velocity (>=1.5) diff --git a/debian/jabref.docs b/debian/jabref.docs new file mode 100644 index 0000000..b77fc80 --- /dev/null +++ b/debian/jabref.docs @@ -0,0 +1 @@ +src/txt/README diff --git a/debian/jabref.manpages b/debian/jabref.manpages new file mode 100644 index 0000000..484e7ba --- /dev/null +++ b/debian/jabref.manpages @@ -0,0 +1 @@ +debian/jabref.1 diff --git a/debian/rules b/debian/rules index 372200d..3d1eb12 100755 --- a/debian/rules +++ b/debian/rules @@ -1,61 +1,16 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +%: + dh --with quilt $@ -include /usr/share/quilt/quilt.make - -build: build-stamp -build-stamp: $(QUILT_STAMPFN) - dh_testdir - JAVA_HOME=/usr/lib/jvm/default-java ant jars +override_dh_auto_build: + JAVA_HOME=/usr/lib/jvm/default-java dh_auto_build convert -geometry 32x32 src/images/JabRef-icon-48.png build/jabref32.xpm convert -geometry 16x16 src/images/JabRef-icon-48.png build/jabref16.xpm - touch build-stamp - -clean: unpatch - dh_testdir - dh_testroot - rm -f *-stamp - ant clean - dh_clean -install: install-stamp -install-stamp: build-stamp - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs +override_dh_auto_install: + dh_auto_install install -m 755 debian/jabref-wrapper $(CURDIR)/debian/jabref/usr/bin/jabref - touch install-stamp -# Build architecture-independent files here. -binary-indep: build install - dh_testdir - dh_testroot +override_dh_installchangelogs: dh_installchangelogs src/txt/CHANGELOG - dh_installdocs src/txt/README - dh_install - dh_installmenu - dh_installmime - dh_installman debian/jabref.1 - dh_link - dh_compress - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -# Build architecture-dependent files here. -binary-arch: build install -# We have nothing to do. - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
