Moi Ryuichi!

I'm attaching the diff between imagemagick versions 6:6.2.4.5-0.1 and
6:6.2.4.5-0.2 that I've prepared to fix #330666. The new version cures a
file conflict between the 6 and 9 versions of the -dev packages, and
introduces virtual packages libmagick-dev and libmagick++-dev to make
soname bumps less painful in the future. Also, since API
incompatibilities between different versions have been small enough
lately that many packages probably won't care, the unversioned -dev
packages might be useful in build-deps as well.

Regards,

Daniel.

diff -u imagemagick-6.2.4.5/debian/control imagemagick-6.2.4.5/debian/control
--- imagemagick-6.2.4.5/debian/control
+++ imagemagick-6.2.4.5/debian/control
@@ -39,8 +39,9 @@
 Architecture: any
 Section: libdevel
 Depends: libmagick9 (= ${Source-Version}), libjpeg62-dev, libbz2-dev, 
libfreetype6-dev,libtiff4-dev, libc6-dev, libz-dev, libpng12-dev, xlibs-dev, 
libxml2-dev, libwmf-dev (>=0.2.7-1), liblcms1-dev, libexif-dev, libdps-dev, 
libjasper-1.701-dev,libltdl3-dev 
-Conflicts: imagemagick-dev, libmagick5.5.1 (<= 5:5.5.1.4-1), libmagick-dev
-Replaces: imagemagick (<= 5:6.0.1.2-1), libmagick5.5.1 (<= 4:5.5.1.4-1), 
libmagick5
+Conflicts: imagemagick-dev, libmagick5.5.1 (<= 5:5.5.1.4-1), libmagick-dev, 
libmagick6-dev
+Replaces: imagemagick (<= 5:6.0.1.2-1), libmagick5.5.1 (<= 4:5.5.1.4-1), 
libmagick5, libmagick6-dev, libmagick-dev
+Provides: libmagick-dev
 Description: Image manipulation library -- development
  This package includes header files and static libraries needed to compile
  programs using libMagick.
@@ -75,8 +76,9 @@
 Architecture: any
 Section: libdevel
 Depends: libmagick++9 (= ${Source-Version}), libmagick9-dev (= 
${Source-Version})
-Conflicts: libmagick++0-dev, libmagick++5.5.1 (<= 4:5.5.1.4-1), libmagick++5, 
libmagick++-dev, imagemagick(<= 5:6.0.1.2-1)
-Replaces: libmagick++0-dev, libmagick++5.5.1 (<= 4:5.5.1.4-1), 
libmagick++-dev, imagemagick (<= 5:6.0.1.2-1)
+Conflicts: libmagick++0-dev, libmagick++5.5.1 (<= 4:5.5.1.4-1), libmagick++5, 
libmagick++-dev, imagemagick(<= 5:6.0.1.2-1), libmagick++6-dev
+Replaces: libmagick++0-dev, libmagick++5.5.1 (<= 4:5.5.1.4-1), 
libmagick++-dev, imagemagick (<= 5:6.0.1.2-1), libmagick++6-dev
+Provides: libmagick++-dev
 Description: The object-oriented C++ API to the ImageMagick 
library--development
  This are the include files and static libraries needed to compile
  programs using libMagick++.
diff -u imagemagick-6.2.4.5/debian/changelog 
imagemagick-6.2.4.5/debian/changelog
--- imagemagick-6.2.4.5/debian/changelog
+++ imagemagick-6.2.4.5/debian/changelog
@@ -1,3 +1,13 @@
+imagemagick (6:6.2.4.5-0.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/control: libmagick9-dev Conflicts/Replaces libmagick6-dev.
+    Likewise for libmagick++9-dev. Closes: #330666
+  * debian/control: Provide unversioned libmagick-dev and libmagick++-dev
+    and conflict/replace them for future-proof handling of soname bumps.
+
+ -- Daniel Kobras <[EMAIL PROTECTED]>  Thu,  6 Oct 2005 13:20:52 +0200
+
 imagemagick (6:6.2.4.5-0.1) unstable; urgency=low
 
   * Non-maintainer upload.

Reply via email to