[Pkg-gmagick-svn-commit] r113 - in trunk/debian: . patches
Nelson A. de Oliveira
naoliv at alioth.debian.org
Fri Jan 15 19:59:02 UTC 2010
Author: naoliv
Date: 2010-01-15 19:59:02 +0000 (Fri, 15 Jan 2010)
New Revision: 113
Added:
trunk/debian/libmagick++3.install
trunk/debian/libmagickcore3-extra.install
trunk/debian/libmagickcore3.install
trunk/debian/libmagickwand3.install
trunk/debian/patches/
trunk/debian/patches/series
trunk/debian/patches/type.xml.patch
Removed:
trunk/debian/README.source
trunk/debian/libmagick++2.install
trunk/debian/libmagickcore2-extra.install
trunk/debian/libmagickcore2.install
trunk/debian/libmagickwand2.install
Modified:
trunk/debian/changelog
trunk/debian/control
trunk/debian/imagemagick.mime
trunk/debian/rules
Log:
- New upstream release
- Updated package names for SONAME bump
- Fix imagemagick.mime
- Patch for type.xml
Deleted: trunk/debian/README.source
===================================================================
--- trunk/debian/README.source 2009-12-06 12:55:11 UTC (rev 112)
+++ trunk/debian/README.source 2010-01-15 19:59:02 UTC (rev 113)
@@ -1,7 +0,0 @@
-This package uses quilt to manage all modifications to the upstream source.
-Changes are stored in the source package as diffs in debian/patches and applied
-during the build.
-
-For complete information, please see /usr/share/doc/quilt/README.source.
-
- -- Nelson A. de Oliveira <naoliv at debian.org> Tue, 25 Aug 2009 17:40:18 -0300
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-12-06 12:55:11 UTC (rev 112)
+++ trunk/debian/changelog 2010-01-15 19:59:02 UTC (rev 113)
@@ -1,3 +1,18 @@
+imagemagick (7:6.5.9.0-1) UNRELEASED; urgency=low
+
+ * New upstream release;
+ * Upstream updated SONAME version (Closes: #564123):
+ - debian/control: bump libmagickcore2, libmagickwand2 and libmagick++2 to
+ libmagickcore3, libmagickwand3 and libmagick++3;
+ * Removed reference to type-ghostscript.xml in type.xml, thus enabling
+ ImageMagick to use the system fonts (Closes: #396420):
+ - Added new patch debian/patches/type.xml.patch.
+ * Fix mime handling of filenames with spaces (Closes: #562959).
+ Thanks, Drew Parsons!
+ * Remove unneeded debian/README.source.
+
+ -- Nelson A. de Oliveira <naoliv at debian.org> Fri, 15 Jan 2010 15:34:02 -0200
+
imagemagick (7:6.5.8.3-1) unstable; urgency=low
* New upstream release:
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2009-12-06 12:55:11 UTC (rev 112)
+++ trunk/debian/control 2010-01-15 19:59:02 UTC (rev 113)
@@ -19,7 +19,7 @@
Package: imagemagick
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: libmagickcore2-extra, ghostscript, netpbm, ufraw
+Recommends: libmagickcore3-extra, ghostscript, netpbm, ufraw
Suggests: imagemagick-doc, autotrace, cups-bsd | lpr | lprng, curl, enscript,
ffmpeg, gimp, gnuplot, grads, groff-base, hp2xx, html2ps, libwmf-bin, mplayer,
povray, radiance, sane-utils, texlive-base-bin, transfig, xdg-utils
@@ -37,8 +37,8 @@
Architecture: any
Section: debug
Priority: extra
-Depends: imagemagick (= ${binary:Version}), libmagick++2 (= ${binary:Version}),
- libmagickcore2-extra (= ${binary:Version}), perlmagick (= ${binary:Version}),
+Depends: imagemagick (= ${binary:Version}), libmagick++3 (= ${binary:Version}),
+ libmagickcore3-extra (= ${binary:Version}), perlmagick (= ${binary:Version}),
${misc:Depends}
Description: debugging symbols for ImageMagick
This package contains the debugging symbols for ImageMagick, a software suite
@@ -55,12 +55,12 @@
This package contains the document files shipped with ImageMagick, a software
suite to create, edit, and compose bitmap images.
-Package: libmagickcore2
+Package: libmagickcore3
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: ghostscript, gsfonts
-Suggests: libmagickcore2-extra
+Suggests: libmagickcore3-extra
Description: low-level image manipulation library
The MagickCore API is a low-level interface between the C programming language
and the ImageMagick image processing libraries and is recommended for
@@ -71,12 +71,12 @@
This package contains the C libraries needed to run executables that make
use of MagickCore.
-Package: libmagickcore2-extra
+Package: libmagickcore3-extra
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libmagickcore2 (<= 7:6.5.5.3-1)
-Enhances: libmagickcore2
+Enhances: libmagickcore3
Description: low-level image manipulation library - extra codecs
This package adds support for SVG, WMF, OpenEXR, DjVu and Graphviz to
MagickCore.
@@ -84,8 +84,8 @@
Package: libmagickcore-dev
Architecture: any
Section: libdevel
-Depends: libmagickcore2 (= ${binary:Version}),
- libmagickcore2-extra (= ${binary:Version}), libbz2-dev, libdjvulibre-dev,
+Depends: libmagickcore3 (= ${binary:Version}),
+ libmagickcore3-extra (= ${binary:Version}), libbz2-dev, libdjvulibre-dev,
libexif-dev, libfreetype6-dev, libgraphviz-dev, libjasper-dev, libjpeg-dev,
liblcms-dev, liblqr-1-0-dev, libltdl-dev, libopenexr-dev, libpng-dev,
librsvg2-dev, libtiff-dev, libwmf-dev, libx11-dev, libxext-dev, libxml2-dev,
@@ -94,7 +94,7 @@
This package includes header files and static libraries needed to compile
programs using MagickCore.
-Package: libmagickwand2
+Package: libmagickwand3
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -110,8 +110,8 @@
Package: libmagickwand-dev
Architecture: any
Section: libdevel
-Depends: libmagickwand2 (= ${binary:Version}),
- libmagickcore2-extra (= ${binary:Version}),
+Depends: libmagickwand3 (= ${binary:Version}),
+ libmagickcore3-extra (= ${binary:Version}),
libmagickcore-dev (= ${binary:Version}), ${misc:Depends}
Provides: libmagick9-dev
Conflicts: libmagick9-dev
@@ -119,7 +119,7 @@
This package includes header files and static libraries needed to compile
programs using MagickWand.
-Package: libmagick++2
+Package: libmagick++3
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -133,7 +133,7 @@
Package: libmagick++-dev
Architecture: any
Section: libdevel
-Depends: libmagick++2 (= ${binary:Version}),
+Depends: libmagick++3 (= ${binary:Version}),
libmagickcore-dev (= ${binary:Version}),
libmagickwand-dev (= ${binary:Version}), ${misc:Depends}
Provides: libmagick++9-dev
Modified: trunk/debian/imagemagick.mime
===================================================================
--- trunk/debian/imagemagick.mime 2009-12-06 12:55:11 UTC (rev 112)
+++ trunk/debian/imagemagick.mime 2010-01-15 19:59:02 UTC (rev 113)
@@ -1,42 +1,42 @@
-image/avs; display 'avs:%s'; test=test -n "$DISPLAY"; priority=2
-image/bie; display 'jbig:%s'; test=test -n "$DISPLAY"; priority=2
-image/x-ms-bmp; display 'bmp:%s'; test=test -n "$DISPLAY"; priority=2
-image/cmyk; display 'cmyk:%s'; test=test -n "$DISPLAY"; priority=2
-image/dcx; display 'dcx:%s'; test=test -n "$DISPLAY"; priority=2
-image/eps; display 'eps:%s'; test=test -n "$DISPLAY"; priority=2
-image/fax; display 'fax:%s'; test=test -n "$DISPLAY"; priority=2
-image/fits; display 'fits:%s'; test=test -n "$DISPLAY"; priority=2
-image/gif; display 'gif:%s'; test=test -n "$DISPLAY"; priority=2
-image/gray; display 'gray:%s'; test=test -n "$DISPLAY"; priority=2
-image/jpeg; display 'jpeg:%s'; test=test -n "$DISPLAY"; priority=2
-image/pjpeg; display 'jpeg:%s'; test=test -n "$DISPLAY"; priority=2
-image/miff; display 'miff:%s'; test=test -n "$DISPLAY"; priority=2
-image/mono; display 'mono:%s'; test=test -n "$DISPLAY"; priority=2
-image/mtv; display 'mtv:%s'; test=test -n "$DISPLAY"; priority=2
-image/x-portable-bitmap; display 'pbm:%s'; test=test -n "$DISPLAY"; priority=2
-image/pcd; display 'pcd:%s'; test=test -n "$DISPLAY"; priority=2
-image/pcx; display 'pcx:%s'; test=test -n "$DISPLAY"; priority=2
-image/pdf; display 'pdf:%s'; test=test -n "$DISPLAY"; priority=2
-image/x-portable-graymap; display 'pgm:%s'; test=test -n "$DISPLAY"; priority=2
-image/pict; display 'pict:%s'; test=test -n "$DISPLAY"; priority=2
-image/png; display 'png:%s'; test=test -n "$DISPLAY"; priority=2
-image/x-portable-anymap; display 'pnm:%s'; test=test -n "$DISPLAY"; priority=2
-image/x-portable-pixmap; display 'ppm:%s'; test=test -n "$DISPLAY"; priority=2
-image/ps; display 'ps:%s'; test=test -n "$DISPLAY"; priority=2
-image/rad; display 'rad:%s'; test=test -n "$DISPLAY"; priority=2
-image/x-rgb; display 'rgb:%s'; test=test -n "$DISPLAY"; priority=2
-image/rgba; display 'rgba:%s'; test=test -n "$DISPLAY"; priority=2
-image/rla; display 'rla:%s'; test=test -n "$DISPLAY"; priority=2
-image/rle; display 'rle:%s'; test=test -n "$DISPLAY"; priority=2
-image/sgi; display 'sgi:%s'; test=test -n "$DISPLAY"; priority=2
-image/sun-raster; display 'sun:%s'; test=test -n "$DISPLAY"; priority=2
-image/targa; display 'tga:%s'; test=test -n "$DISPLAY"; priority=2
-image/tiff; display 'tiff:%s'; test=test -n "$DISPLAY"; priority=2
-image/uyvy; display 'uyvy:%s'; test=test -n "$DISPLAY"; priority=2
-image/vid; display 'vid:%s'; test=test -n "$DISPLAY"; priority=2
-image/viff; display 'viff:%s'; test=test -n "$DISPLAY"; priority=2
-image/x-xbitmap; display 'xbm:%s'; test=test -n "$DISPLAY"; priority=2
-image/x-xpixmap; display 'xpm:%s'; test=test -n "$DISPLAY"; priority=2
-image/x-xwindowdump; display 'xwd:%s'; test=test -n "$DISPLAY"; priority=2
-image/x-icon; display 'icon:%s'; test=test -n "$DISPLAY"; priority=2
-image/yuv; display 'yuv:%s'; test=test -n "$DISPLAY"; priority=2
+image/avs; display avs:'%s'; test=test -n "$DISPLAY"; priority=2
+image/bie; display jbig:'%s'; test=test -n "$DISPLAY"; priority=2
+image/x-ms-bmp; display bmp:'%s'; test=test -n "$DISPLAY"; priority=2
+image/cmyk; display cmyk:'%s'; test=test -n "$DISPLAY"; priority=2
+image/dcx; display dcx:'%s'; test=test -n "$DISPLAY"; priority=2
+image/eps; display eps:'%s'; test=test -n "$DISPLAY"; priority=2
+image/fax; display fax:'%s'; test=test -n "$DISPLAY"; priority=2
+image/fits; display fits:'%s'; test=test -n "$DISPLAY"; priority=2
+image/gif; display gif:'%s'; test=test -n "$DISPLAY"; priority=2
+image/gray; display gray:'%s'; test=test -n "$DISPLAY"; priority=2
+image/jpeg; display jpeg:'%s'; test=test -n "$DISPLAY"; priority=2
+image/pjpeg; display jpeg:'%s'; test=test -n "$DISPLAY"; priority=2
+image/miff; display miff:'%s'; test=test -n "$DISPLAY"; priority=2
+image/mono; display mono:'%s'; test=test -n "$DISPLAY"; priority=2
+image/mtv; display mtv:'%s'; test=test -n "$DISPLAY"; priority=2
+image/x-portable-bitmap; display pbm:'%s'; test=test -n "$DISPLAY"; priority=2
+image/pcd; display pcd:'%s'; test=test -n "$DISPLAY"; priority=2
+image/pcx; display pcx:'%s'; test=test -n "$DISPLAY"; priority=2
+image/pdf; display pdf:'%s'; test=test -n "$DISPLAY"; priority=2
+image/x-portable-graymap; display pgm:'%s'; test=test -n "$DISPLAY"; priority=2
+image/pict; display pict:'%s'; test=test -n "$DISPLAY"; priority=2
+image/png; display png:'%s'; test=test -n "$DISPLAY"; priority=2
+image/x-portable-anymap; display pnm:'%s'; test=test -n "$DISPLAY"; priority=2
+image/x-portable-pixmap; display ppm:'%s'; test=test -n "$DISPLAY"; priority=2
+image/ps; display ps:'%s'; test=test -n "$DISPLAY"; priority=2
+image/rad; display rad:'%s'; test=test -n "$DISPLAY"; priority=2
+image/x-rgb; display rgb:'%s'; test=test -n "$DISPLAY"; priority=2
+image/rgba; display rgba:'%s'; test=test -n "$DISPLAY"; priority=2
+image/rla; display rla:'%s'; test=test -n "$DISPLAY"; priority=2
+image/rle; display rle:'%s'; test=test -n "$DISPLAY"; priority=2
+image/sgi; display sgi:'%s'; test=test -n "$DISPLAY"; priority=2
+image/sun-raster; display sun:'%s'; test=test -n "$DISPLAY"; priority=2
+image/targa; display tga:'%s'; test=test -n "$DISPLAY"; priority=2
+image/tiff; display tiff:'%s'; test=test -n "$DISPLAY"; priority=2
+image/uyvy; display uyvy:'%s'; test=test -n "$DISPLAY"; priority=2
+image/vid; display vid:'%s'; test=test -n "$DISPLAY"; priority=2
+image/viff; display viff:'%s'; test=test -n "$DISPLAY"; priority=2
+image/x-xbitmap; display xbm:'%s'; test=test -n "$DISPLAY"; priority=2
+image/x-xpixmap; display xpm:'%s'; test=test -n "$DISPLAY"; priority=2
+image/x-xwindowdump; display xwd:'%s'; test=test -n "$DISPLAY"; priority=2
+image/x-icon; display icon:'%s'; test=test -n "$DISPLAY"; priority=2
+image/yuv; display yuv:'%s'; test=test -n "$DISPLAY"; priority=2
Deleted: trunk/debian/libmagick++2.install
===================================================================
--- trunk/debian/libmagick++2.install 2009-12-06 12:55:11 UTC (rev 112)
+++ trunk/debian/libmagick++2.install 2010-01-15 19:59:02 UTC (rev 113)
@@ -1 +0,0 @@
-usr/lib/libMagick++.so.*
Added: trunk/debian/libmagick++3.install
===================================================================
--- trunk/debian/libmagick++3.install (rev 0)
+++ trunk/debian/libmagick++3.install 2010-01-15 19:59:02 UTC (rev 113)
@@ -0,0 +1 @@
+usr/lib/libMagick++.so.*
Deleted: trunk/debian/libmagickcore2-extra.install
===================================================================
--- trunk/debian/libmagickcore2-extra.install 2009-12-06 12:55:11 UTC (rev 112)
+++ trunk/debian/libmagickcore2-extra.install 2010-01-15 19:59:02 UTC (rev 113)
@@ -1,10 +0,0 @@
-usr/lib/ImageMagick-*/modules-Q16/coders/djvu.la
-usr/lib/ImageMagick-*/modules-Q16/coders/djvu.so
-usr/lib/ImageMagick-*/modules-Q16/coders/dot.la
-usr/lib/ImageMagick-*/modules-Q16/coders/dot.so
-usr/lib/ImageMagick-*/modules-Q16/coders/exr.la
-usr/lib/ImageMagick-*/modules-Q16/coders/exr.so
-usr/lib/ImageMagick-*/modules-Q16/coders/svg.la
-usr/lib/ImageMagick-*/modules-Q16/coders/svg.so
-usr/lib/ImageMagick-*/modules-Q16/coders/wmf.la
-usr/lib/ImageMagick-*/modules-Q16/coders/wmf.so
Deleted: trunk/debian/libmagickcore2.install
===================================================================
--- trunk/debian/libmagickcore2.install 2009-12-06 12:55:11 UTC (rev 112)
+++ trunk/debian/libmagickcore2.install 2010-01-15 19:59:02 UTC (rev 113)
@@ -1,7 +0,0 @@
-usr/lib/ImageMagick-*/modules-Q16/coders/*.la
-usr/lib/ImageMagick-*/modules-Q16/coders/*.so
-usr/lib/ImageMagick-*/modules-Q16/filters/*.la
-usr/lib/ImageMagick-*/modules-Q16/filters/*.so
-usr/lib/libMagickCore.so.*
-usr/lib/ImageMagick-*/config
-usr/share/ImageMagick-*/config
Added: trunk/debian/libmagickcore3-extra.install
===================================================================
--- trunk/debian/libmagickcore3-extra.install (rev 0)
+++ trunk/debian/libmagickcore3-extra.install 2010-01-15 19:59:02 UTC (rev 113)
@@ -0,0 +1,10 @@
+usr/lib/ImageMagick-*/modules-Q16/coders/djvu.la
+usr/lib/ImageMagick-*/modules-Q16/coders/djvu.so
+usr/lib/ImageMagick-*/modules-Q16/coders/dot.la
+usr/lib/ImageMagick-*/modules-Q16/coders/dot.so
+usr/lib/ImageMagick-*/modules-Q16/coders/exr.la
+usr/lib/ImageMagick-*/modules-Q16/coders/exr.so
+usr/lib/ImageMagick-*/modules-Q16/coders/svg.la
+usr/lib/ImageMagick-*/modules-Q16/coders/svg.so
+usr/lib/ImageMagick-*/modules-Q16/coders/wmf.la
+usr/lib/ImageMagick-*/modules-Q16/coders/wmf.so
Added: trunk/debian/libmagickcore3.install
===================================================================
--- trunk/debian/libmagickcore3.install (rev 0)
+++ trunk/debian/libmagickcore3.install 2010-01-15 19:59:02 UTC (rev 113)
@@ -0,0 +1,7 @@
+usr/lib/ImageMagick-*/modules-Q16/coders/*.la
+usr/lib/ImageMagick-*/modules-Q16/coders/*.so
+usr/lib/ImageMagick-*/modules-Q16/filters/*.la
+usr/lib/ImageMagick-*/modules-Q16/filters/*.so
+usr/lib/libMagickCore.so.*
+usr/lib/ImageMagick-*/config
+usr/share/ImageMagick-*/config
Deleted: trunk/debian/libmagickwand2.install
===================================================================
--- trunk/debian/libmagickwand2.install 2009-12-06 12:55:11 UTC (rev 112)
+++ trunk/debian/libmagickwand2.install 2010-01-15 19:59:02 UTC (rev 113)
@@ -1 +0,0 @@
-usr/lib/libMagickWand.so.*
Added: trunk/debian/libmagickwand3.install
===================================================================
--- trunk/debian/libmagickwand3.install (rev 0)
+++ trunk/debian/libmagickwand3.install 2010-01-15 19:59:02 UTC (rev 113)
@@ -0,0 +1 @@
+usr/lib/libMagickWand.so.*
Added: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series (rev 0)
+++ trunk/debian/patches/series 2010-01-15 19:59:02 UTC (rev 113)
@@ -0,0 +1 @@
+type.xml.patch
Added: trunk/debian/patches/type.xml.patch
===================================================================
--- trunk/debian/patches/type.xml.patch (rev 0)
+++ trunk/debian/patches/type.xml.patch 2010-01-15 19:59:02 UTC (rev 113)
@@ -0,0 +1,20 @@
+Description: Remove unnecessary reference to type-ghostscript.xml
+ Since ImageMagick is built with fontconfig enabled, it's not necessary to
+ include a reference to type-ghostscript.xml (that contains static paths for
+ some fonts). Removing this reference makes ImageMagick able to use the system
+ fonts.
+Author: Nelson A. de Oliveira <naoliv at debian.org>
+Bug: http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=15355
+Bug-Debian: http://bugs.debian.org/396420
+Forwarded: not-needed
+Last-Update: 2010-01-15
+
+--- imagemagick-6.5.9.0.orig/config/type.xml.in
++++ imagemagick-6.5.9.0/config/type.xml.in
+@@ -16,6 +16,3 @@
+ <!ATTLIST type version CDATA #IMPLIED>
+ <!ATTLIST include file CDATA #REQUIRED>
+ ]>
+-<typemap>
+- @type_include_files@
+-</typemap>
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2009-12-06 12:55:11 UTC (rev 112)
+++ trunk/debian/rules 2010-01-15 19:59:02 UTC (rev 113)
@@ -8,7 +8,7 @@
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-IMAGEMAGICKVERSION=6.5.8
+IMAGEMAGICKVERSION=6.5.9
DESTDIR="$(CURDIR)/debian/tmp"
@@ -69,6 +69,8 @@
else \
echo "Skipping regression tests because we appear to be cross-compiling"; \
fi
+ # Show all the tests that were run
+ cat test-suite.log
endif
touch check-stamp
More information about the pkg-gmagick-svn-commit
mailing list