* debian/control: Updated to standards-version 3.5.8.

* debian/{dpkg,{-dev,-doc},dselect}.{prerm,postinst}, debian/rules: No
longer manage /usr/doc symlinks.

diff --git a/ChangeLog b/ChangeLog
index 756da178ea3971732e53c8e9bd104b3d8960efa4..cf07db6cd4cbaa525806f25bdc4f8949c5d7d777 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Apr 26 15:09:10 CDT 2003 Adam Heath <doogie@debian.org>
+
+  * debian/control: Updated to standards-version 3.5.8.
+  * debian/{dpkg,{-dev,-doc},dselect}.{prerm,postinst}, debian/rules: No
+    longer manage /usr/doc symlinks.
+
 Sat Apr 26 14:28:17 CDT 2003 Adam Heath <doogie@debian.org>
 
   * .cvsignore, po/.cvsignore: Added generated/symlinked files.

diff --git a/debian/changelog b/debian/changelog
index ff914aba3fbd3d1576801b1441caed4a8f1003e0..e2311fd039f61303a27e8a42958b8dfe86978216 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ dpkg (1.10.10) unstable; urgency=low
   * Modified to use autotools-dev.  Closes: #179656.
   * Add netbsd support.  Closes: #179658, #179659.
   * Support hypenated values in dpkg-architeture. Closes: #179661
-
+  * No longer managed the /usr/doc symlinks.
 
  -- Adam Heath <doogie@debian.org>  UNRELEASED
 

diff --git a/debian/control b/debian/control
index 770fb2c7244a08437e25617b86b6791e749fc966..1b6f026cf1ce0a1c9c96d734017f574ed38e69fa 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Dpkg Development <debian-dpkg@lists.debian.org>
 Uploaders: Wichert Akkerman <wakkerma@debian.org>, Adam Heath <doogie@debian.org>
 Origin: debian
 Bugs: debbugs://bugs.debian.org
-Standards-Version: 3.5.4
+Standards-Version: 3.5.8
 Build-Depends: debiandoc-sgml, sgmltools-lite, libncurses-dev, gettext (>= 0.10.36), zlib1g-dev (>= 1:1.1.3-19.1), autotools-dev
 Uploaders: Wichert Akkerman <wakkerma@debian.org>, Adam Heath <doogie@debian.org>
 

diff --git a/debian/dpkg-dev.postinst b/debian/dpkg-dev.postinst
deleted file mode 100755 (executable)
index 3414dca..0000000
--- a/debian/dpkg-dev.postinst
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /bin/sh
-
-if [ "$1" = configure ]; then
-    if [ -d /usr/doc -a ! -e /usr/doc/dpkg-dev -a -d /usr/share/doc/dpkg-dev ] ; then
-        ln -s ../share/doc/dpkg-dev /usr/doc/dpkg-dev
-    fi
-fi

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

diff --git a/debian/dpkg-doc.postinst b/debian/dpkg-doc.postinst
index ce458c45a17bcdf39efa2ca00704c41b1de62087..93f7d1b290b3510158c0a14cc0f2fd0b73cf13b0 100755 (executable)
--- a/debian/dpkg-doc.postinst
+++ b/debian/dpkg-doc.postinst
@@ -1,9 +1,6 @@
 #! /bin/sh
 
 if [ "$1" = configure ]; then
-    if [ -d /usr/doc -a ! -e /usr/doc/dpkg-doc -a -d /usr/share/doc/dpkg-doc ] ; then
-        ln -s ../share/doc/dpkg-doc /usr/doc/dpkg-doc
-    fi
     if command -v install-docs >/dev/null 2>&1; then
        echo -n "Registering DPKG documentation..."
        install-docs -i /usr/share/doc-base/dpkg-doc

diff --git a/debian/dpkg-doc.prerm b/debian/dpkg-doc.prerm
index fe9bbdded200310a3ed9a6a862c34ce357677aa7..7e71d0ba014184c444f614f4239fdd1846bfa077 100755 (executable)
--- a/debian/dpkg-doc.prerm
+++ b/debian/dpkg-doc.prerm
@@ -2,12 +2,6 @@
 
 set -e
 
-if [ "$1" = remove -o "$1" = "upgrade" ]; then
-    if [ -L /usr/doc/dpkg-doc ]; then
-        rm -f /usr/doc/dpkg-doc
-    fi
-fi
-
 case "$1" in
     remove|deconfigure|upgrade)
        if command -v install-docs >/dev/null 2>&1; then

