This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository jabref.
commit 7a4dbb4c5c7117936f571674191ddcac1060dff8 Author: gregor herrmann <[email protected]> Date: Tue Aug 11 16:28:12 2009 +0000 manually merge some changes in debian/ from trunk to branches/2.5 -- it seems they got lost in some merge/mv/whatever :/ --- debian/changelog | 51 +++++++++++++++++++++++++++++++-------------------- debian/control | 2 +- debian/install | 2 +- debian/links | 2 +- debian/rules | 2 +- 5 files changed, 35 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index ebd6460..3f2731c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ jabref (2.5-1) UNRELEASED; urgency=low - + * New upstream release. - -- gregor herrmann <[email protected]> Tue, 11 Aug 2009 17:33:38 +0200 + -- gregor herrmann <[email protected]> Tue, 11 Aug 2009 18:22:58 +0200 jabref (2.3.1-6) unstable; urgency=low @@ -28,33 +28,44 @@ jabref (2.3.1-5) unstable; urgency=low jabref (2.3.1-4) unstable; urgency=low - * New upstream release. - * Install the new upstream CHANGELOG instead of the removed - changelog_highlights.txt. - * Remove debian docs and install upstream README directly from - debian/rules. - * Adapt referenced filename in debian/links and debian/install. - * Refresh patch 01_free_javac. - * Add new patch 05_PrintStream_File, PrintStream(File) is undefined in - gcj. - * Move wrapper script in source package to debian/jabref-wrapper and - install it from debian/rules. * Replace /usr/lib/jvm/java-7-icedtea with /usr/lib/jvm/java-6-openjdk in wrapper script. Doesn't work on Debian yet but helps Ubuntu users (cf. LP: #225450 and LP: #203636). - * Sync debian/copyright with output of Help/About. - * Sync manpage with output of --help. + * debian/watch: use sourceforge URL directly instead of the redirector + at qa.debian.org. + * Switch patch system from dpatch to quilt. + * debian/rules: remove configure{,-stamp} targets. + * Set Standards-Version to 3.8.0; add debian/README.source to document the + patch system. + * Add patch 06_forms_groups.patch to fix an exception in the groups + interface; thanks to Monkey D. Luffy for the bug report and to Philipp + Spitzer for helping me to produce a patch (closes: #487481). + + -- gregor herrmann <[email protected]> Wed, 02 Jul 2008 20:07:03 +0200 + +jabref (2.3.1-3) unstable; urgency=low + + * Build against Debian libraries instead of pre-packaged ones + (closes: #389068): + - adapt and reactivate patch 02_libs.dpatch: use libraries in + /usr/share/java for building and don't include them in jabref.jar + - add needed jars to Classpath in the wrapper script + - add patch 05_antlr.dpatch: antlr3 in Debian is newer than the + pre-packaged jar + - add necessary packages to Build-Depends-Indep and Depends + These changes are either taken directly from Gerardo Curiel's patch or + based on them -- thanks a lot! * debian/watch: add uversionmangle to cope with upstream b(eta) releases. + * Move wrapper script in source package to debian/jabref-wrapper and + install it from debian/rules. + * Remove debian docs and install upstream README directly from + debian/rules. * debian/control: - change my email address - replace java-gcj-compat-dev with default-jdk-builddep in Build-Depends-Indep - * debian/watch: use sourceforge URL directly instead of the redirector - at qa.debian.org. - * Set Standards-Version to 3.8.0; add debian/README.source to document - the patch system. - -- gregor herrmann <[email protected]> Sun, 20 Apr 2008 15:20:12 +0200 + -- gregor herrmann <[email protected]> Tue, 22 Apr 2008 21:33:33 +0200 jabref (2.3.1-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 077f465..29c89d8 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), dpatch, ant +Build-Depends: debhelper (>= 6), quilt, ant Build-Depends-Indep: openjdk-6-jdk, 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), diff --git a/debian/install b/debian/install index cde0c70..0c29699 100644 --- a/debian/install +++ b/debian/install @@ -1,3 +1,3 @@ -build/lib/JabRef-2.4b.jar usr/share/java +build/lib/JabRef-2.5.jar usr/share/java build/*.xpm usr/share/pixmaps debian/jabref.desktop usr/share/applications diff --git a/debian/links b/debian/links index 542938e..2ce7d2c 100644 --- a/debian/links +++ b/debian/links @@ -1 +1 @@ -usr/share/java/JabRef-2.4b.jar usr/share/java/jabref.jar +usr/share/java/JabRef-2.5.jar usr/share/java/jabref.jar diff --git a/debian/rules b/debian/rules index c7de7e3..ea561f2 100755 --- a/debian/rules +++ b/debian/rules @@ -59,4 +59,4 @@ binary-arch: build install # We have nothing to do. binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +.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
