[Pkg-gmagick-svn-commit] r49 - branches/6.3.9.4.dfsg1-1/debian
naoliv at alioth.debian.org
naoliv at alioth.debian.org
Sat Mar 22 15:34:10 UTC 2008
Author: naoliv
Date: 2008-03-22 15:34:09 +0000 (Sat, 22 Mar 2008)
New Revision: 49
Added:
branches/6.3.9.4.dfsg1-1/debian/imagemagick-doc.install
branches/6.3.9.4.dfsg1-1/debian/imagemagick.install
branches/6.3.9.4.dfsg1-1/debian/libmagick++-dev.install
branches/6.3.9.4.dfsg1-1/debian/libmagick++1.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/libmagickwand-dev.install
branches/6.3.9.4.dfsg1-1/debian/libmagickwand1.install
branches/6.3.9.4.dfsg1-1/debian/perlmagick.install
Removed:
branches/6.3.9.4.dfsg1-1/debian/imagemagick-doc.files
branches/6.3.9.4.dfsg1-1/debian/imagemagick.dirs
branches/6.3.9.4.dfsg1-1/debian/libmagick++-dev.dirs
branches/6.3.9.4.dfsg1-1/debian/libmagick++-dev.files
branches/6.3.9.4.dfsg1-1/debian/libmagick++1.files
branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.dirs
branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.files
branches/6.3.9.4.dfsg1-1/debian/libmagickcore1.dirs
branches/6.3.9.4.dfsg1-1/debian/libmagickcore1.files
branches/6.3.9.4.dfsg1-1/debian/libmagickwand1.files
branches/6.3.9.4.dfsg1-1/debian/perlmagick.dirs
branches/6.3.9.4.dfsg1-1/debian/perlmagick.files
Modified:
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.mime
branches/6.3.9.4.dfsg1-1/debian/rules
Log:
Looking better
Modified: branches/6.3.9.4.dfsg1-1/debian/changelog
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/changelog 2008-03-11 04:04:55 UTC (rev 48)
+++ branches/6.3.9.4.dfsg1-1/debian/changelog 2008-03-22 15:34:09 UTC (rev 49)
@@ -1,4 +1,4 @@
-imagemagick (7:6.3.9.4.dfsg1-1) UNRELEASED; urgency=low
+imagemagick (7:6.3.9.10.dfsg1-1) UNRELEASED; urgency=low
* New upstream release (Closes: 469819);
* Fix ImageMagick's README.txt encoding (Closes: #465717);
@@ -6,11 +6,17 @@
- replace build-depends libz-dev -> zlib1g-dev;
- remove versioned build-depends on libpng12-dev.
* Change maintainer to ImageMagick Packaging Team
- <pkg-gmagick-im-team at lists.alioth.debian.org>
+ <pkg-gmagick-im-team at lists.alioth.debian.org>;
* Split imagemagick into imagemagick and imagemagick-doc (Closes: #233376);
* Update doc-base section;
* Add transfig to suggests (Closes: #441155);
* Fix typo in manpages (Closes: #426552);
+ * Fix typo in composite.html (Closes: #436789);
+ * Fix documentation URLs in manpages (Closes: #470922);
+ * Fix incorrectly rendering of grayscale PNGs (Closes: #383531);
+ * Fix segmentation fault when cropping in display (Closes: #374631);
+ * Lower display's mime priority (Closes: #470591);
+ * Fix update of the EXIF profile (Closes: #468692);
* NEEDS TO COMPLETE THE CHANGELOG
-- 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-11 04:04:55 UTC (rev 48)
+++ branches/6.3.9.4.dfsg1-1/debian/control 2008-03-22 15:34:09 UTC (rev 49)
@@ -72,6 +72,14 @@
This package contains the C libraries needed to run executables that make
use of libMagick.
+Package: libmagickwand-dev
+Architecture: any
+Section: libdevel
+Depends: libmagickwand1 (= ${binary:Version}), libmagickcore-dev (= ${binary:Version}), ${misc:Depends}
+Description: C++ API to the ImageMagick library - development files
+ This package includes header files and static libraries needed to compile
+ programs using libMagickWand.
+
Package: libmagick++1
Architecture: any
Section: libs
Deleted: branches/6.3.9.4.dfsg1-1/debian/imagemagick-doc.files
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/imagemagick-doc.files 2008-03-11 04:04:55 UTC (rev 48)
+++ branches/6.3.9.4.dfsg1-1/debian/imagemagick-doc.files 2008-03-22 15:34:09 UTC (rev 49)
@@ -1 +0,0 @@
-usr/share/doc/imagemagick/
Added: branches/6.3.9.4.dfsg1-1/debian/imagemagick-doc.install
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/imagemagick-doc.install (rev 0)
+++ branches/6.3.9.4.dfsg1-1/debian/imagemagick-doc.install 2008-03-22 15:34:09 UTC (rev 49)
@@ -0,0 +1,3 @@
+usr/share/doc/imagemagick/images
+usr/share/doc/imagemagick/www
+usr/share/doc/imagemagick/index.html
Deleted: branches/6.3.9.4.dfsg1-1/debian/imagemagick.dirs
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/imagemagick.dirs 2008-03-11 04:04:55 UTC (rev 48)
+++ branches/6.3.9.4.dfsg1-1/debian/imagemagick.dirs 2008-03-22 15:34:09 UTC (rev 49)
@@ -1,6 +0,0 @@
-usr/bin
-usr/include/magick
-usr/lib/mime/packages
-usr/lib/menu
-usr/share/doc/imagemagick/html/www
-usr/share/man
Added: branches/6.3.9.4.dfsg1-1/debian/imagemagick.install
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/imagemagick.install (rev 0)
+++ branches/6.3.9.4.dfsg1-1/debian/imagemagick.install 2008-03-22 15:34:09 UTC (rev 49)
@@ -0,0 +1,3 @@
+usr/bin
+usr/lib/ImageMagick-6.3.9/config
+usr/share/ImageMagick-6.3.9/config
Modified: branches/6.3.9.4.dfsg1-1/debian/imagemagick.mime
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/imagemagick.mime 2008-03-11 04:04:55 UTC (rev 48)
+++ branches/6.3.9.4.dfsg1-1/debian/imagemagick.mime 2008-03-22 15:34:09 UTC (rev 49)
@@ -1,42 +1,42 @@
-image/avs; display 'avs:%s'; test=test -n "$DISPLAY"
-image/bie; display 'jbig:%s'; test=test -n "$DISPLAY"
-image/x-ms-bmp; display 'bmp:%s'; test=test -n "$DISPLAY"
-image/cmyk; display 'cmyk:%s'; test=test -n "$DISPLAY"
-image/dcx; display 'dcx:%s'; test=test -n "$DISPLAY"
-image/eps; display 'eps:%s'; test=test -n "$DISPLAY"
-image/fax; display 'fax:%s'; test=test -n "$DISPLAY"
-image/fits; display 'fits:%s'; test=test -n "$DISPLAY"
-image/gif; display 'gif:%s'; test=test -n "$DISPLAY"
-image/gray; display 'gray:%s'; test=test -n "$DISPLAY"
-image/jpeg; display 'jpeg:%s'; test=test -n "$DISPLAY"
-image/pjpeg; display 'jpeg:%s'; test=test -n "$DISPLAY"
-image/miff; display 'miff:%s'; test=test -n "$DISPLAY"
-image/mono; display 'mono:%s'; test=test -n "$DISPLAY"
-image/mtv; display 'mtv:%s'; test=test -n "$DISPLAY"
-image/x-portable-bitmap; display 'pbm:%s'; test=test -n "$DISPLAY"
-image/pcd; display 'pcd:%s'; test=test -n "$DISPLAY"
-image/pcx; display 'pcx:%s'; test=test -n "$DISPLAY"
-image/pdf; display 'pdf:%s'; test=test -n "$DISPLAY"
-image/x-portable-graymap; display 'pgm:%s'; test=test -n "$DISPLAY"
-image/pict; display 'pict:%s'; test=test -n "$DISPLAY"
-image/png; display 'png:%s'; test=test -n "$DISPLAY"
-image/x-portable-anymap; display 'pnm:%s'; test=test -n "$DISPLAY"
-image/x-portable-pixmap; display 'ppm:%s'; test=test -n "$DISPLAY"
-image/ps; display 'ps:%s'; test=test -n "$DISPLAY"
-image/rad; display 'rad:%s'; test=test -n "$DISPLAY"
-image/x-rgb; display 'rgb:%s'; test=test -n "$DISPLAY"
-image/rgba; display 'rgba:%s'; test=test -n "$DISPLAY"
-image/rla; display 'rla:%s'; test=test -n "$DISPLAY"
-image/rle; display 'rle:%s'; test=test -n "$DISPLAY"
-image/sgi; display 'sgi:%s'; test=test -n "$DISPLAY"
-image/sun-raster; display 'sun:%s'; test=test -n "$DISPLAY"
-image/targa; display 'tga:%s'; test=test -n "$DISPLAY"
-image/tiff; display 'tiff:%s'; test=test -n "$DISPLAY"
-image/uyvy; display 'uyvy:%s'; test=test -n "$DISPLAY"
-image/vid; display 'vid:%s'; test=test -n "$DISPLAY"
-image/viff; display 'viff:%s'; test=test -n "$DISPLAY"
-image/x-xbitmap; display 'xbm:%s'; test=test -n "$DISPLAY"
-image/x-xpixmap; display 'xpm:%s'; test=test -n "$DISPLAY"
-image/x-xwindowdump; display 'xwd:%s'; test=test -n "$DISPLAY"
-image/x-icon; display 'icon:%s'; test=test -n "$DISPLAY"
-image/yuv; display 'yuv:%s'; test=test -n "$DISPLAY"
+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: branches/6.3.9.4.dfsg1-1/debian/libmagick++-dev.dirs
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagick++-dev.dirs 2008-03-11 04:04:55 UTC (rev 48)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagick++-dev.dirs 2008-03-22 15:34:09 UTC (rev 49)
@@ -1,3 +0,0 @@
-usr/bin
-usr/share/man/man1
-usr/lib/pkgconfig
Deleted: branches/6.3.9.4.dfsg1-1/debian/libmagick++-dev.files
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagick++-dev.files 2008-03-11 04:04:55 UTC (rev 48)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagick++-dev.files 2008-03-22 15:34:09 UTC (rev 49)
@@ -1,8 +0,0 @@
-usr/include/ImageMagick/Magick++.h
-usr/include/ImageMagick/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
Added: branches/6.3.9.4.dfsg1-1/debian/libmagick++-dev.install
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagick++-dev.install (rev 0)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagick++-dev.install 2008-03-22 15:34:09 UTC (rev 49)
@@ -0,0 +1,7 @@
+usr/bin/Magick++-config
+usr/include/ImageMagick/Magick++*
+usr/lib/libMagick++.a
+usr/lib/libMagick++.la
+usr/lib/libMagick++.so
+usr/lib/pkgconfig/ImageMagick++.pc
+usr/lib/pkgconfig/Magick++.pc
Deleted: branches/6.3.9.4.dfsg1-1/debian/libmagick++1.files
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagick++1.files 2008-03-11 04:04:55 UTC (rev 48)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagick++1.files 2008-03-22 15:34:09 UTC (rev 49)
@@ -1 +0,0 @@
-usr/lib/libMagick++*.so.*
Added: branches/6.3.9.4.dfsg1-1/debian/libmagick++1.install
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagick++1.install (rev 0)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagick++1.install 2008-03-22 15:34:09 UTC (rev 49)
@@ -0,0 +1 @@
+usr/lib/libMagick++.so.*
Deleted: branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.dirs
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.dirs 2008-03-11 04:04:55 UTC (rev 48)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.dirs 2008-03-22 15:34:09 UTC (rev 49)
@@ -1,4 +0,0 @@
-usr/lib
-usr/include/ImageMagick/magick
-usr/share/man
-usr/lib/pkgconfig
Deleted: branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.files
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.files 2008-03-11 04:04:55 UTC (rev 48)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.files 2008-03-22 15:34:09 UTC (rev 49)
@@ -1,14 +0,0 @@
-usr/include/ImageMagick/magick/
-usr/include/ImageMagick/wand/
-usr/lib/libMagickCore.a
-usr/lib/libMagickCore.la
-usr/lib/libMagickCore.so
-usr/lib/libMagickWand.a
-usr/lib/libMagickWand.la
-usr/lib/libMagickWand.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
Added: branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.install
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.install (rev 0)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.install 2008-03-22 15:34:09 UTC (rev 49)
@@ -0,0 +1,9 @@
+usr/bin/Magick-config
+usr/bin/MagickCore-config
+usr/include/ImageMagick/magick
+usr/lib/libMagickCore.a
+usr/lib/libMagickCore.la
+usr/lib/ImageMagick-6.3.9/modules-Q16/coders/*.a
+usr/lib/libMagickCore.so
+usr/lib/pkgconfig/ImageMagick.pc
+usr/lib/pkgconfig/MagickCore.pc
Deleted: branches/6.3.9.4.dfsg1-1/debian/libmagickcore1.dirs
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagickcore1.dirs 2008-03-11 04:04:55 UTC (rev 48)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagickcore1.dirs 2008-03-22 15:34:09 UTC (rev 49)
@@ -1 +0,0 @@
-usr/lib
Deleted: branches/6.3.9.4.dfsg1-1/debian/libmagickcore1.files
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagickcore1.files 2008-03-11 04:04:55 UTC (rev 48)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagickcore1.files 2008-03-22 15:34:09 UTC (rev 49)
@@ -1,8 +0,0 @@
-usr/lib/libMagickCore.so.*
-usr/lib/libMagickCore-*.so
-usr/lib/libMagickCore-*.so.*
-usr/lib/libMagicWand.so.*
-usr/lib/libMagicWand-*.so
-usr/lib/libMagicWand-*.so.*
-usr/lib/ImageMagick-6.3.9/*
-usr/share/ImageMagick-6.3.9/config/*
Added: branches/6.3.9.4.dfsg1-1/debian/libmagickcore1.install
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagickcore1.install (rev 0)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagickcore1.install 2008-03-22 15:34:09 UTC (rev 49)
@@ -0,0 +1,3 @@
+usr/lib/ImageMagick-6.3.9/modules-Q16/coders/*.la
+usr/lib/ImageMagick-6.3.9/modules-Q16/coders/*.so
+usr/lib/libMagickCore.so.*
Added: branches/6.3.9.4.dfsg1-1/debian/libmagickwand-dev.install
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagickwand-dev.install (rev 0)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagickwand-dev.install 2008-03-22 15:34:09 UTC (rev 49)
@@ -0,0 +1,8 @@
+usr/bin/MagickWand-config
+usr/bin/Wand-config
+usr/include/ImageMagick/wand
+usr/lib/libMagickWand.a
+usr/lib/libMagickWand.la
+usr/lib/libMagickWand.so
+usr/lib/pkgconfig/MagickWand.pc
+usr/lib/pkgconfig/Wand.pc
Deleted: branches/6.3.9.4.dfsg1-1/debian/libmagickwand1.files
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagickwand1.files 2008-03-11 04:04:55 UTC (rev 48)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagickwand1.files 2008-03-22 15:34:09 UTC (rev 49)
@@ -1 +0,0 @@
-usr/lib/libMagickWand*
Added: branches/6.3.9.4.dfsg1-1/debian/libmagickwand1.install
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagickwand1.install (rev 0)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagickwand1.install 2008-03-22 15:34:09 UTC (rev 49)
@@ -0,0 +1 @@
+usr/lib/libMagickWand.so.*
Deleted: branches/6.3.9.4.dfsg1-1/debian/perlmagick.dirs
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/perlmagick.dirs 2008-03-11 04:04:55 UTC (rev 48)
+++ branches/6.3.9.4.dfsg1-1/debian/perlmagick.dirs 2008-03-22 15:34:09 UTC (rev 49)
@@ -1,3 +0,0 @@
-usr/lib/perl5/auto/Image/Magick
-usr/lib/perl5/Image
-usr/share/man/man3
Deleted: branches/6.3.9.4.dfsg1-1/debian/perlmagick.files
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/perlmagick.files 2008-03-11 04:04:55 UTC (rev 48)
+++ branches/6.3.9.4.dfsg1-1/debian/perlmagick.files 2008-03-22 15:34:09 UTC (rev 49)
@@ -1,5 +0,0 @@
-usr/lib/perl5/auto/Image/Magick/Magick.so
-usr/lib/perl5/auto/Image/Magick/Magick.bs
-usr/lib/perl5/auto/Image/Magick/autosplit.ix
-usr/lib/perl5/Image/Magick.pm
-usr/share/man/man3/Image::Magick.3pm
Added: branches/6.3.9.4.dfsg1-1/debian/perlmagick.install
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/perlmagick.install (rev 0)
+++ branches/6.3.9.4.dfsg1-1/debian/perlmagick.install 2008-03-22 15:34:09 UTC (rev 49)
@@ -0,0 +1 @@
+usr/lib/perl5
Modified: branches/6.3.9.4.dfsg1-1/debian/rules
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/rules 2008-03-11 04:04:55 UTC (rev 48)
+++ branches/6.3.9.4.dfsg1-1/debian/rules 2008-03-22 15:34:09 UTC (rev 49)
@@ -32,7 +32,6 @@
--enable-lzw \
--without-dps \
--without-fpx \
- --without-perl \
--with-perl-options='INSTALLDIRS=vendor' \
--x-includes=/usr/include/X11 \
--x-libraries=/usr/lib/X11
@@ -48,11 +47,8 @@
# Add here commands to compile the package.
$(MAKE)
- cd $(CURDIR)/PerlMagick && perl Makefile.PL
- cd $(CURDIR)/PerlMagick && make \
- LD_RUN_PATH= \
-# EXTRALIBS='-L../magick/.libs -L/usr/lib -lMagick -L/usr/X11R6/lib -L/usr/lib -L/usr/lib -llcms -ltiff -lfreetype -ljpeg -lpng -lXext -lSM -lICE -lX11 -lbz2 -lxml2 -lz' \
- LDLOADLIBS='-L../magick/.libs -L/usr/lib -lMagick -L/usr/X11R6/lib -L/usr/lib -L/usr/lib -llcms -ltiff -lfreetype -ljpeg -lpng -lXext -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lpthread -lm -lpthread'
+# cd $(CURDIR)/PerlMagick && perl Makefile.PL
+# cd $(CURDIR)/PerlMagick && make LD_RUN_PATH=
touch build-stamp
@@ -64,7 +60,7 @@
# but don't make a failing testsuite fail the whole build. Change it
# to a fatal error only once we've got an estimate on how harmful
# that would be.
- @if test "$(DEB_HOST_GNU_TYPE)" = "$(DEB_BUILD_GNU_TYPE)"; then \
+# @if test "$(DEB_HOST_GNU_TYPE)" = "$(DEB_BUILD_GNU_TYPE)"; then \
unset DISPLAY; \
LD_LIBRARY_PATH="$(CURDIR)/magick/.libs:$(CURDIR)/wand/.libs:$(CURDIR)/Magick++/lib/.libs:$$LD_LIBRARY_PATH" \
$(MAKE) check LD_RUN_PATH= && echo "*** Testsuite succeeded ***" || echo "*** Testsuite failed ***"; \
@@ -92,28 +88,27 @@
dh_clean -k
dh_installdirs
- # Add here commands to install the package into debian/imagemagick.
$(MAKE) install \
- DESTDIR=$(CURDIR)/debian/imagemagick \
- pkgdocdir=/usr/share/doc/imagemagick
+ DESTDIR=$(CURDIR)/debian/tmp \
+ pkgdocdir=/usr/share/doc/imagemagick
# pkgdatadir=/usr/share/doc/imagemagick
cd $(CURDIR)/PerlMagick && \
$(MAKE) install_vendor \
- PREFIX=$(CURDIR)/debian/imagemagick/usr \
- SITEPREFIX=$(CURDIR)/debian/imagemagick/usr \
- INSTALLMAN3DIR=$(CURDIR)/debian/imagemagick/usr/share/man/man3 \
- INSTALLSITEMAN3DIR=$(CURDIR)/debian/imagemagick/usr/share/man/man3
- cp $(CURDIR)/magick/*.h $(CURDIR)/debian/imagemagick/usr/include/magick
- -cp $(CURDIR)/magick/Magick-config.1 $(CURDIR)/debian/imagemagick/usr/share/man/man1/
+ PREFIX=$(CURDIR)/debian/tmp/usr \
+ SITEPREFIX=$(CURDIR)/debian/tmp/usr \
+ INSTALLMAN3DIR=$(CURDIR)/debian/tmp/usr/share/man/man3 \
+ INSTALLSITEMAN3DIR=$(CURDIR)/debian/tmp/usr/share/man/man3
+# cp $(CURDIR)/magick/*.h $(CURDIR)/debian/imagemagick/usr/include/magick
+# -cp $(CURDIR)/magick/Magick-config.1 $(CURDIR)/debian/imagemagick/usr/share/man/man1/
-find $(CURDIR)/debian -type f -name .packlist | xargs rm -f
# These files are already included in the doc dir.
- -rm -r "$(CURDIR)"/debian/imagemagick/usr/share/ImageMagick-$(IMAGEMAGICKVERSION)
+# -rm -r "$(CURDIR)"/debian/imagemagick/usr/share/ImageMagick-$(IMAGEMAGICKVERSION)
# Fix HTML location inside manpages
sed -i 's/doc\/ImageMagick-$(IMAGEMAGICKVERSION)/doc\/imagemagick/' \
- "$(CURDIR)"/debian/imagemagick/usr/share/man/man1/*
+ "$(CURDIR)"/debian/tmp/usr/share/man/man1/*
# Use x-terninal emulator for editing (Bug #132947)
#
@@ -121,15 +116,15 @@
# sed -e s!xterm!/etc/alternatives/x-terminal-emulator! \
# $(CURDIR)/config/delegates.xml > \
# $(CURDIR)/debian/imagemagick/usr/lib/ImageMagick-$(IMAGEMAGICKVERSION)/config/delegates.xml
- dh_movefiles --sourcedir=debian/imagemagick
- -rm $(CURDIR)/debian/imagemagick/usr/lib/libltdl*
+# dh_movefiles --sourcedir=debian/imagemagick
+
# add write permission for dh_strip
- chmod +w $(CURDIR)/debian/perlmagick/usr/lib/perl5/auto/Image/Magick/Magick.so
+# chmod +w $(CURDIR)/debian/perlmagick/usr/lib/perl5/auto/Image/Magick/Magick.so
#
# Remove empty directories in debian/imagemagick and debian/libmagickXX
#
- -find $(CURDIR)/debian/imagemagick -type d -empty | xargs rmdir -p
- -find $(CURDIR)/debian/libmagick$(SOVERSION) -type d -empty | xargs rmdir -p
+ -find $(CURDIR)/debian/tmp -type d -empty | xargs rmdir -p
+# -find $(CURDIR)/debian/libmagick$(SOVERSION) -type d -empty | xargs rmdir -p
#
# -while find $(CURDIR)/debian/imagemagick -empty |xargs rmdir ; do \
# find $(CURDIR)/debian/imagemagick -empty | xargs rmdir; \
@@ -158,6 +153,8 @@
dh_testroot
dh_installdocs
dh_installexamples
+ ls -lR debian
+ dh_install --sourcedir=debian/tmp
dh_installmenu
dh_installmime -pimagemagick
dh_installinfo
@@ -166,11 +163,10 @@
dh_strip
dh_compress
dh_fixperms
+ dh_perl
dh_makeshlibs
dh_installdeb
- dh_perl
- dh_shlibdeps -L libmagick$(SOVERSION) \
- -ldebian/libmagick$(SOVERSION)/usr/lib
+ dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
More information about the pkg-gmagick-svn-commit
mailing list