diff -Nru encadre-image-0.7/debian/changelog encadre-image-0.7/debian/changelog --- encadre-image-0.7/debian/changelog 2014-11-12 08:11:18.000000000 +0000 +++ encadre-image-0.7/debian/changelog 2014-10-30 15:26:03.000000000 +0000 @@ -1,3 +1,17 @@ +encadre-image (0.7-0ubuntu14) vivid; urgency=medium + + * Convert to 3.0 (quilt) source format. + * Convert to modern debhelper, dh-autoreconf, and dh-exec. + * Use pkg-config to get ImageMagick build flags. + + -- Colin Watson Thu, 30 Oct 2014 15:26:02 +0000 + +encadre-image (0.7-0ubuntu13) vivid; urgency=medium + + * Rebuild against libmagickcore-6.q16-2. + + -- Colin Watson Thu, 30 Oct 2014 11:19:44 +0000 + encadre-image (0.7-0ubuntu12) trusty; urgency=low * Move dh_autotools-dev_updateconfig call to configure. diff -Nru encadre-image-0.7/debian/compat encadre-image-0.7/debian/compat --- encadre-image-0.7/debian/compat 2014-11-12 08:11:18.000000000 +0000 +++ encadre-image-0.7/debian/compat 2014-10-30 14:00:13.000000000 +0000 @@ -1 +1 @@ -5 +9 diff -Nru encadre-image-0.7/debian/control encadre-image-0.7/debian/control --- encadre-image-0.7/debian/control 2014-11-12 08:11:18.000000000 +0000 +++ encadre-image-0.7/debian/control 2014-10-30 15:25:54.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Cyril LAVIER -Build-Depends: debhelper (>= 5), autotools-dev, libwxgtk2.8-dev, libmagick++-dev +Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 9), dh-autoreconf, dh-exec, libwxgtk2.8-dev, libmagick++-dev, pkg-config Standards-Version: 3.8.4 Package: encadre-image diff -Nru encadre-image-0.7/debian/install encadre-image-0.7/debian/install --- encadre-image-0.7/debian/install 1970-01-01 00:00:00.000000000 +0000 +++ encadre-image-0.7/debian/install 2014-10-30 14:03:06.000000000 +0000 @@ -0,0 +1,2 @@ +#! /usr/bin/dh-exec +src/encadre_image => /usr/bin/encadre-image diff -Nru encadre-image-0.7/debian/manpages encadre-image-0.7/debian/manpages --- encadre-image-0.7/debian/manpages 1970-01-01 00:00:00.000000000 +0000 +++ encadre-image-0.7/debian/manpages 2014-10-30 14:03:46.000000000 +0000 @@ -0,0 +1 @@ +debian/encadre-image.1 diff -Nru encadre-image-0.7/debian/patches/imagemagick-pkg-config.patch encadre-image-0.7/debian/patches/imagemagick-pkg-config.patch --- encadre-image-0.7/debian/patches/imagemagick-pkg-config.patch 1970-01-01 00:00:00.000000000 +0000 +++ encadre-image-0.7/debian/patches/imagemagick-pkg-config.patch 2014-10-30 15:08:21.000000000 +0000 @@ -0,0 +1,40 @@ +Description: Use pkg-config to get ImageMagick build flags +Author: Colin Watson +Forwarded: no +Last-Update: 2014-10-30 + +Index: b/configure.in +=================================================================== +--- a/configure.in ++++ b/configure.in +@@ -77,6 +77,8 @@ + AC_DEFINE_UNQUOTED(PACKAGE_MENU_DIR, "${packageprefix}/${packagemenudir}") + AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}") + ++PKG_CHECK_MODULES([MAGICK], [Magick++]) ++ + AC_OUTPUT([ + Makefile + include/Makefile +Index: b/src/Makefile.am +=================================================================== +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -8,7 +8,7 @@ + -I../include + + AM_CXXFLAGS =\ +- `Magick++-config --cxxflags --cppflags` `wx-config --cxxflags --cppflags `\ ++ $(MAGICK_CFLAGS) `wx-config --cxxflags --cppflags `\ + -Wall\ + -g + +@@ -32,7 +32,7 @@ + ThreadTraitement.cc + + encadre_image_LDFLAGS = \ +- `Magick++-config --ldflags --libs` `wx-config --libs ` ++ $(MAGICK_LIBS) `wx-config --libs ` + + encadre_image_LDADD = + diff -Nru encadre-image-0.7/debian/patches/series encadre-image-0.7/debian/patches/series --- encadre-image-0.7/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ encadre-image-0.7/debian/patches/series 2014-10-30 14:04:57.000000000 +0000 @@ -0,0 +1 @@ +imagemagick-pkg-config.patch diff -Nru encadre-image-0.7/debian/rules encadre-image-0.7/debian/rules --- encadre-image-0.7/debian/rules 2014-11-12 08:11:18.000000000 +0000 +++ encadre-image-0.7/debian/rules 2014-10-30 15:17:02.000000000 +0000 @@ -1,92 +1,10 @@ -#!/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. +#! /usr/bin/make -f -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DEB_CFLAGS_MAINT_APPEND := -Wall +export DEB_LDFLAGS_MAINT_APPEND := -Wl,-z,defs +%: + dh $@ --with=autoreconf -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -config.status: configure - dh_autotools-dev_updateconfig - dh_testdir - # Add here commands to configure the package. - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" - - -build: build-stamp - -build-stamp: config.status - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - #docbook-to-man debian/encadre-image.sgml > encadre-image.1 - - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean - - dh_autotools-dev_restoreconfig - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/encadre-image. - # $(MAKE) install DESTDIR=$(CURDIR)/debian/encadre-image - mkdir -p debian/encadre-image/usr/bin - mv ./src/encadre_image ./src/encadre-image - cp ./src/encadre-image debian/encadre-image/usr/bin/ - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs - dh_installexamples - dh_installman debian/encadre-image.1 - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +override_dh_auto_install: + : diff -Nru encadre-image-0.7/debian/source/format encadre-image-0.7/debian/source/format --- encadre-image-0.7/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ encadre-image-0.7/debian/source/format 2014-10-30 13:58:48.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt)