tags 339163 patch
thanks

Hi Peter,

I've prepared an NMU to also fix this bug in exiv2.  The patch for this NMU
is attached, and I'll be uploading the package shortly to the NEW queue.  If
you disagree with any of the changes made, please make a maintainer upload
in its place.

Cheers,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
[EMAIL PROTECTED]                                   http://www.debian.org/
reverted:
--- exiv2-0.7/debian/libexiv2.postrm
+++ exiv2-0.7.orig/debian/libexiv2.postrm
@@ -1,36 +0,0 @@
-#! /bin/sh
-# postrm script for exiv2
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-       
purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-                       ldconfig
-       ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
reverted:
--- exiv2-0.7/debian/libexiv2.postinst
+++ exiv2-0.7.orig/debian/libexiv2.postinst
@@ -1,42 +0,0 @@
-#! /bin/sh
-# postinst script for exiv2
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-
-case "$1" in
-    configure)
-       ldconfig
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff -u exiv2-0.7/debian/shlibs.local exiv2-0.7/debian/shlibs.local
--- exiv2-0.7/debian/shlibs.local
+++ exiv2-0.7/debian/shlibs.local
@@ -1 +1 @@
-libexiv2 0.7 libexiv2 (= ${Source-Version})
+libexiv2 0.7 libexiv2c2a (= ${Source-Version})
diff -u exiv2-0.7/debian/rules exiv2-0.7/debian/rules
--- exiv2-0.7/debian/rules
+++ exiv2-0.7/debian/rules
@@ -85,8 +85,8 @@
 binary-arch: build install
        dh_testdir
        dh_testroot
-# package libexiv2
-       dh_movefiles -plibexiv2                 \
+# package libexiv2c2a
+       dh_movefiles -plibexiv2c2a              \
                usr/lib/libexiv2-0.7.so         \
                usr/lib/libexiv2.so             \
                usr/lib/libexiv2.la
@@ -98,9 +98,9 @@
        dh_movefiles -pexiv2 usr/bin/exiv2
 # the rest....
        dh_installchangelogs 
-# docs in package libexiv2-doc but in /usr/share/doc/libexiv2/
+# docs in package libexiv2-doc but in /usr/share/doc/libexiv2c2a/
        dh_installdocs
-       dh_installdocs -plibexiv2 -Pdebian/libexiv2-doc -Xcmd.txt -XMakefile 
-Xtemplates -Xcopyright $(CURDIR)/doc/*
+       dh_installdocs -plibexiv2c2a -Pdebian/libexiv2-doc -Xcmd.txt -XMakefile 
-Xtemplates -Xcopyright $(CURDIR)/doc/*
 # cmd.txt goes as example
        dh_installexamples -pexiv2 $(CURDIR)/doc/cmd.txt
 #      dh_install
diff -u exiv2-0.7/debian/control exiv2-0.7/debian/control
--- exiv2-0.7/debian/control
+++ exiv2-0.7/debian/control
@@ -23,11 +23,13 @@
   * extract the thumbnail image embedded in the EXIF metadata
   * delete the thumbnail or the complete EXIF metadata from an image
 
-Package: libexiv2
+Package: libexiv2c2a
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: exiv2
+Conflicts: libexiv2
+Replaces: libexiv2
 Description: EXIF/IPTC metadata manipulation library
  Exiv2 library supports:
   * full read and write access to the EXIF and IPTC metadata of an image
@@ -56,5 +58,5 @@
 Section: doc
 Architecture: all
-Depends: libexiv2 (= ${Source-Version})
+Depends: libexiv2c2a (= ${Source-Version})
 Description: EXIF/IPTC metadata manipulation library - HTML documentation
  Exiv2 HTML documentation.
diff -u exiv2-0.7/debian/changelog exiv2-0.7/debian/changelog
--- exiv2-0.7/debian/changelog
+++ exiv2-0.7/debian/changelog
@@ -1,3 +1,14 @@
+exiv2 (0.7-9.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Medium-urgency upload for RC bugfix.
+  * Change package name from libexiv2 to libexiv2c2a for the C++ mt allocator
+    ABI change, and conflict/replace libexiv2 accordingly.  Closes: #339163.
+  * Remove unnecessary libexiv2.{postinst,postrm} scripts, as they don't do
+    anything that debhelper doesn't already do for us.
+
+ -- Steve Langasek <[EMAIL PROTECTED]>  Tue, 29 Nov 2005 03:57:53 -0800
+
 exiv2 (0.7-9) unstable; urgency=low
 
   * Added missing Build-Depends: sharutils (Closes: #328376)

Attachment: signature.asc
Description: Digital signature

Reply via email to