Imported Debian patch 1.01b-12.3

diff --git a/debian/changelog b/debian/changelog
index fe17bd34c9812342c416b70f9ffd5639596f49d2..e3aeb3cb711c5cd19d096615ed8bdbd654d45141 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mmv (1.01b-12.3) unstable; urgency=low
+
+  * NMU
+  * Remove postinst and prerm, finishing /usr/doc transition. Closes: #322813
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 10 Jan 2006 00:54:51 -0500
+

 mmv (1.01b-12.2) unstable; urgency=low
 
   * NMU
 mmv (1.01b-12.2) unstable; urgency=low
 
   * NMU

diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644 (file)
index cb38ac8..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
-  if [ -d /usr/doc -a ! -e /usr/doc/mmv -a -d /usr/share/doc/mmv ]; then
-    ln -sf ../share/doc/mmv /usr/doc/mmv
-  fi
-fi

diff --git a/debian/prerm b/debian/prerm
deleted file mode 100644 (file)
index 206acd8..0000000
--- a/debian/prerm
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/mmv ]; then
-   rm -f /usr/doc/mmv
-fi

diff --git a/debian/rules b/debian/rules
index de490b25002e6b2f200e63f9c777a4027a5d1dc7..41a93bacb229ddf7f3fe334c128d7207ec0836b6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -73,8 +73,6 @@ binary-arch: build
        gzip -f9 debian/tmp/usr/share/doc/$(p)/*
        install -g root -m 644 -o root debian/copyright \
          debian/tmp/usr/share/doc/$(p)
        gzip -f9 debian/tmp/usr/share/doc/$(p)/*
        install -g root -m 644 -o root debian/copyright \
          debian/tmp/usr/share/doc/$(p)

-       install -g root -m 755 -o root debian/postinst debian/prerm \
-               debian/tmp/DEBIAN

        chmod -R g-sw debian/tmp/usr/share/doc/$(p)
        chown -R root.root debian/tmp/usr/share/doc/$(p)
        dpkg-shlibdeps debian/tmp/usr/bin/mmv
        chmod -R g-sw debian/tmp/usr/share/doc/$(p)
        chown -R root.root debian/tmp/usr/share/doc/$(p)
        dpkg-shlibdeps debian/tmp/usr/bin/mmv