merge NMU from Branden Robinson

diff --git a/debian/changelog b/debian/changelog
index cfb2cfae9e7ec5e5da1a27e04b928e69b561b3f6..d3552be40d5fe036e62da73fe6e67b1a8284f5e3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+comedilib (0.7.16-1.1) unstable; urgency=low
+
+  * NMU
+  * debian/control: bumped Standards-Version
+  * debian/ex.doc-base.package: removed dh_make template file
+  * debian/libcomedi0.postinst:
+    - don't try to create device files if they already exist
+    - don't use absolute path to ldconfig
+  * debian/libcomedi0.postrm: new; run ldconfig on remove, per Policy
+  * debian/libcomedi0.shlibs: refer to shared library package's real name
+    and use a legal version number (Closes: #118057)
+
+ -- Branden Robinson <branden@debian.org>  Fri,  2 Nov 2001 14:37:34 -0500
+
 comedilib (0.7.16-1) unstable; urgency=low
 
   * Upstream version change
@@ -45,7 +59,3 @@ comedilib (0.7.9-1) unstable; urgency=low
   * Initial Release.
 
  -- David Schleef <ds@stm.lbl.gov>  Tue, 28 Mar 2000 11:44:42 -0800
-
-Local variables:
-mode: debian-changelog
-End:

diff --git a/debian/control b/debian/control
index 8356c8c9213509373fb9384258e38b79574f68f6..8e42450d860caa19f99e87cc6dd88cd2db17be48 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: David Schleef <ds@schleef.org>
 Build-Depends: debhelper
-Standards-Version: 3.5.2
+Standards-Version: 3.5.6
 
 Package: libcomedi-dev
 Section: devel

diff --git a/debian/libcomedi0.postinst b/debian/libcomedi0.postinst
index 9f74fcb4b705401e90f57363b5a07c1c6ef92126..40d76b4a840acc3b9be42dc9d59be2f8b2179ebb 100644 (file)
--- a/debian/libcomedi0.postinst
+++ b/debian/libcomedi0.postinst
@@ -1,16 +1,19 @@
 #!/bin/sh
 
-if [ "$1" = "configure" ]; then
-       /sbin/ldconfig
-fi
-
 # Policy says that the user should be asked before we do this.
 for i in 0 1 2 3
 do
-       mknod /dev/comedi$i c 98 $i
-       chown root.root /dev/comedi$i
-       chmod 666 /dev/comedi$i
+       if [ ! -e /dev/comedi$i ]; then
+               mknod /dev/comedi$i c 98 $i
+               chown root.root /dev/comedi$i
+               chmod 666 /dev/comedi$i
+       fi
 done
 
 #DEBHELPER#
 
+if [ "$1" = "configure" ]; then
+       ldconfig
+fi
+
+exit 0

diff --git a/debian/libcomedi0.postrm b/debian/libcomedi0.postrm
new file mode 100644 (file)
index 0000000..e801838
--- /dev/null
+++ b/debian/libcomedi0.postrm
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+#DEBHELPER#
+
+if [ "$1" = "remove" ]; then
+       ldconfig
+fi
+
+exit 0

diff --git a/debian/libcomedi0.shlibs b/debian/libcomedi0.shlibs
index 2f5138aead1a6f4c2645b456b5e4ba5e1f562492..4f46acf7c12347c9941027d0fa4e4305c2e11794 100644 (file)
--- a/debian/libcomedi0.shlibs
+++ b/debian/libcomedi0.shlibs
@@ -1 +1 @@
-libcomedi 0.7.12 comedilib (>> 0.7.12-0)
+libcomedi 0 libcomedi0 (>> 0.7.16)