diff --git a/debian/dpkg.postinst b/debian/dpkg.postinst
index f592fcf71542d12402314c97238b59235a6dcd03..b29de4725a1cd6a67ad404e2bbe9408957106be3 100755 (executable)
--- a/debian/dpkg.postinst
+++ b/debian/dpkg.postinst
@@ -19,10 +19,6 @@ EOF
 }
 
 if [ "x$1" = xconfigure ]; then
-       if [ -d /usr/doc -a ! -e /usr/doc/dpkg -a -d /usr/share/doc/dpkg ] ; then
-               ln -s ../share/doc/dpkg /usr/doc/dpkg
-       fi
-
        if [ -z "$2" -a ! -f /etc/dpkg/dpkg.cfg ] ; then
                cp /usr/share/doc/dpkg/dpkg.cfg /etc/dpkg
        fi
@@ -118,11 +114,6 @@ OK.
        esac
 fi
 
-if [ -d /usr/doc -a ! -e /usr/doc/dpkg -a -d /usr/share/doc/dpkg ] ; then
-       ln -s ../share/doc/dpkg /usr/doc/dpkg
-fi
-
-
 if [ -d /usr/info -a ! -L /usr/info -a ! -L /usr/info/dir ]; then              
        echo Moving /usr/info/dir to /usr/share/info/dir.
        mv /usr/info/dir /usr/share/info/dir

diff --git a/debian/dpkg.prerm b/debian/dpkg.prerm
index 81a2e139e6af321e8d17997394313de4335f5bda..c07e1d0e32cfd6127996330f5e3f4f7e45b3c033 100755 (executable)
--- a/debian/dpkg.prerm
+++ b/debian/dpkg.prerm
@@ -13,8 +13,3 @@ install-info --quiet --remove /usr/info/debian-guidelines
 install-info --quiet --remove /usr/info/guidelines
 install-info --quiet --remove /usr/info/debian-guidelines.info.gz
 install-info --quiet --remove /usr/info/guidelines.info.gz
-
-if [ -L /usr/doc/dpkg ]; then
-       rm -f /usr/doc/dpkg
-fi
-

diff --git a/debian/dselect.postinst b/debian/dselect.postinst
deleted file mode 100755 (executable)
index c9d6e51..0000000
--- a/debian/dselect.postinst
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /bin/sh
-
-if [ "$1" = configure ]; then
-    if [ -d /usr/doc -a ! -e /usr/doc/dselect -a -d /usr/share/doc/dselect ] ; then
-        ln -s ../share/doc/dselect /usr/doc/dselect
-    fi
-fi

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

diff --git a/debian/rules b/debian/rules
index f002a77a2ce7d597081605c5da2a9ada8652d4cb..6cb8a60bfce45a9c7d535f96b1831d3456b01d00 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -231,8 +231,6 @@ binary-dpkg-dev: stamp-binary
 # Final package creation
        install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/DEBIAN
        install -p -m 644 -o root -g root debian/dpkg-dev.conffiles $(TMP_DPKG_DEV)/DEBIAN/conffiles
-       install -p -m 755 -o root -g root debian/dpkg-dev.prerm $(TMP_DPKG_DEV)/DEBIAN/prerm
-       install -p -m 755 -o root -g root debian/dpkg-dev.postinst $(TMP_DPKG_DEV)/DEBIAN/postinst
 
        $(GENCONTROL) -Tdebian/dpkg-dev.substvars -pdpkg-dev -P$(TMP_DPKG_DEV)
        dpkg --build $(TMP_DPKG_DEV) ..
@@ -280,9 +278,6 @@ binary-dselect: stamp-binary
 # Final package creation
        install -d -m 755 -o root -g root $(TMP_DSELECT)/DEBIAN
        install -p -m 644 -o root -g root debian/dselect.conffiles $(TMP_DSELECT)/DEBIAN/conffiles
-       install -p -m 644 -o root -g root debian/dselect.conffiles $(TMP_DSELECT)/DEBIAN/prerm
-       install -p -m 755 -o root -g root debian/dselect.prerm $(TMP_DSELECT)/DEBIAN/prerm
-       install -p -m 755 -o root -g root debian/dselect.postinst $(TMP_DSELECT)/DEBIAN/postinst
 
        dpkg-shlibdeps -Tdebian/dselect.substvars \
                $(TMP_DSELECT)/usr/bin/dselect