Hello!

patch for the NMU

        Robert.

diff -u hdf5-1.6.4/debian/control hdf5-1.6.4/debian/control
--- hdf5-1.6.4/debian/control
+++ hdf5-1.6.4/debian/control
@@ -5,12 +5,13 @@
 Build-Depends: libmpich1.0-dev (>= 1.2.5.3-2), zlib1g-dev, lam4-dev, 
libjpeg62-dev, debhelper (>> 4)
 Standards-Version: 3.6.1
 
-Package: libhdf5-serial-1.6.4-0
+Package: libhdf5-serial-1.6.4-0c2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libhdf5-1.6.4-0
+Conflicts: libhdf5-1.6.4-0, libhdf5-serial-1.6.4-0
 Provides: libhdf5-1.6.4-0
+Replaces: libhdf5-serial-1.6.4-0
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
@@ -24,7 +25,7 @@
 Package: libhdf5-serial-dev
 Section: libdevel
 Architecture: any
-Depends: libhdf5-serial-1.6.4-0 (= ${Source-Version}), libc6-dev, zlib1g-dev, 
libjpeg62-dev
+Depends: libhdf5-serial-1.6.4-0c2 (= ${Source-Version}), libc6-dev, 
zlib1g-dev, libjpeg62-dev
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
@@ -38,13 +39,14 @@
  .
  URL: http://hdf.ncsa.uiuc.edu/HDF5/
 
-Package: libhdf5-lam-1.6.4-0
+Package: libhdf5-lam-1.6.4-0c2
 Section: libs
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libhdf5-1.6.4-0
-Provides: libhdf5-1.6.4-0
+Conflicts: libhdf5-1.6.4-0,libhdf5-lam-1.6.4-0
+Provides: libhdf5-1.6.4-0 
+Replaces: libhdf5-lam-1.6.4-0
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - LAM version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
@@ -59,7 +61,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libhdf5-lam-1.6.4-0 (= ${Source-Version}), libc6-dev, zlib1g-dev, 
libjpeg62-dev, lam4-dev
+Depends: libhdf5-lam-1.6.4-0c2 (= ${Source-Version}), libc6-dev, zlib1g-dev, 
libjpeg62-dev, lam4-dev
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
diff -u hdf5-1.6.4/debian/rules hdf5-1.6.4/debian/rules
--- hdf5-1.6.4/debian/rules
+++ hdf5-1.6.4/debian/rules
@@ -10,8 +10,8 @@
 package = libhdf5
 pkgversion ?= $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
 version ?= $(shell echo $(pkgversion) | sed 's/-[^-]*$$//')
-serpack = $(package)-serial-$(version)-0
-lampack = $(package)-lam-$(version)-0
+serpack = $(package)-serial-$(version)-0c2
+lampack = $(package)-lam-$(version)-0c2
 mpichpack = $(package)-mpich-$(version)-0
 virtpack = $(package)-$(version)-0
 
@@ -56,8 +56,8 @@
                ln -sf $$i $(lampack).$$j ; \
                ln -sf $$i $(mpichpack).$$j ; \
                done
-#      echo "libhdf5_cpp-$(version) 0 libhdf5-serial-$(version)-0 | 
libhdf5++-$(version)-0" > debian/$(serpack).shlibs
-#      echo "libhdf5-$(version) 0 libhdf5-serial-$(version)-0 | 
libhdf5-$(version)-0" >> debian/$(serpack).shlibs
+#      echo "libhdf5_cpp-$(version) 0 libhdf5-serial-$(version)-0c2 | 
libhdf5++-$(version)-0" > debian/$(serpack).shlibs
+#      echo "libhdf5-$(version) 0 libhdf5-serial-$(version)-0c2 | 
libhdf5-$(version)-0" >> debian/$(serpack).shlibs
        touch configure-stamp-debian
 
 configure-stamp-serial: configure-stamp-debian
diff -u hdf5-1.6.4/debian/changelog hdf5-1.6.4/debian/changelog
--- hdf5-1.6.4/debian/changelog
+++ hdf5-1.6.4/debian/changelog
@@ -1,3 +1,16 @@
+hdf5 (1.6.4-2.1) unstable; urgency=low
+
+  * NMU for the CXX 4.0 transition according to
+    http://lists.debian.org/debian-devel-announce/2005/07/msg00001.html
+  * CXX 4.0 transition; patch from Stephan Hermann <[EMAIL PROTECTED]>;
+    https://bugzilla.ubuntu.com/show_bug.cgi?id=11748; closes: Bug#318164
+    + renaming libhdf5-lam-1.6.2-0 to libhdf5-lam-1.6.2-0c2
+    + renaming libhdf5-serial-1.6.2-0 to libhdf5-serial-1.6.2-0c2
+    + debian/control.in: adjusted packagename, conflicts/replaces, dependencies
+    + debian/rules: adjusted packagenames
+
+ -- Robert Jordens <[EMAIL PROTECTED]>  Wed, 13 Jul 2005 22:55:52 +0200
+
 hdf5 (1.6.4-2) unstable; urgency=low
 
   * c++/config/ia64-linux-gnu: use a path relative to $srcdir to fix FTBFS on
diff -u hdf5-1.6.4/debian/control.in hdf5-1.6.4/debian/control.in
--- hdf5-1.6.4/debian/control.in
+++ hdf5-1.6.4/debian/control.in
@@ -5,12 +5,13 @@
 Build-Depends: libmpich1.0-dev (>= 1.2.5.3-2), zlib1g-dev, lam4-dev, 
libjpeg62-dev, debhelper (>> 4)
 Standards-Version: 3.6.1
 
-Package: [EMAIL PROTECTED]@-0
+Package: [EMAIL PROTECTED]@-0c2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: [EMAIL PROTECTED]@-0
+Conflicts: [EMAIL PROTECTED]@-0, [EMAIL PROTECTED]@-0
 Provides: [EMAIL PROTECTED]@-0
+Replaces: [EMAIL PROTECTED]@-0
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
@@ -24,7 +25,7 @@
 Package: libhdf5-serial-dev
 Section: libdevel
 Architecture: any
-Depends: [EMAIL PROTECTED]@-0 (= ${Source-Version}), libc6-dev, zlib1g-dev, 
libjpeg62-dev
+Depends: [EMAIL PROTECTED]@-0c2 (= ${Source-Version}), libc6-dev, zlib1g-dev, 
libjpeg62-dev
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
@@ -38,13 +39,14 @@
  .
  URL: http://hdf.ncsa.uiuc.edu/HDF5/
 
-Package: [EMAIL PROTECTED]@-0
+Package: [EMAIL PROTECTED]@-0c2
 Section: libs
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: [EMAIL PROTECTED]@-0
-Provides: [EMAIL PROTECTED]@-0
+Conflicts: [EMAIL PROTECTED]@-0,[EMAIL PROTECTED]@-0
+Provides: [EMAIL PROTECTED]@-0 
+Replaces: [EMAIL PROTECTED]@-0
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - LAM version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
@@ -59,7 +61,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: [EMAIL PROTECTED]@-0 (= ${Source-Version}), libc6-dev, zlib1g-dev, 
libjpeg62-dev, lam4-dev
+Depends: [EMAIL PROTECTED]@-0c2 (= ${Source-Version}), libc6-dev, zlib1g-dev, 
libjpeg62-dev, lam4-dev
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc

Attachment: signature.asc
Description: Digital signature

Reply via email to