Hello,

  please find attached the NMU diff for this bug.

  Cheers,

-- 
Adeodato Simó                                     dato at net.com.org.es
Debian Developer                                  adeodato at debian.org
 
          Listening to: Elton John - This train don't stop there anymore
diff -u openexr-1.2.2/debian/changelog openexr-1.2.2/debian/changelog
--- openexr-1.2.2/debian/changelog
+++ openexr-1.2.2/debian/changelog
@@ -1,3 +1,19 @@
+openexr (1.2.2-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+
+  * libstdc++ allocator transition: rename libopenexr2c2 to libopenexr2c2a.
+    (Closes: #339241)
+
+    + debian/control: rename package, make it replace and conflict
+      libopenexr2c2, update libopenexr-dev dependency.
+
+    + debian/*: s/libopenexr2c2/libopenexr2c2a/g
+
+    + mv debian/libopenexr2c2{,a}.install
+
+ -- Adeodato Simó <[EMAIL PROTECTED]>  Sat, 26 Nov 2005 01:31:40 +0100
+
 openexr (1.2.2-4) unstable; urgency=medium
 
   * FTBFS fix: Remove usage "ld --as-needed".
diff -u openexr-1.2.2/debian/control openexr-1.2.2/debian/control
--- openexr-1.2.2/debian/control
+++ openexr-1.2.2/debian/control
@@ -41,7 +41,7 @@
 Package: libopenexr-dev
 Section: libdevel
 Architecture: any
-Depends: libopenexr2c2 (= ${Source-Version}), xlibmesa-gl-dev | libgl-dev, 
xlibmesa-glu-dev | libglu-dev
+Depends: libopenexr2c2a (= ${Source-Version}), xlibmesa-gl-dev | libgl-dev, 
xlibmesa-glu-dev | libglu-dev
 Description: development files for the OpenEXR image library
  OpenEXR is a high dynamic-range (HDR) image file format developed by
  Industrial Light & Magic for use in computer imaging applications.
@@ -67,12 +67,12 @@
  .
  Homepage: http://www.openexr.com/
 
-Package: libopenexr2c2
+Package: libopenexr2c2a
 Section: libs
 Architecture: any
-Conflicts: libopenexr0, libopenexr2
+Conflicts: libopenexr0, libopenexr2, libopenexr2c2
 Depends: ${shlibs:Depends}
-Replaces: libopenexr2
+Replaces: libopenexr2, libopenexr2c2
 Description: runtime files for the OpenEXR image library
  OpenEXR is a high dynamic-range (HDR) image file format developed by
  Industrial Light & Magic for use in computer imaging applications.
diff -u openexr-1.2.2/debian/rules openexr-1.2.2/debian/rules
--- openexr-1.2.2/debian/rules
+++ openexr-1.2.2/debian/rules
@@ -20,7 +20,7 @@
 DEB_COMPRESS_EXCLUDE = .pdf
 DEB_DH_INSTALL_ARGS := --exclude="examples/" --sourcedir=debian/tmp
 DEB_DH_MAKESHLIBS_ARGS := -V
-DEB_DH_SHLIBDEPS_ARGS := -L libopenexr2c2 -l debian/libopenexr2c2/usr/lib
+DEB_DH_SHLIBDEPS_ARGS := -L libopenexr2c2a -l debian/libopenexr2c2a/usr/lib
 
 # Disable redundant documentation copies
 DEB_INSTALL_DOCS_openexr := --no-act
@@ -32,2 +32,2 @@
-binary-post-install/libopenexr2c2::
-       dh_buildinfo -plibopenexr2c2
+binary-post-install/libopenexr2c2a::
+       dh_buildinfo -plibopenexr2c2a
--- openexr-1.2.2/debian/libopenexr2c2.install
+++ openexr-1.2.2.orig/debian/libopenexr2c2.install
@@ -1 +0,0 @@
-usr/lib/*.so.*
--- openexr-1.2.2.orig/debian/libopenexr2c2a.install
+++ openexr-1.2.2/debian/libopenexr2c2a.install
@@ -0,0 +1 @@
+usr/lib/*.so.*
diff -u openexr-1.2.2/debian/libopenexr-dev.postinst 
openexr-1.2.2/debian/libopenexr-dev.postinst
--- openexr-1.2.2/debian/libopenexr-dev.postinst
+++ openexr-1.2.2/debian/libopenexr-dev.postinst
@@ -10,7 +10,7 @@
     if [ ! -L /usr/share/doc/libopenexr-dev ]
     then
         rm -rf /usr/share/doc/libopenexr-dev
-        ln -s /usr/share/doc/libopenexr2c2 /usr/share/doc/libopenexr-dev
+        ln -s /usr/share/doc/libopenexr2c2a /usr/share/doc/libopenexr-dev
     fi
 fi
 
diff -u openexr-1.2.2/debian/openexr.postinst 
openexr-1.2.2/debian/openexr.postinst
--- openexr-1.2.2/debian/openexr.postinst
+++ openexr-1.2.2/debian/openexr.postinst
@@ -10,7 +10,7 @@
     if [ ! -L /usr/share/doc/openexr ]
     then
         rm -rf /usr/share/doc/openexr
-        ln -s /usr/share/doc/libopenexr2c2 /usr/share/doc/openexr
+        ln -s /usr/share/doc/libopenexr2c2a /usr/share/doc/openexr
     fi
 fi
 
diff -u openexr-1.2.2/debian/openexr.links openexr-1.2.2/debian/openexr.links
--- openexr-1.2.2/debian/openexr.links
+++ openexr-1.2.2/debian/openexr.links
@@ -1 +1 @@
-usr/share/doc/libopenexr2c2    usr/share/doc/openexr
+usr/share/doc/libopenexr2c2a   usr/share/doc/openexr
diff -u openexr-1.2.2/debian/openexr.doc-base.IlmImf 
openexr-1.2.2/debian/openexr.doc-base.IlmImf
--- openexr-1.2.2/debian/openexr.doc-base.IlmImf
+++ openexr-1.2.2/debian/openexr.doc-base.IlmImf
@@ -9 +9 @@
-Files: /usr/share/doc/libopenexr2c2/pdf/ReadingAndWritingImageFiles.pdf
+Files: /usr/share/doc/libopenexr2c2a/pdf/ReadingAndWritingImageFiles.pdf
diff -u openexr-1.2.2/debian/libopenexr-dev.dirs 
openexr-1.2.2/debian/libopenexr-dev.dirs
--- openexr-1.2.2/debian/libopenexr-dev.dirs
+++ openexr-1.2.2/debian/libopenexr-dev.dirs
@@ -1 +1 @@
-usr/share/doc/libopenexr2c2/examples
+usr/share/doc/libopenexr2c2a/examples
diff -u openexr-1.2.2/debian/openexr.install 
openexr-1.2.2/debian/openexr.install
--- openexr-1.2.2/debian/openexr.install
+++ openexr-1.2.2/debian/openexr.install
@@ -7 +7 @@
-../../doc/*.pdf usr/share/doc/libopenexr2c2/pdf
+../../doc/*.pdf usr/share/doc/libopenexr2c2a/pdf
diff -u openexr-1.2.2/debian/openexr.doc-base.tech_intro 
openexr-1.2.2/debian/openexr.doc-base.tech_intro
--- openexr-1.2.2/debian/openexr.doc-base.tech_intro
+++ openexr-1.2.2/debian/openexr.doc-base.tech_intro
@@ -9 +9 @@
-Files: /usr/share/doc/libopenexr2c2/pdf/TechnicalIntroduction.pdf
+Files: /usr/share/doc/libopenexr2c2a/pdf/TechnicalIntroduction.pdf
diff -u openexr-1.2.2/debian/libopenexr-dev.install 
openexr-1.2.2/debian/libopenexr-dev.install
--- openexr-1.2.2/debian/libopenexr-dev.install
+++ openexr-1.2.2/debian/libopenexr-dev.install
@@ -7,2 +7,2 @@
-../../IlmImfExamples/*.cpp     usr/share/doc/libopenexr2c2/examples
-../../IlmImfExamples/*.h       usr/share/doc/libopenexr2c2/examples
+../../IlmImfExamples/*.cpp     usr/share/doc/libopenexr2c2a/examples
+../../IlmImfExamples/*.h       usr/share/doc/libopenexr2c2a/examples
diff -u openexr-1.2.2/debian/libopenexr-dev.links 
openexr-1.2.2/debian/libopenexr-dev.links
--- openexr-1.2.2/debian/libopenexr-dev.links
+++ openexr-1.2.2/debian/libopenexr-dev.links
@@ -1 +1 @@
-usr/share/doc/libopenexr2c2    usr/share/doc/libopenexr-dev
+usr/share/doc/libopenexr2c2a   usr/share/doc/libopenexr-dev

Reply via email to