[Pkg-gmagick-svn-commit] r67 - branches/experimental/debian branches/experimental/orig.patches trunk/orig.patches

naoliv at alioth.debian.org naoliv at alioth.debian.org
Sun Jun 1 21:00:15 UTC 2008 

Author: naoliv
Date: 2008-06-01 21:00:13 +0000 (Sun, 01 Jun 2008)
New Revision: 67

Added:
   branches/experimental/debian/imagemagick-doc.links
Modified:
   branches/experimental/debian/changelog
   branches/experimental/debian/imagemagick.install
   branches/experimental/debian/libmagickcore-dev.install
   branches/experimental/debian/libmagickcore1.install
   branches/experimental/debian/rules
   branches/experimental/orig.patches/dfsg_im_logos.diff
   trunk/orig.patches/dfsg_im_logos.diff
Log:
Add links from usr/share/doc/imagemagick/<docs> to usr/share/doc/imagemagick-doc/<docs>

Install missing usr/lib/ImageMagick-*/modules-Q16/filters/*

Fix install of config files

Remove unneeded lines from dfsg_im_logos.diff



Modified: branches/experimental/debian/changelog
===================================================================
--- branches/experimental/debian/changelog	2008-05-21 19:44:37 UTC (rev 66)
+++ branches/experimental/debian/changelog	2008-06-01 21:00:13 UTC (rev 67)
@@ -1,3 +1,10 @@
+imagemagick (7:6.4.1.3.dfsg1-2) UNRELEASED; urgency=low
+
+  * Install ImageMagick's config files in the proper package
+    (Closes: #484005);
+
+ -- Nelson A. de Oliveira <naoliv at debian.org>  Sun, 01 Jun 2008 17:57:18 -0300
+
 imagemagick (7:6.4.1.3.dfsg1-1) experimental; urgency=low
 
   * New upstream release;

Added: branches/experimental/debian/imagemagick-doc.links
===================================================================
--- branches/experimental/debian/imagemagick-doc.links	                        (rev 0)
+++ branches/experimental/debian/imagemagick-doc.links	2008-06-01 21:00:13 UTC (rev 67)
@@ -0,0 +1,3 @@
+usr/share/doc/imagemagick/index.html usr/share/doc/imagemagick-doc/index.html
+usr/share/doc/imagemagick/www/ usr/share/doc/imagemagick-doc/www
+usr/share/doc/imagemagick/images/ usr/share/doc/imagemagick-doc/images

Modified: branches/experimental/debian/imagemagick.install
===================================================================
--- branches/experimental/debian/imagemagick.install	2008-05-21 19:44:37 UTC (rev 66)
+++ branches/experimental/debian/imagemagick.install	2008-06-01 21:00:13 UTC (rev 67)
@@ -9,6 +9,4 @@
 usr/bin/display
 usr/bin/montage
 usr/bin/mogrify
-usr/lib/ImageMagick-*/config
-usr/share/ImageMagick-*/config
 usr/share/pixmaps/

