Author: sylvestre Date: 2014-05-12 12:46:22 +0000 (Mon, 12 May 2014) New Revision: 18129
Added: trunk/jmagick/debian/patches/0001-Use-pkgconfig-for-flags.patch Modified: trunk/jmagick/debian/changelog trunk/jmagick/debian/control trunk/jmagick/debian/patches/series trunk/jmagick/debian/rules Log: * Team upload * Standards-Version updated to 3.9.5 * Use pkg-config for the imagemagick transition. Thanks to Bastien Roucaries (Closes: #747856) Modified: trunk/jmagick/debian/changelog =================================================================== --- trunk/jmagick/debian/changelog 2014-05-11 15:23:40 UTC (rev 18128) +++ trunk/jmagick/debian/changelog 2014-05-12 12:46:22 UTC (rev 18129) @@ -1,3 +1,12 @@ +jmagick (6.6.9~20130201-svn99-2) unstable; urgency=medium + + * Team upload + * Standards-Version updated to 3.9.5 + * Use pkg-config for the imagemagick transition. + Thanks to Bastien Roucaries (Closes: #747856) + + -- Sylvestre Ledru <[email protected]> Mon, 12 May 2014 13:32:28 +0200 + jmagick (6.6.9~20130201-svn99-1) unstable; urgency=low * Team upload. Modified: trunk/jmagick/debian/control =================================================================== --- trunk/jmagick/debian/control 2014-05-11 15:23:40 UTC (rev 18128) +++ trunk/jmagick/debian/control 2014-05-12 12:46:22 UTC (rev 18129) @@ -3,7 +3,7 @@ Uploaders: Varun Hiremath <[email protected]> Section: graphics Priority: optional -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Build-Depends: autotools-dev, cdbs, chrpath, @@ -11,7 +11,8 @@ default-jdk, hardening-wrapper, libmagickcore-dev, - maven-repo-helper + maven-repo-helper, + autoconf Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jmagick Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/jmagick Homepage: http://sourceforge.net/projects/jmagick/ Added: trunk/jmagick/debian/patches/0001-Use-pkgconfig-for-flags.patch =================================================================== --- trunk/jmagick/debian/patches/0001-Use-pkgconfig-for-flags.patch (rev 0) +++ trunk/jmagick/debian/patches/0001-Use-pkgconfig-for-flags.patch 2014-05-12 12:46:22 UTC (rev 18129) @@ -0,0 +1,52 @@ +diff --git a/configure.in b/configure.in +index 93de0f7..58da3d4 100644 +--- a/configure.in ++++ b/configure.in +@@ -241,6 +241,15 @@ AC_ARG_ENABLE(diagnostic, + C_DEBUG=-DDIAGNOSTIC,C_DEBUG=) + AC_SUBST(C_DEBUG) + ++AC_PATH_PROG(PKGCONFIG, pkg-config, not_found) ++USE_PKGCONFIG='no' ++if (test PKGCONFIG != 'not_found') ; then ++ if pkg-config MagickCore > /dev/null 2>/dev/null; then ++ USE_PKGCONFIG='yes' ++ fi ++fi ++ ++if (test USE_PKGCONFIG == 'no') ; then + dnl Check if ImageMagick home specified + AC_ARG_WITH(magick-home, --with-magick-home=path home directory of ImageMagick, + MAGICK_HOME=${withval}) +@@ -289,6 +298,13 @@ AC_ARG_WITH(magick-inc-dir, + if ( test -f ${MAGICK_INCLUDE_PATH}/magick/api.h ) ; then + MAGICK_INCLUDES=-I${MAGICK_INCLUDE_PATH} + fi ++# pkgconfig ++else ++ MAGICK_LIBS=`pkg-config --libs-only-l MagickCore` ++ MAGICK_LDFLAGS=`pkg-config --libs-only-L --libs-only-other MagickCore` ++ MAGICK_CFLAGS=`pkg-config --cflags-only-other MagickCore` ++ MAGICK_INCLUDES=`pkg-config --cflags-only-I MagickCore` ++fi + + dnl Check for the ImageMagick header file magick/api.h + OLD_CPPFLAGS=${CPPFLAGS} +@@ -306,12 +322,17 @@ OLD_LDFLAGS=${LDFLAGS} + if test -n "${MAGICK_LIBS}"; then + LDFLAGS="${MAGICK_LIBS} ${LDFLAGS}" + fi ++if (test USE_PKGCONFIG=='no'); then + AC_CHECK_LIB(Magick, ConstituteImage, + HAVE_MAGICK_LIB=yes, HAVE_MAGICK_LIB=no) + if test ${HAVE_ImageMagick-6.2.4MAGICK_LIB} = no; then + AC_MSG_ERROR('Unable to find ImageMagick library') + fi ++else ++ HAVE_MAGICK_LIB='yes'; ++fi + LDFLAGS=${OLD_LDFLAGS} ++CFLAGS="${CFLAGS} ${MAGICK_CFLAGS}" + + + Modified: trunk/jmagick/debian/patches/series =================================================================== --- trunk/jmagick/debian/patches/series 2014-05-11 15:23:40 UTC (rev 18128) +++ trunk/jmagick/debian/patches/series 2014-05-12 12:46:22 UTC (rev 18129) @@ -1,2 +1,3 @@ 01_fix_load_jnilib.patch +0001-Use-pkgconfig-for-flags.patch Modified: trunk/jmagick/debian/rules =================================================================== --- trunk/jmagick/debian/rules 2014-05-11 15:23:40 UTC (rev 18128) +++ trunk/jmagick/debian/rules 2014-05-12 12:46:22 UTC (rev 18129) @@ -18,6 +18,7 @@ DEB_DH_INSTALL_SOURCEDIR = debian/tmp DEB_COMPRESS_EXCLUDE = .java DEB_INSTALL_CHANGELOGS_ALL := Changelog.txt +DEB_AUTO_UPDATE_AUTOCONF := yes VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^~-]+).*,\1,p') export JFLAGS = -source 1.6 -target 1.6 -g _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
