diff -urN debian.old/changelog debian.new/changelog --- debian.old/changelog 2007-12-26 00:50:29.000000000 -0200 +++ debian.new/changelog 2007-12-26 00:50:14.000000000 -0200 @@ -1,4 +1,4 @@ -imagemagick (7:6.3.7.2.dfsg1-1) experimental; urgency=low +imagemagick (7:6.3.7.7.dfsg1-1) experimental; urgency=low * New upstream release (Closes: #339776, #420672, #454809) - fixed wrong image size when using montage (Closes: #357013); diff -urN debian.old/control debian.new/control --- debian.old/control 2007-12-26 00:50:29.000000000 -0200 +++ debian.new/control 2007-12-26 00:50:14.000000000 -0200 @@ -28,28 +28,28 @@ files. It will however function happily without it (as long as you don't want to read postscript). -Package: libmagick +Package: libmagick10 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: libwmf-bin -Conflicts: libmagick9, libmagick-lzw, libmagick5g, imagemagick (<=5:6.0.1.2-1), libmagick5 (>= 4:5.5.1-1 ), libmagick6.0.1 -Replaces: libmagick-lzw, libmagick5g, imagemagick (<=5:6.0.1.2-1), libmagick5 (>= 4:5.5.1) +Conflicts: libmagick-lzw, libmagick5g, imagemagick (<=5:6.0.1.2-1), libmagick5 (>= 4:5.5.1-1 ), libmagick6.0.1, libmagick9 +Replaces: libmagick-lzw, libmagick5g, imagemagick (<=5:6.0.1.2-1), libmagick5 (>= 4:5.5.1), libmagick9 Description: Image manipulation library LibMagick supports loading and saving a very large set of image formats. It allows a lot of image manipulation as well. -Package: libmagick-dev +Package: libmagick10-dev Architecture: any Section: libdevel -Depends: libmagick (= ${binary:Version}), libjpeg62-dev, libbz2-dev, libtiff4-dev, libwmf-dev (>= 0.2.7-1), libz-dev, libpng12-dev, libx11-dev, libxt-dev, libxext-dev, libxml2-dev, libfreetype6-dev, liblcms1-dev, libexif-dev, libjasper-dev, libltdl3-dev -Conflicts: imagemagick-dev, libmagick5.5.1 (<= 5:5.5.1.4-1), libmagick9-dev, libmagick6-dev +Depends: libmagick10 (= ${binary:Version}), libjpeg62-dev, libbz2-dev, libtiff4-dev, libwmf-dev (>= 0.2.7-1), libz-dev, libpng12-dev, libx11-dev, libxt-dev, libxext-dev, libxml2-dev, libfreetype6-dev, liblcms1-dev, libexif-dev, libjasper-dev, libltdl3-dev +Conflicts: imagemagick-dev, libmagick5.5.1 (<= 5:5.5.1.4-1), libmagick6-dev, libmagick9-dev Replaces: imagemagick (<= 5:6.0.1.2-1), libmagick5.5.1 (<= 4:5.5.1.4-1), libmagick5, libmagick6-dev, libmagick9-dev Description: Image manipulation library -- development This package includes header files and static libraries needed to compile programs using libMagick. -Package: libmagick++ +Package: libmagick++10 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -75,11 +75,11 @@ provided so that operations may be performed on multiple images stored in STL containers. -Package: libmagick++-dev +Package: libmagick++10-dev Architecture: any Section: libdevel -Depends: libmagick++ (= ${binary:Version}), libmagick-dev (= ${binary:Version}) -Conflicts: libmagick++0-dev, libmagick++5.5.1 (<= 4:5.5.1.4-1), libmagick++5, libmagick++-dev, imagemagick(<= 5:6.0.1.2-1), libmagick++6-dev +Depends: libmagick++10 (= ${binary:Version}), libmagick10-dev (= ${binary:Version}) +Conflicts: libmagick++0-dev, libmagick++5.5.1 (<= 4:5.5.1.4-1), libmagick++5, libmagick++-dev, imagemagick(<= 5:6.0.1.2-1), libmagick++6-dev, Replaces: libmagick++0-dev, libmagick++5.5.1 (<= 4:5.5.1.4-1), libmagick++9-dev, imagemagick (<= 5:6.0.1.2-1), libmagick++6-dev Description: The object-oriented C++ API to the ImageMagick library--development This are the include files and static libraries needed to compile diff -urN debian.old/dirs debian.new/dirs --- debian.old/dirs 2007-12-26 00:50:29.000000000 -0200 +++ debian.new/dirs 2007-12-26 00:50:14.000000000 -0200 @@ -1,3 +1,2 @@ usr/bin -usr/sbin usr/share/doc/imagemagick/ diff -urN debian.old/docs debian.new/docs --- debian.old/docs 2007-12-26 00:50:29.000000000 -0200 +++ debian.new/docs 2007-12-26 00:50:14.000000000 -0200 @@ -1,6 +1,2 @@ -PLATFORMS.txt -QuickStart.txt README.txt -TODO.txt -NEWS ChangeLog diff -urN debian.old/libmagick++10-dev.dirs debian.new/libmagick++10-dev.dirs --- debian.old/libmagick++10-dev.dirs 1969-12-31 21:00:00.000000000 -0300 +++ debian.new/libmagick++10-dev.dirs 2007-12-26 00:50:14.000000000 -0200 @@ -0,0 +1,6 @@ +usr/include +usr/include/Magick++ +usr/bin +usr/share/man/man1 +usr/lib +usr/lib/pkgconfig diff -urN debian.old/libmagick10-dev.dirs debian.new/libmagick10-dev.dirs --- debian.old/libmagick10-dev.dirs 1969-12-31 21:00:00.000000000 -0300 +++ debian.new/libmagick10-dev.dirs 2007-12-26 00:50:14.000000000 -0200 @@ -0,0 +1,5 @@ +usr/lib +usr/include +usr/include/magick +usr/share/man +usr/lib/pkgconfig diff -urN debian.old/libmagick++10-dev.files debian.new/libmagick++10-dev.files --- debian.old/libmagick++10-dev.files 1969-12-31 21:00:00.000000000 -0300 +++ debian.new/libmagick++10-dev.files 2007-12-26 00:50:14.000000000 -0200 @@ -0,0 +1,8 @@ +usr/include/Magick++.h +usr/include/Magick++/ +usr/lib/libMagick++.so +usr/bin/Magick++-config +usr/share/man/man1/Magick++-config.1 +usr/lib/libMagick++.la +usr/lib/libMagick++.a +usr/lib/pkgconfig/ImageMagick++.pc diff -urN debian.old/libmagick10-dev.files debian.new/libmagick10-dev.files --- debian.old/libmagick10-dev.files 1969-12-31 21:00:00.000000000 -0300 +++ debian.new/libmagick10-dev.files 2007-12-26 00:50:14.000000000 -0200 @@ -0,0 +1,15 @@ +usr/include/magick/ +usr/include/wand/ +usr/lib/libMagick.a +usr/lib/libMagick.la +usr/lib/libMagick.so +usr/lib/libWand.a +usr/lib/libWand.la +usr/lib/libWand.so +usr/bin/Magick-config +usr/bin/Wand-config +usr/share/man/man1/Magick-config.1 +usr/share/man/man1/Wand-config.1 +usr/lib/pkgconfig/ImageMagick.pc +usr/lib/pkgconfig/Wand.pc + diff -urN debian.old/libmagick++10-dev.postinst debian.new/libmagick++10-dev.postinst --- debian.old/libmagick++10-dev.postinst 1969-12-31 21:00:00.000000000 -0300 +++ debian.new/libmagick++10-dev.postinst 2007-12-26 00:50:14.000000000 -0200 @@ -0,0 +1,3 @@ +#! /bin/sh + +#DEBHELPER# diff -urN debian.old/libmagick10-dev.postinst debian.new/libmagick10-dev.postinst --- debian.old/libmagick10-dev.postinst 1969-12-31 21:00:00.000000000 -0300 +++ debian.new/libmagick10-dev.postinst 2007-12-26 00:50:14.000000000 -0200 @@ -0,0 +1,3 @@ +#! /bin/sh + +#DEBHELPER# diff -urN debian.old/libmagick++10-dev.prerm debian.new/libmagick++10-dev.prerm --- debian.old/libmagick++10-dev.prerm 1969-12-31 21:00:00.000000000 -0300 +++ debian.new/libmagick++10-dev.prerm 2007-12-26 00:50:14.000000000 -0200 @@ -0,0 +1,3 @@ +#! /bin/sh + +#DEBHELPER# diff -urN debian.old/libmagick10-dev.prerm debian.new/libmagick10-dev.prerm --- debian.old/libmagick10-dev.prerm 1969-12-31 21:00:00.000000000 -0300 +++ debian.new/libmagick10-dev.prerm 2007-12-26 00:50:14.000000000 -0200 @@ -0,0 +1,3 @@ +#! /bin/sh + +#DEBHELPER# diff -urN debian.old/libmagick++10.dirs debian.new/libmagick++10.dirs --- debian.old/libmagick++10.dirs 1969-12-31 21:00:00.000000000 -0300 +++ debian.new/libmagick++10.dirs 2007-12-26 00:50:14.000000000 -0200 @@ -0,0 +1,2 @@ +usr/share/doc +usr/share/doc/libmagick++10 diff -urN debian.old/libmagick10.dirs debian.new/libmagick10.dirs --- debian.old/libmagick10.dirs 1969-12-31 21:00:00.000000000 -0300 +++ debian.new/libmagick10.dirs 2007-12-26 00:50:14.000000000 -0200 @@ -0,0 +1 @@ +usr/lib diff -urN debian.old/libmagick++10.files debian.new/libmagick++10.files --- debian.old/libmagick++10.files 1969-12-31 21:00:00.000000000 -0300 +++ debian.new/libmagick++10.files 2007-12-26 00:50:14.000000000 -0200 @@ -0,0 +1 @@ +usr/lib/libMagick++*.so.* diff -urN debian.old/libmagick10.files debian.new/libmagick10.files --- debian.old/libmagick10.files 1969-12-31 21:00:00.000000000 -0300 +++ debian.new/libmagick10.files 2007-12-26 00:50:14.000000000 -0200 @@ -0,0 +1,8 @@ +usr/lib/libMagick.so.* +usr/lib/libMagick-*.so +usr/lib/libMagick-*.so.* +usr/lib/libWand.so.* +usr/lib/libWand-*.so +usr/lib/libWand-*.so.* +usr/lib/ImageMagick-6.3.7/* +usr/share/ImageMagick-6.3.7/config/* diff -urN debian.old/libmagick++10.postinst debian.new/libmagick++10.postinst --- debian.old/libmagick++10.postinst 1969-12-31 21:00:00.000000000 -0300 +++ debian.new/libmagick++10.postinst 2007-12-26 00:50:14.000000000 -0200 @@ -0,0 +1,5 @@ +#!/bin/sh + +set -e + +#DEBHELPER# diff -urN debian.old/libmagick10.postinst debian.new/libmagick10.postinst --- debian.old/libmagick10.postinst 1969-12-31 21:00:00.000000000 -0300 +++ debian.new/libmagick10.postinst 2007-12-26 00:50:14.000000000 -0200 @@ -0,0 +1,17 @@ +#!/bin/sh + +set -e + +case "$1" in + configure) + + ;; + abort-upgrade| abort-remove|abort-deconfigure ) + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +#DEBHELPER# diff -urN debian.old/libmagick10.preinst debian.new/libmagick10.preinst --- debian.old/libmagick10.preinst 1969-12-31 21:00:00.000000000 -0300 +++ debian.new/libmagick10.preinst 2007-12-26 00:50:14.000000000 -0200 @@ -0,0 +1,8 @@ +#!/bin/sh + +set -e + +dpkg --assert-multi-conrep 2>/dev/null || { + echo "You must first upgrade dpkg to version>=1.6.8!!"; exit 1; +} +#DEBHELPER# diff -urN debian.old/libmagick10.prerm debian.new/libmagick10.prerm --- debian.old/libmagick10.prerm 1969-12-31 21:00:00.000000000 -0300 +++ debian.new/libmagick10.prerm 2007-12-26 00:50:14.000000000 -0200 @@ -0,0 +1,3 @@ +#! /bin/sh + +#DEBHELPER# diff -urN debian.old/libmagick-dev.dirs debian.new/libmagick-dev.dirs --- debian.old/libmagick-dev.dirs 2007-12-26 00:50:29.000000000 -0200 +++ debian.new/libmagick-dev.dirs 1969-12-31 21:00:00.000000000 -0300 @@ -1,5 +0,0 @@ -usr/lib -usr/include -usr/include/magick -usr/share/man -usr/lib/pkgconfig diff -urN debian.old/libmagick++-dev.dirs debian.new/libmagick++-dev.dirs --- debian.old/libmagick++-dev.dirs 2007-12-26 00:50:29.000000000 -0200 +++ debian.new/libmagick++-dev.dirs 1969-12-31 21:00:00.000000000 -0300 @@ -1,7 +0,0 @@ -usr/include -usr/include/Magick++ -usr/bin -usr/share/man/man1 -usr/lib -usr/lib/pkgconfig - diff -urN debian.old/libmagick-dev.files debian.new/libmagick-dev.files --- debian.old/libmagick-dev.files 2007-12-26 00:50:29.000000000 -0200 +++ debian.new/libmagick-dev.files 1969-12-31 21:00:00.000000000 -0300 @@ -1,15 +0,0 @@ -usr/include/magick/ -usr/include/wand/ -usr/lib/libMagick.a -usr/lib/libMagick.la -usr/lib/libMagick.so -usr/lib/libWand.a -usr/lib/libWand.la -usr/lib/libWand.so -usr/bin/Magick-config -usr/bin/Wand-config -usr/share/man/man1/Magick-config.1 -usr/share/man/man1/Wand-config.1 -usr/lib/pkgconfig/ImageMagick.pc -usr/lib/pkgconfig/Wand.pc - diff -urN debian.old/libmagick++-dev.files debian.new/libmagick++-dev.files --- debian.old/libmagick++-dev.files 2007-12-26 00:50:29.000000000 -0200 +++ debian.new/libmagick++-dev.files 1969-12-31 21:00:00.000000000 -0300 @@ -1,8 +0,0 @@ -usr/include/Magick++.h -usr/include/Magick++/ -usr/lib/libMagick++.so -usr/bin/Magick++-config -usr/share/man/man1/Magick++-config.1 -usr/lib/libMagick++.la -usr/lib/libMagick++.a -usr/lib/pkgconfig/ImageMagick++.pc diff -urN debian.old/libmagick-dev.postinst debian.new/libmagick-dev.postinst --- debian.old/libmagick-dev.postinst 2007-12-26 00:50:29.000000000 -0200 +++ debian.new/libmagick-dev.postinst 1969-12-31 21:00:00.000000000 -0300 @@ -1,3 +0,0 @@ -#! /bin/sh - -#DEBHELPER# diff -urN debian.old/libmagick++-dev.postinst debian.new/libmagick++-dev.postinst --- debian.old/libmagick++-dev.postinst 2007-12-26 00:50:29.000000000 -0200 +++ debian.new/libmagick++-dev.postinst 1969-12-31 21:00:00.000000000 -0300 @@ -1,3 +0,0 @@ -#! /bin/sh - -#DEBHELPER# diff -urN debian.old/libmagick-dev.prerm debian.new/libmagick-dev.prerm --- debian.old/libmagick-dev.prerm 2007-12-26 00:50:29.000000000 -0200 +++ debian.new/libmagick-dev.prerm 1969-12-31 21:00:00.000000000 -0300 @@ -1,3 +0,0 @@ -#! /bin/sh - -#DEBHELPER# diff -urN debian.old/libmagick++-dev.prerm debian.new/libmagick++-dev.prerm --- debian.old/libmagick++-dev.prerm 2007-12-26 00:50:29.000000000 -0200 +++ debian.new/libmagick++-dev.prerm 1969-12-31 21:00:00.000000000 -0300 @@ -1,3 +0,0 @@ -#! /bin/sh - -#DEBHELPER# diff -urN debian.old/libmagick.dirs debian.new/libmagick.dirs --- debian.old/libmagick.dirs 2007-12-26 00:50:29.000000000 -0200 +++ debian.new/libmagick.dirs 1969-12-31 21:00:00.000000000 -0300 @@ -1,8 +0,0 @@ -usr/lib -usr/share/ImageMagick -usr/share/ImageMagick/images -usr/share/ImageMagick/www -usr/share/ImageMagick/www/api -usr/share/ImageMagick/www/Magick++ -usr/lib/ImageMagick-6.2.4 -usr/lib/ImageMagick-6.2.4/modules-Q16/coders diff -urN debian.old/libmagick++.dirs debian.new/libmagick++.dirs --- debian.old/libmagick++.dirs 2007-12-26 00:50:29.000000000 -0200 +++ debian.new/libmagick++.dirs 1969-12-31 21:00:00.000000000 -0300 @@ -1,2 +0,0 @@ -usr/share/doc -usr/share/doc/libmagick++ diff -urN debian.old/libmagick.files debian.new/libmagick.files --- debian.old/libmagick.files 2007-12-26 00:50:29.000000000 -0200 +++ debian.new/libmagick.files 1969-12-31 21:00:00.000000000 -0300 @@ -1,8 +0,0 @@ -usr/lib/libMagick.so.* -usr/lib/libMagick-*.so -usr/lib/libMagick-*.so.* -usr/lib/libWand.so.* -usr/lib/libWand-*.so -usr/lib/libWand-*.so.* -usr/lib/ImageMagick-6.2.4/* -usr/share/ImageMagick-6.2.4/config/* diff -urN debian.old/libmagick++.files debian.new/libmagick++.files --- debian.old/libmagick++.files 2007-12-26 00:50:29.000000000 -0200 +++ debian.new/libmagick++.files 1969-12-31 21:00:00.000000000 -0300 @@ -1 +0,0 @@ -usr/lib/libMagick++*.so.* diff -urN debian.old/libmagick.postinst debian.new/libmagick.postinst --- debian.old/libmagick.postinst 2007-12-26 00:50:29.000000000 -0200 +++ debian.new/libmagick.postinst 1969-12-31 21:00:00.000000000 -0300 @@ -1,17 +0,0 @@ -#!/bin/sh - -set -e - -case "$1" in - configure) - - ;; - abort-upgrade| abort-remove|abort-deconfigure ) - ;; - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 0 - ;; -esac - -#DEBHELPER# diff -urN debian.old/libmagick++.postinst debian.new/libmagick++.postinst --- debian.old/libmagick++.postinst 2007-12-26 00:50:29.000000000 -0200 +++ debian.new/libmagick++.postinst 1969-12-31 21:00:00.000000000 -0300 @@ -1,5 +0,0 @@ -#!/bin/sh - -set -e - -#DEBHELPER# diff -urN debian.old/libmagick.preinst debian.new/libmagick.preinst --- debian.old/libmagick.preinst 2007-12-26 00:50:29.000000000 -0200 +++ debian.new/libmagick.preinst 1969-12-31 21:00:00.000000000 -0300 @@ -1,8 +0,0 @@ -#!/bin/sh - -set -e - -dpkg --assert-multi-conrep 2>/dev/null || { - echo "You must first upgrade dpkg to version>=1.6.8!!"; exit 1; -} -#DEBHELPER# diff -urN debian.old/libmagick.prerm debian.new/libmagick.prerm --- debian.old/libmagick.prerm 2007-12-26 00:50:29.000000000 -0200 +++ debian.new/libmagick.prerm 1969-12-31 21:00:00.000000000 -0300 @@ -1,3 +0,0 @@ -#! /bin/sh - -#DEBHELPER# diff -urN debian.old/rules debian.new/rules --- debian.old/rules 2007-12-26 00:50:29.000000000 -0200 +++ debian.new/rules 2007-12-26 00:50:14.000000000 -0200 @@ -110,8 +110,8 @@ -cp `pwd`/magick/Magick-config.1 $(CURDIR)/debian/imagemagick/usr/share/man/man1/ -find $(CURDIR)/debian -type f -name .packlist | xargs rm -f - # Duplicate. License file is already included in the doc dir. - #-rm "$(CURDIR)"/debian/imagemagick/usr/share/ImageMagick-$(IMAGEMAGICKVERSION)/LICENSE + # These files are already included in the doc dir. + -rm -rf $(CURDIR)/debian/imagemagick/usr/share/ImageMagick-$(IMAGEMAGICKVERSION) # Use x-terninal emulator for editing (Bug #132947) # @@ -174,4 +174,3 @@ binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install - diff -urN debian.old/TODO debian.new/TODO --- debian.old/TODO 2007-12-26 00:50:29.000000000 -0200 +++ debian.new/TODO 2007-12-26 00:50:14.000000000 -0200 @@ -10,6 +10,7 @@ http://people.debian.org/~naoliv/misc/imagemagick-debdiff - make check is failing: +Upstream; Fixed in 6.3.7-4 (...) g++ -DHAVE_CONFIG_H -I. -I./config -I. -I. -I./Magick++/lib -I/usr/include/free