Explorar o código

* debian/control: Updated to standards-version 3.5.8.
* debian/{dpkg,{-dev,-doc},dselect}.{prerm,postinst}, debian/rules: No
longer manage /usr/doc symlinks.

Adam Heath %!s(int64=23) %!d(string=hai) anos
pai
achega
d3dd48bdb4

+ 6 - 0
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.

+ 1 - 1
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
 

+ 1 - 1
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>
 

+ 0 - 7
debian/dpkg-dev.postinst

@@ -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

+ 0 - 10
debian/dpkg-dev.prerm

@@ -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
-

+ 0 - 3
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

+ 0 - 6
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

+ 0 - 9
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

+ 0 - 5
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
-

+ 0 - 7
debian/dselect.postinst

@@ -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

+ 0 - 10
debian/dselect.prerm

@@ -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
-

+ 0 - 5
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