[Pkg-gmagick-svn-commit] r46 - branches/6.3.9.4.dfsg1-1/debian
naoliv at alioth.debian.org
naoliv at alioth.debian.org
Mon Mar 10 14:10:52 UTC 2008
Author: naoliv
Date: 2008-03-10 14:10:52 +0000 (Mon, 10 Mar 2008)
New Revision: 46
Added:
branches/6.3.9.4.dfsg1-1/debian/imagemagick-doc.doc-base
branches/6.3.9.4.dfsg1-1/debian/imagemagick-doc.files
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.docs
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
Removed:
branches/6.3.9.4.dfsg1-1/debian/imagemagick.doc-base
branches/6.3.9.4.dfsg1-1/debian/libmagick++10.dirs
branches/6.3.9.4.dfsg1-1/debian/libmagick++10.files
branches/6.3.9.4.dfsg1-1/debian/libmagick++9-dev.dirs
branches/6.3.9.4.dfsg1-1/debian/libmagick++9-dev.files
branches/6.3.9.4.dfsg1-1/debian/libmagick10.dirs
branches/6.3.9.4.dfsg1-1/debian/libmagick10.files
branches/6.3.9.4.dfsg1-1/debian/libmagick9-dev.dirs
branches/6.3.9.4.dfsg1-1/debian/libmagick9-dev.docs
branches/6.3.9.4.dfsg1-1/debian/libmagick9-dev.files
Modified:
branches/6.3.9.4.dfsg1-1/debian/changelog
branches/6.3.9.4.dfsg1-1/debian/compat
branches/6.3.9.4.dfsg1-1/debian/control
branches/6.3.9.4.dfsg1-1/debian/rules
Log:
Initial work for the new release
Modified: branches/6.3.9.4.dfsg1-1/debian/changelog
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/changelog 2008-03-10 14:07:21 UTC (rev 45)
+++ branches/6.3.9.4.dfsg1-1/debian/changelog 2008-03-10 14:10:52 UTC (rev 46)
@@ -1,9 +1,11 @@
-imagemagick (7:6.3.7.9.dfsg1-3) UNRELEASED; urgency=low
+imagemagick (7:6.3.9.4-1) UNRELEASED; urgency=low
* Fix ImageMagick's README.txt encoding (Closes: #465717)
* debian/control:
- replace build-depends libz-dev -> zlib1g-dev;
- remove versioned build-depends on libpng12-dev.
+ * Split imagemagick into imagemagick and imagemagick-doc (Closes: #233376);
+ * 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/compat
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/compat 2008-03-10 14:07:21 UTC (rev 45)
+++ branches/6.3.9.4.dfsg1-1/debian/compat 2008-03-10 14:10:52 UTC (rev 46)
@@ -1 +1 @@
-5
+6
Modified: branches/6.3.9.4.dfsg1-1/debian/control
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/control 2008-03-10 14:07:21 UTC (rev 45)
+++ branches/6.3.9.4.dfsg1-1/debian/control 2008-03-10 14:10:52 UTC (rev 46)
@@ -4,7 +4,7 @@
Maintainer: Luciano Bello <luciano at debian.org>
Uploaders: 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 (>= 5), 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
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gmagick/
Vcs-Svn: svn://svn.debian.org/svn/pkg-gmagick/
Homepage: http://www.imagemagick.org/
@@ -12,8 +12,7 @@
Package: imagemagick
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: imagemagick-doc
-Replaces: imagemagick-doc, geomview (<= 1.8.0)
+Suggests: imagemagick-doc
Description: image manipulation programs
Imagemagick is a set of programs to manipulate various image formats
(JPEG, TIFF, PhotoCD, PBM, XPM, etc...). All manipulations can
@@ -23,7 +22,22 @@
Possible effects: colormap manipulation, channel operations, thumbnail
creation, image annotation, limited drawing, image distortion, etc...
-Package: libmagick10
+Package: imagemagick-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Recommends: www-browser
+Suggests: imagemagick
+Conflicts: imagemagick (<= 7:6.3.9)
+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
+ be achieved through shell commands as well as through an X11 graphical
+ interface (display).
+ .
+ This package contains the document files shipped with ImageMagick.
+
+Package: libmagickcore1
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -36,12 +50,10 @@
This package contains the C libraries needed to run executables that make
use of libMagick.
-Package: libmagick9-dev
+Package: libmagickcore-dev
Architecture: any
Section: libdevel
-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, libdjvulibre-dev, librsvg2-dev, libopenexr-dev, libgraphviz-dev
-Conflicts: libmagick6-dev
-Replaces: libmagick6-dev
+Depends: libmagickcore1 (= ${binary:Version}), libjpeg62-dev, libbz2-dev, libtiff4-dev, libwmf-dev (>= 0.2.7-1), zlib1g-dev, libpng12-dev, libx11-dev, libxt-dev, libxext-dev, libxml2-dev, libfreetype6-dev, liblcms1-dev, libexif-dev, libjasper-dev, libltdl3-dev, libdjvulibre-dev, librsvg2-dev, libopenexr-dev, libgraphviz-dev
Description: image manipulation library - development files
LibMagick supports loading and saving a very large set of image formats.
It allows a lot of image manipulation as well.
@@ -49,10 +61,21 @@
This package includes header files and static libraries needed to compile
programs using libMagick.
-Package: libmagick++10
+Package: libmagickwand1
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
+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.
+ .
+ This package contains the C libraries needed to run executables that make
+ use of libMagick.
+
+Package: libmagick++1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libmagick++6
Replaces: libmagick++6
Description: C++ API to the ImageMagick library
@@ -78,10 +101,10 @@
This package contains the C++ libraries needed to run executables that make
use of libMagick++.
-Package: libmagick++9-dev
+Package: libmagick++-dev
Architecture: any
Section: libdevel
-Depends: libmagick++10 (= ${binary:Version}), libmagick9-dev (= ${binary:Version})
+Depends: libmagick++1 (= ${binary:Version}), libmagickcore-dev (= ${binary:Version})
Conflicts: libmagick++6-dev
Replaces: libmagick++6-dev
Description: C++ API to the ImageMagick library - development files
Added: branches/6.3.9.4.dfsg1-1/debian/imagemagick-doc.doc-base
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/imagemagick-doc.doc-base (rev 0)
+++ branches/6.3.9.4.dfsg1-1/debian/imagemagick-doc.doc-base 2008-03-10 14:10:52 UTC (rev 46)
@@ -0,0 +1,13 @@
+Document: imagemagick
+Title: ImageMagick
+Author: John Cristy
+Abstract: This manual documents ImageMagick.
+ ImageMagick is a set of programs to manipulate various image formats
+ (JPEG, TIFF, PhotoCD, PBM, XPM, etc...). All manipulations can
+ be achieved through shell commands as well as through a X11 graphical
+ interface (display).
+Section: Graphics
+
+Format: HTML
+Index: /usr/share/doc/imagemagick/index.html
+Files: /usr/share/doc/imagemagick/www/*
Added: branches/6.3.9.4.dfsg1-1/debian/imagemagick-doc.files
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/imagemagick-doc.files (rev 0)
+++ branches/6.3.9.4.dfsg1-1/debian/imagemagick-doc.files 2008-03-10 14:10:52 UTC (rev 46)
@@ -0,0 +1 @@
+usr/share/doc/imagemagick/
Deleted: branches/6.3.9.4.dfsg1-1/debian/imagemagick.doc-base
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/imagemagick.doc-base 2008-03-10 14:07:21 UTC (rev 45)
+++ branches/6.3.9.4.dfsg1-1/debian/imagemagick.doc-base 2008-03-10 14:10:52 UTC (rev 46)
@@ -1,14 +0,0 @@
-Document: imagemagick
-Title: ImageMagick
-Author: John Cristy
-Abstract: This manual documents ImageMagick.
- ImageMagick is a set of programs to manipulate various image formats
- (JPEG, TIFF, PhotoCD, PBM, XPM, etc...). All manipulations can
- be achieved through shell commands as well as through a X11 graphical
- interface (display).
-Section: Applications/Graphics
-
-Format: HTML
-Index: /usr/share/doc/imagemagick/index.html
-Files: /usr/share/doc/imagemagick/www/*
-
Added: branches/6.3.9.4.dfsg1-1/debian/libmagick++-dev.dirs
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagick++-dev.dirs (rev 0)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagick++-dev.dirs 2008-03-10 14:10:52 UTC (rev 46)
@@ -0,0 +1,3 @@
+usr/bin
+usr/share/man/man1
+usr/lib/pkgconfig
Added: branches/6.3.9.4.dfsg1-1/debian/libmagick++-dev.files
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagick++-dev.files (rev 0)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagick++-dev.files 2008-03-10 14:10:52 UTC (rev 46)
@@ -0,0 +1,8 @@
+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++1.files
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagick++1.files (rev 0)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagick++1.files 2008-03-10 14:10:52 UTC (rev 46)
@@ -0,0 +1 @@
+usr/lib/libMagick++*.so.*
Deleted: branches/6.3.9.4.dfsg1-1/debian/libmagick++10.dirs
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagick++10.dirs 2008-03-10 14:07:21 UTC (rev 45)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagick++10.dirs 2008-03-10 14:10:52 UTC (rev 46)
@@ -1 +0,0 @@
-usr/share/doc/libmagick++10
Deleted: branches/6.3.9.4.dfsg1-1/debian/libmagick++10.files
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagick++10.files 2008-03-10 14:07:21 UTC (rev 45)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagick++10.files 2008-03-10 14:10:52 UTC (rev 46)
@@ -1 +0,0 @@
-usr/lib/libMagick++*.so.*
Deleted: branches/6.3.9.4.dfsg1-1/debian/libmagick++9-dev.dirs
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagick++9-dev.dirs 2008-03-10 14:07:21 UTC (rev 45)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagick++9-dev.dirs 2008-03-10 14:10:52 UTC (rev 46)
@@ -1,4 +0,0 @@
-usr/include/Magick++
-usr/bin
-usr/share/man/man1
-usr/lib/pkgconfig
Deleted: branches/6.3.9.4.dfsg1-1/debian/libmagick++9-dev.files
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagick++9-dev.files 2008-03-10 14:07:21 UTC (rev 45)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagick++9-dev.files 2008-03-10 14:10:52 UTC (rev 46)
@@ -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
Deleted: branches/6.3.9.4.dfsg1-1/debian/libmagick10.dirs
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagick10.dirs 2008-03-10 14:07:21 UTC (rev 45)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagick10.dirs 2008-03-10 14:10:52 UTC (rev 46)
@@ -1 +0,0 @@
-usr/lib
Deleted: branches/6.3.9.4.dfsg1-1/debian/libmagick10.files
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagick10.files 2008-03-10 14:07:21 UTC (rev 45)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagick10.files 2008-03-10 14:10:52 UTC (rev 46)
@@ -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.3.7/*
-usr/share/ImageMagick-6.3.7/config/*
Deleted: branches/6.3.9.4.dfsg1-1/debian/libmagick9-dev.dirs
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagick9-dev.dirs 2008-03-10 14:07:21 UTC (rev 45)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagick9-dev.dirs 2008-03-10 14:10:52 UTC (rev 46)
@@ -1,4 +0,0 @@
-usr/lib
-usr/include/magick
-usr/share/man
-usr/lib/pkgconfig
Deleted: branches/6.3.9.4.dfsg1-1/debian/libmagick9-dev.docs
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagick9-dev.docs 2008-03-10 14:07:21 UTC (rev 45)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagick9-dev.docs 2008-03-10 14:10:52 UTC (rev 46)
@@ -1 +0,0 @@
-debian/upgrade-checklist.txt
Deleted: branches/6.3.9.4.dfsg1-1/debian/libmagick9-dev.files
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagick9-dev.files 2008-03-10 14:07:21 UTC (rev 45)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagick9-dev.files 2008-03-10 14:10:52 UTC (rev 46)
@@ -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
-
Added: branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.dirs
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.dirs (rev 0)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.dirs 2008-03-10 14:10:52 UTC (rev 46)
@@ -0,0 +1,4 @@
+usr/lib
+usr/include/ImageMagick/magick
+usr/share/man
+usr/lib/pkgconfig
Added: branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.docs
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.docs (rev 0)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.docs 2008-03-10 14:10:52 UTC (rev 46)
@@ -0,0 +1 @@
+debian/upgrade-checklist.txt
Added: branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.files
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.files (rev 0)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.files 2008-03-10 14:10:52 UTC (rev 46)
@@ -0,0 +1,14 @@
+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/libmagickcore1.dirs
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagickcore1.dirs (rev 0)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagickcore1.dirs 2008-03-10 14:10:52 UTC (rev 46)
@@ -0,0 +1 @@
+usr/lib
Added: branches/6.3.9.4.dfsg1-1/debian/libmagickcore1.files
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagickcore1.files (rev 0)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagickcore1.files 2008-03-10 14:10:52 UTC (rev 46)
@@ -0,0 +1,8 @@
+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/libmagickwand1.files
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagickwand1.files (rev 0)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagickwand1.files 2008-03-10 14:10:52 UTC (rev 46)
@@ -0,0 +1 @@
+usr/lib/libMagickWand*
Modified: branches/6.3.9.4.dfsg1-1/debian/rules
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/rules 2008-03-10 14:07:21 UTC (rev 45)
+++ branches/6.3.9.4.dfsg1-1/debian/rules 2008-03-10 14:10:52 UTC (rev 46)
@@ -8,8 +8,8 @@
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.7
-SOVERSION:=10
+IMAGEMAGICKVERSION=6.3.9
+SOVERSION:=1
include /usr/share/quilt/quilt.make
@@ -53,7 +53,7 @@
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' \
+# 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'
touch build-stamp
More information about the pkg-gmagick-svn-commit
mailing list