Modified: branches/experimental/debian/libmagickcore-dev.install
===================================================================
--- branches/experimental/debian/libmagickcore-dev.install	2008-05-21 19:44:37 UTC (rev 66)
+++ branches/experimental/debian/libmagickcore-dev.install	2008-06-01 21:00:13 UTC (rev 67)
@@ -4,6 +4,7 @@
 usr/lib/libMagickCore.a
 usr/lib/libMagickCore.la
 usr/lib/ImageMagick-*/modules-Q16/coders/*.a
+usr/lib/ImageMagick-*/modules-Q16/filters/*.a
 usr/lib/libMagickCore.so
 usr/lib/pkgconfig/ImageMagick.pc
 usr/lib/pkgconfig/MagickCore.pc

Modified: branches/experimental/debian/libmagickcore1.install
===================================================================
--- branches/experimental/debian/libmagickcore1.install	2008-05-21 19:44:37 UTC (rev 66)
+++ branches/experimental/debian/libmagickcore1.install	2008-06-01 21:00:13 UTC (rev 67)
@@ -1,3 +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

Modified: branches/experimental/debian/rules
===================================================================
--- branches/experimental/debian/rules	2008-05-21 19:44:37 UTC (rev 66)
+++ branches/experimental/debian/rules	2008-06-01 21:00:13 UTC (rev 67)
@@ -9,7 +9,6 @@
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 IMAGEMAGICKVERSION=6.4.1
-SOVERSION:=1
 
 DESTDIR="$(CURDIR)/debian/tmp"
 
@@ -27,7 +26,6 @@
 	--with-magick-plus-plus \
 	--with-djvu \
 	--enable-shared \
-	--enable-lzw \
 	--without-dps \
 	--without-fpx \
 	--with-perl-options='INSTALLDIRS=vendor' \
@@ -132,7 +130,7 @@
 	dh_testroot
 	dh_installdocs
 	dh_installexamples
-	dh_install --sourcedir=debian/tmp
+	dh_install
 	dh_installmenu
 	dh_installman
 	dh_installmime

Modified: branches/experimental/orig.patches/dfsg_im_logos.diff
===================================================================
--- branches/experimental/orig.patches/dfsg_im_logos.diff	2008-05-21 19:44:37 UTC (rev 66)
+++ branches/experimental/orig.patches/dfsg_im_logos.diff	2008-06-01 21:00:13 UTC (rev 67)
@@ -3205,18 +3205,3 @@
    },
    NetscapeImage[] =
    {
-Index: ImageMagick-6.3.6/images/configure.jpg
-===================================================================
-Binary files ImageMagick-6.3.6.orig/images/configure.jpg	2007-11-20 12:35:13.000000000 -0300 and ImageMagick-6.3.6/images/configure.jpg	2007-11-20 13:27:09.000000000 -0300 differ
-Index: ImageMagick-6.3.6/images/examples.jpg
-===================================================================
-Binary files ImageMagick-6.3.6.orig/images/examples.jpg	2007-11-20 12:35:13.000000000 -0300 and ImageMagick-6.3.6/images/examples.jpg	2007-11-20 13:27:09.000000000 -0300 differ
-Index: ImageMagick-6.3.6/images/logo.jpg
-===================================================================
-Binary files ImageMagick-6.3.6.orig/images/logo.jpg	2007-11-20 12:35:13.000000000 -0300 and ImageMagick-6.3.6/images/logo.jpg	2007-11-20 13:27:09.000000000 -0300 differ
-Index: ImageMagick-6.3.6/images/script.png
-===================================================================
-Binary files ImageMagick-6.3.6.orig/images/script.png	2007-11-20 12:35:13.000000000 -0300 and ImageMagick-6.3.6/images/script.png	2007-11-20 13:27:09.000000000 -0300 differ
-Index: ImageMagick-6.3.6/www/Magick++/ImageMagick.png
-===================================================================
-Binary files ImageMagick-6.3.6.orig/www/Magick++/ImageMagick.png	2007-11-20 12:33:54.000000000 -0300 and ImageMagick-6.3.6/www/Magick++/ImageMagick.png	2007-11-20 13:27:09.000000000 -0300 differ

Modified: trunk/orig.patches/dfsg_im_logos.diff
===================================================================
--- trunk/orig.patches/dfsg_im_logos.diff	2008-05-21 19:44:37 UTC (rev 66)
+++ trunk/orig.patches/dfsg_im_logos.diff	2008-06-01 21:00:13 UTC (rev 67)
@@ -3205,18 +3205,3 @@
    },
    NetscapeImage[] =
    {
-Index: ImageMagick-6.3.6/images/configure.jpg
-===================================================================
-Binary files ImageMagick-6.3.6.orig/images/configure.jpg	2007-11-20 12:35:13.000000000 -0300 and ImageMagick-6.3.6/images/configure.jpg	2007-11-20 13:27:09.000000000 -0300 differ
-Index: ImageMagick-6.3.6/images/examples.jpg
-===================================================================
-Binary files ImageMagick-6.3.6.orig/images/examples.jpg	2007-11-20 12:35:13.000000000 -0300 and ImageMagick-6.3.6/images/examples.jpg	2007-11-20 13:27:09.000000000 -0300 differ
-Index: ImageMagick-6.3.6/images/logo.jpg
-===================================================================
-Binary files ImageMagick-6.3.6.orig/images/logo.jpg	2007-11-20 12:35:13.000000000 -0300 and ImageMagick-6.3.6/images/logo.jpg	2007-11-20 13:27:09.000000000 -0300 differ
-Index: ImageMagick-6.3.6/images/script.png
-===================================================================
-Binary files ImageMagick-6.3.6.orig/images/script.png	2007-11-20 12:35:13.000000000 -0300 and ImageMagick-6.3.6/images/script.png	2007-11-20 13:27:09.000000000 -0300 differ
-Index: ImageMagick-6.3.6/www/Magick++/ImageMagick.png
-===================================================================
-Binary files ImageMagick-6.3.6.orig/www/Magick++/ImageMagick.png	2007-11-20 12:33:54.000000000 -0300 and ImageMagick-6.3.6/www/Magick++/ImageMagick.png	2007-11-20 13:27:09.000000000 -0300 differ

More information about the pkg-gmagick-svn-commit mailing list