diff -Nru /tmp/c4CGGJ1p26/cppopt-0.0.2/debian/changelog /tmp/910MF5ToAm/cppopt-0.0.2/debian/changelog --- /tmp/c4CGGJ1p26/cppopt-0.0.2/debian/changelog 2005-06-03 20:11:11.430677000 +0200 +++ /tmp/910MF5ToAm/cppopt-0.0.2/debian/changelog 2005-06-03 20:11:11.504664316 +0200 @@ -1,8 +1,8 @@ -cppopt (0.0.2-3) breezy; urgency=low +cppopt (0.0.2-3ubuntu1) breezy; urgency=low - * unnamed to libcppopt0c2 + * Cxx transition: cppopt renamed libcppopt0 to libcppopt0c2 - -- Daniel Neuenschwander Tue, 31 May 2005 12:56:25 +0200 + -- Daniel Neuenschwander Fri, 3 Jun 2005 20:04:52 +0200 cppopt (0.0.2-3) unstable; urgency=low diff -Nru /tmp/c4CGGJ1p26/cppopt-0.0.2/debian/control /tmp/910MF5ToAm/cppopt-0.0.2/debian/control --- /tmp/c4CGGJ1p26/cppopt-0.0.2/debian/control 2005-06-03 20:11:11.430677000 +0200 +++ /tmp/910MF5ToAm/cppopt-0.0.2/debian/control 2005-06-03 20:11:11.504664316 +0200 @@ -8,7 +8,7 @@ Package: libcppopt-dev Section: libdevel Architecture: any -Depends: libcppopt0 (= ${Source-Version}), libc6-dev +Depends: libcppopt0c2 (= ${Source-Version}), libc6-dev Description: C++ option parsing library header files The cppopt library provides functions similar to those found in getopt or libpopt, except that it makes use of STL maps and other C++ @@ -17,10 +17,12 @@ This package provides the header files and .so symlink required to compile programs against libcppopt. -Package: libcppopt0 +Package: libcppopt0c2 Section: libs Architecture: any Depends: ${shlibs:Depends} +Replaces: libcppopt0 +Conflicts: libcppopt0 Description: C++ option parsing library The cppopt library provides functions similar to those found in getopt or libpopt, except that it makes use of STL maps and other C++ diff -Nru /tmp/c4CGGJ1p26/cppopt-0.0.2/debian/libcppopt0c2.dirs /tmp/910MF5ToAm/cppopt-0.0.2/debian/libcppopt0c2.dirs --- /tmp/c4CGGJ1p26/cppopt-0.0.2/debian/libcppopt0c2.dirs 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/910MF5ToAm/cppopt-0.0.2/debian/libcppopt0c2.dirs 2005-06-03 20:11:11.504664316 +0200 @@ -0,0 +1,3 @@ +usr/lib +usr/include +usr/share/lintian/overrides diff -Nru /tmp/c4CGGJ1p26/cppopt-0.0.2/debian/libcppopt0c2.docs /tmp/910MF5ToAm/cppopt-0.0.2/debian/libcppopt0c2.docs --- /tmp/c4CGGJ1p26/cppopt-0.0.2/debian/libcppopt0c2.docs 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/910MF5ToAm/cppopt-0.0.2/debian/libcppopt0c2.docs 2005-06-03 20:11:11.504664316 +0200 @@ -0,0 +1,2 @@ +README +TODO diff -Nru /tmp/c4CGGJ1p26/cppopt-0.0.2/debian/libcppopt0c2.overrides /tmp/910MF5ToAm/cppopt-0.0.2/debian/libcppopt0c2.overrides --- /tmp/c4CGGJ1p26/cppopt-0.0.2/debian/libcppopt0c2.overrides 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/910MF5ToAm/cppopt-0.0.2/debian/libcppopt0c2.overrides 2005-06-03 20:11:11.504664316 +0200 @@ -0,0 +1 @@ +libcppopt0: postrm-calls-ldconfig diff -Nru /tmp/c4CGGJ1p26/cppopt-0.0.2/debian/libcppopt0_c2_patch.diff /tmp/910MF5ToAm/cppopt-0.0.2/debian/libcppopt0_c2_patch.diff --- /tmp/c4CGGJ1p26/cppopt-0.0.2/debian/libcppopt0_c2_patch.diff 2005-06-03 20:11:11.430677000 +0200 +++ /tmp/910MF5ToAm/cppopt-0.0.2/debian/libcppopt0_c2_patch.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,40 +0,0 @@ -diff -ur cppopt-0.0.2/debian/changelog cppopt-0.0.2.patched/debian/changelog ---- cppopt-0.0.2/debian/changelog 2005-05-31 11:16:10.000000000 +0200 -+++ cppopt-0.0.2.patched/debian/changelog 2005-05-31 12:57:53.213415047 +0200 -@@ -1,3 +1,9 @@ -+cppopt (0.0.2-3) breezy; urgency=low -+ -+ * unnamed to libcppopt0c2 -+ -+ -- Daniel Neuenschwander Tue, 31 May 2005 12:56:25 +0200 -+ - cppopt (0.0.2-3) unstable; urgency=low - - * Explicitly remove configure, config.h.in and Makefile.in in the clean -diff -ur cppopt-0.0.2/debian/control cppopt-0.0.2.patched/debian/control ---- cppopt-0.0.2/debian/control 2005-05-31 11:16:10.000000000 +0200 -+++ cppopt-0.0.2.patched/debian/control 2005-05-31 12:46:56.961916414 +0200 -@@ -8,7 +8,7 @@ - Package: libcppopt-dev - Section: libdevel - Architecture: any --Depends: libcppopt0 (= ${Source-Version}), libc6-dev -+Depends: libcppopt0c2 (= ${Source-Version}), libc6-dev - Description: C++ option parsing library header files - The cppopt library provides functions similar to those found in - getopt or libpopt, except that it makes use of STL maps and other C++ -@@ -17,7 +17,7 @@ - This package provides the header files and .so symlink required to - compile programs against libcppopt. - --Package: libcppopt0 -+Package: libcppopt0c2 - Section: libs - Architecture: any - Depends: ${shlibs:Depends} -Nur in cppopt-0.0.2.patched/debian: libcppopt0c2.dirs. -Nur in cppopt-0.0.2.patched/debian: libcppopt0c2.docs. -Nur in cppopt-0.0.2.patched/debian: libcppopt0c2.overrides. -Nur in cppopt-0.0.2/debian: libcppopt0.dirs. -Nur in cppopt-0.0.2/debian: libcppopt0.docs. -Nur in cppopt-0.0.2/debian: libcppopt0.overrides. diff -Nru /tmp/c4CGGJ1p26/cppopt-0.0.2/debian/patches/libcppopt0_c2_patch.diff /tmp/910MF5ToAm/cppopt-0.0.2/debian/patches/libcppopt0_c2_patch.diff --- /tmp/c4CGGJ1p26/cppopt-0.0.2/debian/patches/libcppopt0_c2_patch.diff 2005-06-03 20:11:11.430677000 +0200 +++ /tmp/910MF5ToAm/cppopt-0.0.2/debian/patches/libcppopt0_c2_patch.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,40 +0,0 @@ -diff -ur cppopt-0.0.2/debian/changelog cppopt-0.0.2.patched/debian/changelog ---- cppopt-0.0.2/debian/changelog 2005-05-31 11:16:10.000000000 +0200 -+++ cppopt-0.0.2.patched/debian/changelog 2005-05-31 12:57:53.213415047 +0200 -@@ -1,3 +1,9 @@ -+cppopt (0.0.2-3) breezy; urgency=low -+ -+ * unnamed to libcppopt0c2 -+ -+ -- Daniel Neuenschwander Tue, 31 May 2005 12:56:25 +0200 -+ - cppopt (0.0.2-3) unstable; urgency=low - - * Explicitly remove configure, config.h.in and Makefile.in in the clean -diff -ur cppopt-0.0.2/debian/control cppopt-0.0.2.patched/debian/control ---- cppopt-0.0.2/debian/control 2005-05-31 11:16:10.000000000 +0200 -+++ cppopt-0.0.2.patched/debian/control 2005-05-31 12:46:56.961916414 +0200 -@@ -8,7 +8,7 @@ - Package: libcppopt-dev - Section: libdevel - Architecture: any --Depends: libcppopt0 (= ${Source-Version}), libc6-dev -+Depends: libcppopt0c2 (= ${Source-Version}), libc6-dev - Description: C++ option parsing library header files - The cppopt library provides functions similar to those found in - getopt or libpopt, except that it makes use of STL maps and other C++ -@@ -17,7 +17,7 @@ - This package provides the header files and .so symlink required to - compile programs against libcppopt. - --Package: libcppopt0 -+Package: libcppopt0c2 - Section: libs - Architecture: any - Depends: ${shlibs:Depends} -Nur in cppopt-0.0.2.patched/debian: libcppopt0c2.dirs. -Nur in cppopt-0.0.2.patched/debian: libcppopt0c2.docs. -Nur in cppopt-0.0.2.patched/debian: libcppopt0c2.overrides. -Nur in cppopt-0.0.2/debian: libcppopt0.dirs. -Nur in cppopt-0.0.2/debian: libcppopt0.docs. -Nur in cppopt-0.0.2/debian: libcppopt0.overrides. diff -Nru /tmp/c4CGGJ1p26/cppopt-0.0.2/debian/rules /tmp/910MF5ToAm/cppopt-0.0.2/debian/rules --- /tmp/c4CGGJ1p26/cppopt-0.0.2/debian/rules 2005-06-03 20:11:11.430677000 +0200 +++ /tmp/910MF5ToAm/cppopt-0.0.2/debian/rules 2005-06-03 20:11:11.504664316 +0200 @@ -6,7 +6,7 @@ # shared library versions, option 1 version=0.0.2 -major=0 +major=0c2 # option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so #version=`ls src/.libs/lib*.so.* | \ # awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` @@ -15,22 +15,6 @@ CXXFLAGS='-O3' -patch: patch-stamp -patch-stamp: - dh_testdir - - patch -p1 < debian/patches/libcppopt0_c2_patch.diff - - touch patch-stamp - -unpatch: unpatch-stamp -unpatch-stamp: patch-stamp - dh_testdir - - patch -p1 < debian/patches/libcppopt0_c2_patch.diff - - rm -f patch-stamp - preconfigure: preconfigure-stamp preconfigure-stamp: dh_testdir @@ -82,7 +66,7 @@ dh_testdir dh_testroot # - # build libcppopt${major} package by moving files from libcppopt-dev + # build libcppopt0${major} package by moving files from libcppopt-dev # dh_movefiles --sourcedir=debian/libcppopt-dev -plibcppopt$(major) \ usr/lib/libcppopt.so.$(major) \ @@ -90,7 +74,7 @@ # dh_installdebconf dh_installdirs - cp debian/libcppopt0.overrides debian/libcppopt0/usr/share/lintian/overrides/libcppopt0 + cp debian/libcppopt0c2.overrides debian/libcppopt0c2/usr/share/lintian/overrides/libcppopt0c2 dh_installdocs dh_installexamples dh_installmenu