Author: ebourg-guest Date: 2013-10-07 09:40:34 +0000 (Mon, 07 Oct 2013) New Revision: 17307
Modified: trunk/jmagick/debian/changelog trunk/jmagick/debian/libjmagick6-java.examples trunk/jmagick/debian/patches/01_fix_load_jnilib.patch trunk/jmagick/debian/rules Log: New upstream release (6.4.0) Modified: trunk/jmagick/debian/changelog =================================================================== --- trunk/jmagick/debian/changelog 2013-10-07 09:33:25 UTC (rev 17306) +++ trunk/jmagick/debian/changelog 2013-10-07 09:40:34 UTC (rev 17307) @@ -1,11 +1,14 @@ -jmagick (6.2.6-0-9) UNRELEASED; urgency=low +jmagick (6.4.0-1) UNRELEASED; urgency=low * Team upload. - * Use canonical URLs for the Vcs-* fields - * Removed Michael Koch from the uploaders (Closes: #654036) + * New upstream release + - Refreshed the patch + * debian/control: + - Use canonical URLs for the Vcs-* fields + - Removed Michael Koch from the uploaders (Closes: #654036) + - Updated Standards-Version to 3.9.4 (no changes) * debian/copyright: Refer to the GPL-2 in /usr/share/common-licenses * Use XZ compression for the upstream tarball - * Updated Standards-Version to 3.9.4 (no changes) * debian/rules: Install the upstream changelog -- Emmanuel Bourg <[email protected]> Mon, 07 Oct 2013 08:46:56 +0200 Modified: trunk/jmagick/debian/libjmagick6-java.examples =================================================================== --- trunk/jmagick/debian/libjmagick6-java.examples 2013-10-07 09:33:25 UTC (rev 17306) +++ trunk/jmagick/debian/libjmagick6-java.examples 2013-10-07 09:40:34 UTC (rev 17307) @@ -1,5 +1,2 @@ -src/test/Loop.java -src/test/MagickWindow.java -src/test/Test.java -src/test/pics.jpg +test/magicktest/* debian/examples/Makefile Modified: trunk/jmagick/debian/patches/01_fix_load_jnilib.patch =================================================================== --- trunk/jmagick/debian/patches/01_fix_load_jnilib.patch 2013-10-07 09:33:25 UTC (rev 17306) +++ trunk/jmagick/debian/patches/01_fix_load_jnilib.patch 2013-10-07 09:40:34 UTC (rev 17307) @@ -1,6 +1,5 @@ -diff -Nur jmagick-6.2.6-0.orig/src/magick/Magick.java jmagick-6.2.6-0.orig.new/src/magick/Magick.java ---- jmagick-6.2.6-0.orig/src/magick/Magick.java 2002-07-07 13:46:53.000000000 +0530 -+++ jmagick-6.2.6-0.orig.new/src/magick/Magick.java 2007-10-14 10:27:51.000000000 +0530 +--- a/src/magick/Magick.java ++++ b/src/magick/Magick.java @@ -15,28 +15,7 @@ public class Magick { @@ -25,9 +24,9 @@ - } - } - else { -- System.loadLibrary("JMagick"); +- System.loadLibrary("JMagick"); - } -+ System.loadLibrary("JMagick"); ++ System.loadLibrary("JMagick"); + init(); } - /** Modified: trunk/jmagick/debian/rules =================================================================== --- trunk/jmagick/debian/rules 2013-10-07 09:33:25 UTC (rev 17306) +++ trunk/jmagick/debian/rules 2013-10-07 09:40:34 UTC (rev 17307) @@ -15,7 +15,7 @@ DEB_MAKE_CHECK_TARGET = DEB_DH_INSTALL_SOURCEDIR = debian/tmp DEB_COMPRESS_EXCLUDE = .java -DEB_INSTALL_CHANGELOGS_ALL := RELEASE +DEB_INSTALL_CHANGELOGS_ALL := Changelog.txt install/libjmagick6-java:: mkdir -p $(DEB_DESTDIR)/usr/share/java @@ -34,6 +34,7 @@ clean:: rm -rf Make.def libtool config.cache config.log config.status obj/magick/.libs rm -rf autom4te.cache + rm -rf lib/*.jar .PHONY: get-orig-source get-orig-source: _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
