On Tue, Jul 26, 2005 at 04:05:34PM +0200, Lionel Elie Mamane wrote:
> Due to the gravity of this bug (and it blocking my uploading a
> package I want to adopt <grin>), I have NMU'd isdnutils with a fix
> for this bug.
Forgot to attach the patch. Here it is.
--
Lionel
--- isdnutils-3.7.2005-07-09/debian/libcapi20-2.postrm
+++ isdnutils-3.7.2005-07-09.orig/debian/libcapi20-2.postrm
@@ -1,14 +0,0 @@
-#! /bin/sh
-# postrm script for libcapi20-3
-
-set -e
-
-case "$1" in
- remove)
- ldconfig
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff -u isdnutils-3.7.2005-07-09/debian/changelog
isdnutils-3.7.2005-07-09/debian/changelog
--- isdnutils-3.7.2005-07-09/debian/changelog
+++ isdnutils-3.7.2005-07-09/debian/changelog
@@ -1,3 +1,10 @@
+isdnutils (1:3.7.2005-07-09-1.1) unstable; urgency=low
+
+ * Non-maintainer upload
+ * Complete transition from libcapi20-2 to libcapi20-3 (closes: #318808)
+
+ -- Lionel Elie Mamane <[EMAIL PROTECTED]> Fri, 22 Jul 2005 17:38:29 +0200
+
isdnutils (1:3.7.2005-07-09-1) unstable; urgency=low
* New upstream version.
diff -u isdnutils-3.7.2005-07-09/debian/po/fr.po
isdnutils-3.7.2005-07-09/debian/po/fr.po
--- isdnutils-3.7.2005-07-09/debian/libcapi20-2.shlibs
+++ isdnutils-3.7.2005-07-09.orig/debian/libcapi20-2.shlibs
@@ -1 +0,0 @@
-libcapi20 3 libcapi20-3
diff -u isdnutils-3.7.2005-07-09/debian/rules
isdnutils-3.7.2005-07-09/debian/rules
--- isdnutils-3.7.2005-07-09/debian/rules
+++ isdnutils-3.7.2005-07-09/debian/rules
@@ -292,8 +292,8 @@
install -m 644 debian/pppdcapiplugin.lintian-overrides
debian/pppdcapiplugin/usr/share/lintian/overrides/pppdcapiplugin
# - there's no -dev package, so shut up about the shlib symlink
# - No, I don't call ldconfig in an unsafe manner
- install -d debian/libcapi20-2/usr/share/lintian/overrides
- install -m 644 debian/libcapi20-2.lintian-overrides
debian/libcapi20-2/usr/share/lintian/overrides/libcapi20-2
+ install -d debian/libcapi20-3/usr/share/lintian/overrides
+ install -m 644 debian/libcapi20-3.lintian-overrides
debian/libcapi20-3/usr/share/lintian/overrides/libcapi20-3
# - not much chance of more processed with the name "vboxgetty", and
start-stop-daemon won't work
# - db_input in postinst only in extreme situations
install -d debian/isdnvboxserver/usr/share/lintian/overrides
@@ -305,7 +305,7 @@
dh_installchangelogs
rm -rf debian/libcapi20-dev/usr/share/doc/libcapi20-dev
- ln -s libcapi20-2 debian/libcapi20-dev/usr/share/doc/libcapi20-dev
+ ln -s libcapi20-3 debian/libcapi20-dev/usr/share/doc/libcapi20-dev
dh_strip
dh_link
dh_compress
@@ -313,14 +313,14 @@
dh_installdeb
# dh_makeshlibs
# dh_perl
- dh_shlibdeps -L libcapi20-2 -l debian/libcapi20-2/usr/lib
+ dh_shlibdeps -L libcapi20-3 -l debian/libcapi20-3/usr/lib
for i in debian/*/DEBIAN/conffiles; do \
[ -f $$i ] || continue; \
sort -u $$i > $$i.sorted; mv $$i.sorted $$i; \
done
dh_gencontrol
## # dont build isdnvboxclient on all architectures.
-## for pkg in isdnutils isdnutils-xtools ipppd isdnlog isdnvbox
isdnvboxserver libcapi20-2 isdnactivecards pppdcapiplugin isdneurofile; do \
+## for pkg in isdnutils isdnutils-xtools ipppd isdnlog isdnvbox
isdnvboxserver libcapi20-3 isdnactivecards pppdcapiplugin isdneurofile; do \
## dpkg-gencontrol -ldebian/changelog -isp -p$pkg
-Tdebian/$pkg.substvars -Pdebian/$pkg; \
## done
## case $(DEB_HOST_ARCH) in \
reverted:
--- isdnutils-3.7.2005-07-09/debian/libcapi20-2.dirs
+++ isdnutils-3.7.2005-07-09.orig/debian/libcapi20-2.dirs
@@ -1,3 +0,0 @@
-usr/share/doc/libcapi20-3
-usr/lib
-usr/include
reverted:
--- isdnutils-3.7.2005-07-09/debian/libcapi20-2.files
+++ isdnutils-3.7.2005-07-09.orig/debian/libcapi20-2.files
@@ -1 +0,0 @@
-usr/lib/libcapi20.so.*
reverted:
--- isdnutils-3.7.2005-07-09/debian/libcapi20-2.lintian-overrides
+++ isdnutils-3.7.2005-07-09.orig/debian/libcapi20-2.lintian-overrides
@@ -1,3 +0,0 @@
-libcapi20-3: non-dev-pkg-with-shlib-symlink usr/lib/libcapi20.so.3
usr/lib/libcapi20.so
-libcapi20-3: postinst-unsafe-ldconfig
-libcapi20-3: postrm-unsafe-ldconfig
reverted:
--- isdnutils-3.7.2005-07-09/debian/libcapi20-2.postinst
+++ isdnutils-3.7.2005-07-09.orig/debian/libcapi20-2.postinst
@@ -1,22 +0,0 @@
-#! /bin/sh
-# postinst script for libcapi20-3
-
-set -e
-
-case "$1" in
- configure)
- ldconfig
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 0
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
reverted:
---
isdnutils-3.7.2005-07-09/debian/libcapi20-2/usr/share/lintian/overrides/libcapi20-2
+++
isdnutils-3.7.2005-07-09.orig/debian/libcapi20-2/usr/share/lintian/overrides/libcapi20-2
@@ -1,3 +0,0 @@
-libcapi20-3: non-dev-pkg-with-shlib-symlink usr/lib/libcapi20.so.3
usr/lib/libcapi20.so
-libcapi20-3: postinst-unsafe-ldconfig
-libcapi20-3: postrm-unsafe-ldconfig
only in patch2:
unchanged:
--- isdnutils-3.7.2005-07-09.orig/debian/libcapi20-3.shlibs
+++ isdnutils-3.7.2005-07-09/debian/libcapi20-3.shlibs
@@ -0,0 +1 @@
+libcapi20 3 libcapi20-3
only in patch2:
unchanged:
--- isdnutils-3.7.2005-07-09.orig/debian/libcapi20-3.dirs
+++ isdnutils-3.7.2005-07-09/debian/libcapi20-3.dirs
@@ -0,0 +1,3 @@
+usr/share/doc/libcapi20-3
+usr/lib
+usr/include
only in patch2:
unchanged:
--- isdnutils-3.7.2005-07-09.orig/debian/libcapi20-3.files
+++ isdnutils-3.7.2005-07-09/debian/libcapi20-3.files
@@ -0,0 +1 @@
+usr/lib/libcapi20.so.*
only in patch2:
unchanged:
--- isdnutils-3.7.2005-07-09.orig/debian/libcapi20-3.postinst
+++ isdnutils-3.7.2005-07-09/debian/libcapi20-3.postinst
@@ -0,0 +1,22 @@
+#! /bin/sh
+# postinst script for libcapi20-3
+
+set -e
+
+case "$1" in
+ configure)
+ ldconfig
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 0
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
only in patch2:
unchanged:
--- isdnutils-3.7.2005-07-09.orig/debian/libcapi20-3.postrm
+++ isdnutils-3.7.2005-07-09/debian/libcapi20-3.postrm
@@ -0,0 +1,14 @@
+#! /bin/sh
+# postrm script for libcapi20-3
+
+set -e
+
+case "$1" in
+ remove)
+ ldconfig
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
only in patch2:
unchanged:
--- isdnutils-3.7.2005-07-09.orig/debian/libcapi20-3.lintian-overrides
+++ isdnutils-3.7.2005-07-09/debian/libcapi20-3.lintian-overrides
@@ -0,0 +1,3 @@
+libcapi20-3: non-dev-pkg-with-shlib-symlink usr/lib/libcapi20.so.3
usr/lib/libcapi20.so
+libcapi20-3: postinst-unsafe-ldconfig
+libcapi20-3: postrm-unsafe-ldconfig
--- isdnutils-3.7.2005-07-09.deb/debian/control 2005-07-26 16:42:38.758813502
+0200
+++ isdnutils-3.7.2005-07-09.lio/debian/control 2005-07-26 16:41:35.413589734
+0200
@@ -4,7 +4,7 @@
Maintainer: Paul Slootman <[EMAIL PROTECTED]>
Uploaders: Paul Slootman <[EMAIL PROTECTED]>, Matthias Klose <[EMAIL
PROTECTED]>
Standards-Version: 3.6.1
-Build-Depends: debhelper (>=4.1.16), bzip2, libncurses5-dev | libncurses-dev,
xlibs-dev, tcl8.3-dev, linuxdoc-tools (>=0.9.20), groff, libtool, xutils,
libxaw7-dev, libreadline5-dev | libreadline-dev, libpcap-dev, autotools-dev,
automake1.4, automake1.6, autoconf2.13, autoconf, libssl-dev, psutils
+Build-Depends: debhelper (>=4.1.16), bzip2, libncurses5-dev | libncurses-dev,
xlibs-dev, tcl8.3-dev, linuxdoc-tools (>=0.9.20), groff, libtool, xutils,
libxaw7-dev, libreadline5-dev | libreadline-dev, libpcap-dev, autotools-dev,
automake1.4, automake1.6, autoconf2.13, autoconf, libssl-dev, psutils,
linux-kernel-headers (>> 2.6.12.0-1)
Package: isdnutils
Priority: optional