[Pkg-gmagick-svn-commit] r53 - in branches/6.3.9.4.dfsg1-1: . debian
naoliv at alioth.debian.org
naoliv at alioth.debian.org
Tue Mar 25 00:05:59 UTC 2008
Author: naoliv
Date: 2008-03-25 00:05:58 +0000 (Tue, 25 Mar 2008)
New Revision: 53
Modified:
branches/6.3.9.4.dfsg1-1/README
branches/6.3.9.4.dfsg1-1/debian/TODO
branches/6.3.9.4.dfsg1-1/debian/changelog
branches/6.3.9.4.dfsg1-1/debian/control
branches/6.3.9.4.dfsg1-1/debian/imagemagick.install
branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.install
branches/6.3.9.4.dfsg1-1/debian/libmagickcore1.install
branches/6.3.9.4.dfsg1-1/debian/rules
Log:
Fix (I think) the problem with rpath in /usr/lib/perl5/auto/Image/Magick/Magick.so
Included debug package (needs to complete the long description)
Modified: branches/6.3.9.4.dfsg1-1/README
===================================================================
--- branches/6.3.9.4.dfsg1-1/README 2008-03-23 02:24:04 UTC (rev 52)
+++ branches/6.3.9.4.dfsg1-1/README 2008-03-25 00:05:58 UTC (rev 53)
@@ -1,6 +1,3 @@
-0f68bfe6d3d5b3926b51911411052436 ImageMagick-6.3.7-1.tar.gz
-40c5ac24fe97f3cabe23a7cfe10febea ImageMagick-6.3.7-2.tar.gz
-
[FOLDER] debian/
This is the debian folder for the package
Modified: branches/6.3.9.4.dfsg1-1/debian/TODO
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/TODO 2008-03-23 02:24:04 UTC (rev 52)
+++ branches/6.3.9.4.dfsg1-1/debian/TODO 2008-03-25 00:05:58 UTC (rev 53)
@@ -1,10 +1,6 @@
- verify conflicts, replaces, provides, dependencies, etc
-- debug packages
- use symbol files; seems interesting:
http://wiki.debian.org/Projects/ImprovedDpkgShlibdeps
http://wiki.debian.org/UsingSymbolsFiles
- menu icon
-- lintian warning:
- W: perlmagick: binary-or-shlib-defines-rpath ./usr/lib/perl5/auto/Image/Magick/Magick.so /tmp/buildd/imagemagick-6.3.9.9.dfsg1/PerlMagick/../magick/.libs:/tmp/buildd/imagemagick-6.3.9.9.dfsg1/PerlMagick/../wand/.libs
- Needs to use only chrpath?
- nox packages (without having dependencies on X libs)
Modified: branches/6.3.9.4.dfsg1-1/debian/changelog
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/changelog 2008-03-23 02:24:04 UTC (rev 52)
+++ branches/6.3.9.4.dfsg1-1/debian/changelog 2008-03-25 00:05:58 UTC (rev 53)
@@ -1,10 +1,12 @@
-imagemagick (7:6.3.9.10.dfsg1-1) UNRELEASED; urgency=low
+imagemagick (7:6.4.0.0.dfsg1-1) UNRELEASED; urgency=low
* New upstream release (Closes: 469819);
* Fix ImageMagick's README.txt encoding (Closes: #465717);
* debian/control:
- replace build-depends libz-dev -> zlib1g-dev;
- remove versioned build-depends on libpng12-dev.
+ * Bumped compat level to 6;
+ * Add debug packages (Closes: #471715);
* Change maintainer to ImageMagick Packaging Team
<pkg-gmagick-im-team at lists.alioth.debian.org>;
* Split imagemagick into imagemagick and imagemagick-doc (Closes: #233376);
@@ -19,10 +21,10 @@
* Fix documentation URLs in manpages (Closes: #470922);
* Fix incorrectly rendering of grayscale PNGs (Closes: #383531, #350350);
* Fix segmentation fault when cropping in display (Closes: #374631);
+ * Fix wrong output when using "convert -draw" (Closes: #337837);
* Lower display's mime priority (Closes: #470591);
* Fix update of the EXIF profile (Closes: #468692);
- * Fix HTML image map creation when using montage (Closes: #364128);
- * NEEDS TO COMPLETE THE CHANGELOG
+ * Fix HTML image map creation when using montage (Closes: #364128).
-- Nelson A. de Oliveira <naoliv at debian.org> Fri, 07 Mar 2008 17:25:06 -0300
Modified: branches/6.3.9.4.dfsg1-1/debian/control
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/control 2008-03-23 02:24:04 UTC (rev 52)
+++ branches/6.3.9.4.dfsg1-1/debian/control 2008-03-25 00:05:58 UTC (rev 53)
@@ -4,7 +4,7 @@
Maintainer: ImageMagick Packaging Team <pkg-gmagick-im-team at lists.alioth.debian.org>
Uploaders: Luciano Bello <luciano at debian.org>, Daniel Kobras <kobras at debian.org>, Nelson A. de Oliveira <naoliv at debian.org>
Standards-Version: 3.7.3
-Build-Depends: libjpeg62-dev, libbz2-dev, libtiff4-dev, libwmf-dev, zlib1g-dev, libpng12-dev, libx11-dev, libxt-dev, libxext-dev, debhelper (>= 6), libxml2-dev, libfreetype6-dev, liblcms1-dev, libexif-dev, libjasper-dev, libltdl3-dev, libdjvulibre-dev, librsvg2-dev, libopenexr-dev, libgraphviz-dev, ghostscript, pkg-config, quilt
+Build-Depends: libjpeg62-dev, libbz2-dev, libtiff4-dev, libwmf-dev, zlib1g-dev, libpng12-dev, libx11-dev, libxt-dev, libxext-dev, debhelper (>= 6), libxml2-dev, libfreetype6-dev, liblcms1-dev, libexif-dev, libjasper-dev, libltdl3-dev, libdjvulibre-dev, librsvg2-dev, libopenexr-dev, libgraphviz-dev, ghostscript, pkg-config, quilt, chrpath
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gmagick/
Vcs-Svn: svn://svn.debian.org/svn/pkg-gmagick/
Homepage: http://www.imagemagick.org/
@@ -22,13 +22,23 @@
Possible effects: colormap manipulation, channel operations, thumbnail
creation, image annotation, limited drawing, image distortion, etc...
+Package: imagemagick-dbg
+Architecture: any
+Section: libdevel
+Priority: extra
+Depends: imagemagick (= ${binary:Version}), libmagick++1 (= ${binary:Version}), perlmagick (= ${binary:Version})
+Description: debugging symbols for ImageMagick
+ NEEDS TO WRITE ME
+ .
+ This package contains the debugging symbols for ImageMagick.
+
Package: imagemagick-doc
Architecture: all
Section: doc
Depends: ${misc:Depends}
Recommends: www-browser
Suggests: imagemagick
-Conflicts: imagemagick (<= 7:6.3.9)
+Conflicts: imagemagick (<= 7:6.4.0)
Description: document files of ImageMagick
Imagemagick is a set of programs to manipulate various image formats
(JPEG, TIFF, PhotoCD, PBM, XPM, etc...). All manipulations can
@@ -49,7 +59,7 @@
.
This package contains the C libraries needed to run executables that make
use of libMagick.
-
+
Package: libmagickcore-dev
Architecture: any
Section: libdevel
Modified: branches/6.3.9.4.dfsg1-1/debian/imagemagick.install
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/imagemagick.install 2008-03-23 02:24:04 UTC (rev 52)
+++ branches/6.3.9.4.dfsg1-1/debian/imagemagick.install 2008-03-25 00:05:58 UTC (rev 53)
@@ -9,8 +9,8 @@
usr/bin/display
usr/bin/montage
usr/bin/mogrify
-usr/lib/ImageMagick-6.3.9/config
-usr/share/ImageMagick-6.3.9/config
+usr/lib/ImageMagick-*/config
+usr/share/ImageMagick-*/config
usr/share/man/man1/animate.1
usr/share/man/man1/compare.1
usr/share/man/man1/composite.1
Modified: branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.install
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.install 2008-03-23 02:24:04 UTC (rev 52)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.install 2008-03-25 00:05:58 UTC (rev 53)
@@ -3,7 +3,7 @@
usr/include/ImageMagick/magick
usr/lib/libMagickCore.a
usr/lib/libMagickCore.la
-usr/lib/ImageMagick-6.3.9/modules-Q16/coders/*.a
+usr/lib/ImageMagick-*/modules-Q16/coders/*.a
usr/lib/libMagickCore.so
usr/lib/pkgconfig/ImageMagick.pc
usr/lib/pkgconfig/MagickCore.pc
Modified: branches/6.3.9.4.dfsg1-1/debian/libmagickcore1.install
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagickcore1.install 2008-03-23 02:24:04 UTC (rev 52)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagickcore1.install 2008-03-25 00:05:58 UTC (rev 53)
@@ -1,3 +1,3 @@
-usr/lib/ImageMagick-6.3.9/modules-Q16/coders/*.la
-usr/lib/ImageMagick-6.3.9/modules-Q16/coders/*.so
+usr/lib/ImageMagick-*/modules-Q16/coders/*.la
+usr/lib/ImageMagick-*/modules-Q16/coders/*.so
usr/lib/libMagickCore.so.*
Modified: branches/6.3.9.4.dfsg1-1/debian/rules
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/rules 2008-03-23 02:24:04 UTC (rev 52)
+++ branches/6.3.9.4.dfsg1-1/debian/rules 2008-03-25 00:05:58 UTC (rev 53)
@@ -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.3.9
+IMAGEMAGICKVERSION=6.4.0
SOVERSION:=1
include /usr/share/quilt/quilt.make
@@ -106,6 +106,9 @@
# Remove empty directories in debian/tmp
-find $(CURDIR)/debian/tmp -type d -empty | xargs rmdir -p
+ # Remove RPATH from Magick.so
+ chrpath -d $(CURDIR)/debian/tmp/usr/lib/perl5/auto/Image/Magick/Magick.so
+
clean-tarball:
# Nuke logo binaries
rm -f images/configure.jpg images/logo.jpg images/logo.eps images/examples.jpg \
@@ -131,7 +134,7 @@
dh_installinfo
dh_installchangelogs
dh_link
- dh_strip
+ dh_strip --dbg-package=imagemagick-dbg
dh_compress
dh_fixperms
dh_perl
More information about the pkg-gmagick-svn-commit
mailing list