diff options
author | Tobias Hansen <tobias.han@gmx.de> | 2012-08-12 16:42:23 +0200 |
---|---|---|
committer | Andreas Beckmann <debian@abeckmann.de> | 2012-10-01 21:50:18 +0200 |
commit | 1cf1c6ded274f9213730642ed4cd2d0bfb8c56a0 (patch) | |
tree | 260dca69ea30095ae9af13d3fb4570e15b6c6931 | |
parent | e37189a9715dc8ae97216d220e7c77deb8607629 (diff) | |
download | sendmail-1cf1c6ded274f9213730642ed4cd2d0bfb8c56a0.tar.gz |
undo /usr/share/doc/$PACKAGE -> /usr/share/doc/sendmail symlinks
Directories in /usr/share/doc can only be symlinks for packages
depending on the package they link to. (Policy 12.5)
This source package builds six sets of packages that can all be
installed independently (libmilter1.0.1, rmail, sendmail-base,
sendmail-cf, sendmail-doc, sensible-mda and respective dependencies).
So using symlinks at all is not practicable.
Attached is a debdiff that makes all /usr/share/doc/package directories
real directories with the mandatory files (they were already shipped in
all packages, so there were files in /usr/share/doc/sendmail that were
overwritten by each package). Additional documentation is put into
/usr/share/doc/sendmail-doc and libmilter gets its own README.Debian
into /usr/share/doc/libmilter-dev.
Note that 'debian/rules configure' is called during build and rewrites
a lot of stuff in debian/. I don't know why all the generated files that
are rewritten anyway are present in the package, but this minimal patch
only changes the sources of the maintainer scripts.
http://bugs.debian.org/681147
-rw-r--r-- | debian/Debian-specific | 5 | ||||
-rw-r--r-- | debian/README.Debian.libmilter-dev | 2 | ||||
-rw-r--r-- | debian/build/debian/libmilter-dev.postrm.in | 53 | ||||
-rw-r--r-- | debian/build/debian/libmilter-dev.preinst.in | 26 | ||||
-rw-r--r-- | debian/build/debian/libmilter.postrm.in | 53 | ||||
-rw-r--r-- | debian/build/debian/libmilter.preinst.in | 26 | ||||
-rw-r--r-- | debian/build/debian/rmail.postrm.in | 53 | ||||
-rw-r--r-- | debian/build/debian/rmail.preinst.in | 26 | ||||
-rw-r--r-- | debian/build/debian/sendmail-base.postrm.in | 1 | ||||
-rw-r--r-- | debian/build/debian/sendmail-base.preinst.in | 28 | ||||
-rw-r--r-- | debian/build/debian/sendmail-bin.dirs.in | 2 | ||||
-rw-r--r-- | debian/build/debian/sendmail-cf.postrm.in | 4 | ||||
-rw-r--r-- | debian/build/debian/sendmail-cf.preinst.in | 26 | ||||
-rw-r--r-- | debian/build/debian/sendmail-doc.postrm.in | 53 | ||||
-rw-r--r-- | debian/build/debian/sendmail-doc.preinst.in | 26 | ||||
-rw-r--r-- | debian/build/debian/sensible-mda.postrm.in | 53 | ||||
-rw-r--r-- | debian/build/debian/sensible-mda.preinst.in | 26 | ||||
-rw-r--r-- | debian/changelog | 13 | ||||
-rwxr-xr-x | debian/rules | 2 |
19 files changed, 55 insertions, 423 deletions
diff --git a/debian/Debian-specific b/debian/Debian-specific index 7692165..baaea92 100644 --- a/debian/Debian-specific +++ b/debian/Debian-specific @@ -1,5 +1,6 @@ -Please take a gander at /usr/share/doc/sendmail/sendmail/README.Debian.gz - -it has a quick overview of important matters. +Please take a gander at /usr/share/doc/sendmail-doc/sendmail/README.Debian.gz +(for which you need to install sendmail-doc) + - it has a quick overview of important matters. Changes: Items that cause a functional difference in the way sendmail works. diff --git a/debian/README.Debian.libmilter-dev b/debian/README.Debian.libmilter-dev index f621a7c..698f508 100644 --- a/debian/README.Debian.libmilter-dev +++ b/debian/README.Debian.libmilter-dev @@ -9,7 +9,7 @@ guaranteed - but things have been working well, and the usenet/mailing list (comp.mail.sendmail) does help if you have questions/problems. Everything you'll need to create a milter filter is contained in -/usr/share/doc/sendmail (for which you need to install sendmail-doc): +/usr/share/doc/sendmail-doc (for which you need to install sendmail-doc): - libmilter/README Document on build/install/config for milter NOTE: see updated make in milter directory diff --git a/debian/build/debian/libmilter-dev.postrm.in b/debian/build/debian/libmilter-dev.postrm.in deleted file mode 100644 index 121fa31..0000000 --- a/debian/build/debian/libmilter-dev.postrm.in +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -e -# -# Debian post removal script -# -# Install of already installed package: -# 1) Upgrade of package: -# new-preinst upgrade old-version -# *) new-postrm abort-upgrade old-version -# 2) package had some configuration files from a previous version installed -# new-preinst install old-version -# *) new-postrm abort-install old-version -# 3) Otherwise (i.e., the package was completely purged) -# new-preinst install -# *) new-postrm abort-install -# -# Removal of a package: -# 1) prerm remove -# 2) The package's files are removed (except conffiles). -# 3) postrm remove -# 4) All the maintainer scripts except the postrm are removed. -# 5) The conffiles and any backup files -# (~-files, #*# files, %-files, .dpkg-{old,new,tmp}, etc.) are removed. -# 6) postrm purge -# 7) The package's file list is removed -# -set -e; - -PACKAGE=libmilter-dev; - -case "$1" in - remove) - # /usr/share/doc/$PACKAGE is a symlink to /usr/share/doc/sendmail - rm -f @docdir@/$PACKAGE 2>/dev/null || true; - rmdir @docdir@/sendmail 2>/dev/null || true; - ;; - - purge) - ;; - - upgrade) - ;; - - failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "$PACKAGE postrm called with unknown argument \`$1'" >&2; - exit 1; - ;; - esac; - -#DEBHELPER# -exit 0; diff --git a/debian/build/debian/libmilter-dev.preinst.in b/debian/build/debian/libmilter-dev.preinst.in index 0ba2a7f..7bd69a2 100644 --- a/debian/build/debian/libmilter-dev.preinst.in +++ b/debian/build/debian/libmilter-dev.preinst.in @@ -18,31 +18,15 @@ set -e; PACKAGE=libmilter-dev; case "$1" in - install) - # DPKG doesn't overwrite directories with symlinks... - if [ -d @docdir@/$PACKAGE ]; then - rm -rf @docdir@/$PACKAGE; - fi; - if [ ! -d @docdir@/sendmail ]; then - mkdir -p @docdir@/sendmail; - chmod a+rx @docdir@/sendmail; - fi; - ln -sf sendmail @docdir@/$PACKAGE; - ;; - upgrade) - # DPKG doesn't overwrite directories with symlinks... - if [ -d @docdir@/$PACKAGE ]; then - rm -rf @docdir@/$PACKAGE; - fi; - if [ ! -d @docdir@/sendmail ]; then - mkdir -p @docdir@/sendmail; - chmod a+rx @docdir@/sendmail; + if dpkg --compare-versions "$2" le "8.14.4-2.1"; then + # /usr/share/doc/$PACKAGE is a symlink to /usr/share/doc/sendmail + rm -f @docdir@/$PACKAGE 2>/dev/null || true; + rmdir @docdir@/sendmail 2>/dev/null || true; fi; - ln -sf sendmail @docdir@/$PACKAGE; ;; - abort-upgrade) + install|abort-upgrade) ;; *) diff --git a/debian/build/debian/libmilter.postrm.in b/debian/build/debian/libmilter.postrm.in deleted file mode 100644 index a671fc2..0000000 --- a/debian/build/debian/libmilter.postrm.in +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -e -# -# Debian post removal script -# -# Install of already installed package: -# 1) Upgrade of package: -# new-preinst upgrade old-version -# *) new-postrm abort-upgrade old-version -# 2) package had some configuration files from a previous version installed -# new-preinst install old-version -# *) new-postrm abort-install old-version -# 3) Otherwise (i.e., the package was completely purged) -# new-preinst install -# *) new-postrm abort-install -# -# Removal of a package: -# 1) prerm remove -# 2) The package's files are removed (except conffiles). -# 3) postrm remove -# 4) All the maintainer scripts except the postrm are removed. -# 5) The conffiles and any backup files -# (~-files, #*# files, %-files, .dpkg-{old,new,tmp}, etc.) are removed. -# 6) postrm purge -# 7) The package's file list is removed -# -set -e; - -PACKAGE=libmilter@sm_libmilter_version@; - -case "$1" in - remove) - # /usr/share/doc/$PACKAGE is a symlink to /usr/share/doc/sendmail - rm -f @docdir@/$PACKAGE 2>/dev/null || true; - rmdir @docdir@/sendmail 2>/dev/null || true; - ;; - - purge) - ;; - - upgrade) - ;; - - failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "$PACKAGE postrm called with unknown argument \`$1'" >&2; - exit 1; - ;; - esac; - -#DEBHELPER# -exit 0; diff --git a/debian/build/debian/libmilter.preinst.in b/debian/build/debian/libmilter.preinst.in index ba1380c..0193b69 100644 --- a/debian/build/debian/libmilter.preinst.in +++ b/debian/build/debian/libmilter.preinst.in @@ -18,31 +18,15 @@ set -e; PACKAGE=libmilter@sm_libmilter_version@; case "$1" in - install) - # DPKG doesn't overwrite directories with symlinks... - if [ -d @docdir@/$PACKAGE ]; then - rm -rf @docdir@/$PACKAGE; - fi; - if [ ! -d @docdir@/sendmail ]; then - mkdir -p @docdir@/sendmail; - chmod a+rx @docdir@/sendmail; - fi; - ln -sf sendmail @docdir@/$PACKAGE; - ;; - upgrade) - # DPKG doesn't overwrite directories with symlinks... - if [ -d @docdir@/$PACKAGE ]; then - rm -rf @docdir@/$PACKAGE; - fi; - if [ ! -d @docdir@/sendmail ]; then - mkdir -p @docdir@/sendmail; - chmod a+rx @docdir@/sendmail; + if dpkg --compare-versions "$2" le "8.14.4-2.1"; then + # /usr/share/doc/$PACKAGE is a symlink to /usr/share/doc/sendmail + rm -f @docdir@/$PACKAGE 2>/dev/null || true; + rmdir @docdir@/sendmail 2>/dev/null || true; fi; - ln -sf sendmail @docdir@/$PACKAGE; ;; - abort-upgrade) + install|abort-upgrade) ;; *) diff --git a/debian/build/debian/rmail.postrm.in b/debian/build/debian/rmail.postrm.in deleted file mode 100644 index 3f19cd0..0000000 --- a/debian/build/debian/rmail.postrm.in +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -e -# -# Debian post removal script -# -# Install of already installed package: -# 1) Upgrade of package: -# new-preinst upgrade old-version -# *) new-postrm abort-upgrade old-version -# 2) package had some configuration files from a previous version installed -# new-preinst install old-version -# *) new-postrm abort-install old-version -# 3) Otherwise (i.e., the package was completely purged) -# new-preinst install -# *) new-postrm abort-install -# -# Removal of a package: -# 1) prerm remove -# 2) The package's files are removed (except conffiles). -# 3) postrm remove -# 4) All the maintainer scripts except the postrm are removed. -# 5) The conffiles and any backup files -# (~-files, #*# files, %-files, .dpkg-{old,new,tmp}, etc.) are removed. -# 6) postrm purge -# 7) The package's file list is removed -# -set -e; - -PACKAGE=rmail; - -case "$1" in - remove) - # /usr/share/doc/$PACKAGE is a symlink to /usr/share/doc/sendmail - rm -f @docdir@/$PACKAGE 2>/dev/null || true; - rmdir @docdir@/sendmail 2>/dev/null || true; - ;; - - purge) - ;; - - upgrade) - ;; - - failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "$PACKAGE postrm called with unknown argument \`$1'" >&2; - exit 1; - ;; - esac; - -#DEBHELPER# -exit 0; diff --git a/debian/build/debian/rmail.preinst.in b/debian/build/debian/rmail.preinst.in index 017889d..0105083 100644 --- a/debian/build/debian/rmail.preinst.in +++ b/debian/build/debian/rmail.preinst.in @@ -18,31 +18,15 @@ set -e; PACKAGE=rmail; case "$1" in - install) - # DPKG doesn't overwrite directories with symlinks... - if [ -d @docdir@/$PACKAGE ]; then - rm -rf @docdir@/$PACKAGE; - fi; - if [ ! -d @docdir@/sendmail ]; then - mkdir -p @docdir@/sendmail; - chmod a+rx @docdir@/sendmail; - fi; - ln -sf sendmail @docdir@/$PACKAGE; - ;; - upgrade) - # DPKG doesn't overwrite directories with symlinks... - if [ -d @docdir@/$PACKAGE ]; then - rm -rf @docdir@/$PACKAGE; - fi; - if [ ! -d @docdir@/sendmail ]; then - mkdir -p @docdir@/sendmail; - chmod a+rx @docdir@/sendmail; + if dpkg --compare-versions "$2" le "8.14.4-2.1"; then + # /usr/share/doc/$PACKAGE is a symlink to /usr/share/doc/sendmail + rm -f @docdir@/$PACKAGE 2>/dev/null || true; + rmdir @docdir@/sendmail 2>/dev/null || true; fi; - ln -sf sendmail @docdir@/$PACKAGE; ;; - abort-upgrade) + install|abort-upgrade) ;; *) diff --git a/debian/build/debian/sendmail-base.postrm.in b/debian/build/debian/sendmail-base.postrm.in index 414c950..5a68568 100644 --- a/debian/build/debian/sendmail-base.postrm.in +++ b/debian/build/debian/sendmail-base.postrm.in @@ -90,7 +90,6 @@ case "$1" in ; rmdir @sysconfdir@/mail/peers 2>/dev/null || true; rmdir @sysconfdir@/mail 2>/dev/null || true; - rmdir @docdir@/sendmail 2>/dev/null || true; ;; diff --git a/debian/build/debian/sendmail-base.preinst.in b/debian/build/debian/sendmail-base.preinst.in index 576313b..4570039 100644 --- a/debian/build/debian/sendmail-base.preinst.in +++ b/debian/build/debian/sendmail-base.preinst.in @@ -18,29 +18,13 @@ set -e; PACKAGE=sendmail-base; case "$1" in - install) - # DPKG doesn't overwrite directories with symlinks... - rm -rf @docdir@/sendmail/examples 2>/dev/null || true; - if [ -d @docdir@/$PACKAGE ]; then - rm -rf @docdir@/$PACKAGE; - fi; - if [ ! -d @docdir@/sendmail ]; then - mkdir -p @docdir@/sendmail; - chmod a+rx @docdir@/sendmail; - fi; - ln -sf sendmail @docdir@/$PACKAGE; - ;; - upgrade) - # DPKG doesn't overwrite directories with symlinks... - if [ -d @docdir@/$PACKAGE ]; then - rm -rf @docdir@/$PACKAGE; - fi; - if [ ! -d @docdir@/sendmail ]; then - mkdir -p @docdir@/sendmail; - chmod a+rx @docdir@/sendmail; + if dpkg --compare-versions "$2" le "8.14.4-2.1"; then + # /usr/share/doc/$PACKAGE is a symlink to /usr/share/doc/sendmail + rm -f @docdir@/$PACKAGE 2>/dev/null || true; + rm -rf @docdir@/sendmail/examples 2>/dev/null || true; + rmdir @docdir@/sendmail 2>/dev/null || true; fi; - ln -sf sendmail @docdir@/$PACKAGE; # Prevent cronjob from running during upgrade... if [ -f @sysconfdir@/cron.d/sendmail ]; then @@ -53,7 +37,7 @@ case "$1" in fi; ;; - abort-upgrade) + install|abort-upgrade) ;; *) diff --git a/debian/build/debian/sendmail-bin.dirs.in b/debian/build/debian/sendmail-bin.dirs.in index f486b05..41098e0 100644 --- a/debian/build/debian/sendmail-bin.dirs.in +++ b/debian/build/debian/sendmail-bin.dirs.in @@ -4,7 +4,7 @@ .@bindir@ .@sbindir@ .@libexecdir@ -.@docdir@/sendmail +.@docdir@/sendmail-bin .@mandir@ .@mandir@/man1 .@mandir@/man5 diff --git a/debian/build/debian/sendmail-cf.postrm.in b/debian/build/debian/sendmail-cf.postrm.in index 5e963d4..606ec49 100644 --- a/debian/build/debian/sendmail-cf.postrm.in +++ b/debian/build/debian/sendmail-cf.postrm.in @@ -29,10 +29,6 @@ PACKAGE=sendmail-cf; case "$1" in remove) - # /usr/share/doc/$PACKAGE is a symlink to /usr/share/doc/sendmail - rm -f @docdir@/$PACKAGE 2>/dev/null || true; - rmdir @docdir@/sendmail 2>/dev/null || true; - # Make sure the data directory is *clean* rm -rf @datadir@/sendmail/cf ;; diff --git a/debian/build/debian/sendmail-cf.preinst.in b/debian/build/debian/sendmail-cf.preinst.in index d80d6d6..e151cd0 100644 --- a/debian/build/debian/sendmail-cf.preinst.in +++ b/debian/build/debian/sendmail-cf.preinst.in @@ -18,31 +18,15 @@ set -e; PACKAGE=sendmail-cf; case "$1" in - install) - # DPKG doesn't overwrite directories with symlinks... - if [ -d @docdir@/$PACKAGE ]; then - rm -rf @docdir@/$PACKAGE; - fi; - if [ ! -d @docdir@/sendmail ]; then - mkdir -p @docdir@/sendmail; - chmod a+rx @docdir@/sendmail; - fi; - ln -sf sendmail @docdir@/$PACKAGE; - ;; - upgrade) - # DPKG doesn't overwrite directories with symlinks... - if [ -d @docdir@/$PACKAGE ]; then - rm -rf @docdir@/$PACKAGE; - fi; - if [ ! -d @docdir@/sendmail ]; then - mkdir -p @docdir@/sendmail; - chmod a+rx @docdir@/sendmail; + if dpkg --compare-versions "$2" le "8.14.4-2.1"; then + # /usr/share/doc/$PACKAGE is a symlink to /usr/share/doc/sendmail + rm -f @docdir@/$PACKAGE 2>/dev/null || true; + rmdir @docdir@/sendmail 2>/dev/null || true; fi; - ln -sf sendmail @docdir@/$PACKAGE; ;; - abort-upgrade) + install|abort-upgrade) ;; *) diff --git a/debian/build/debian/sendmail-doc.postrm.in b/debian/build/debian/sendmail-doc.postrm.in deleted file mode 100644 index 5a66b10..0000000 --- a/debian/build/debian/sendmail-doc.postrm.in +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -e -# -# Debian post removal script -# -# Install of already installed package: -# 1) Upgrade of package: -# new-preinst upgrade old-version -# *) new-postrm abort-upgrade old-version -# 2) package had some configuration files from a previous version installed -# new-preinst install old-version -# *) new-postrm abort-install old-version -# 3) Otherwise (i.e., the package was completely purged) -# new-preinst install -# *) new-postrm abort-install -# -# Removal of a package: -# 1) prerm remove -# 2) The package's files are removed (except conffiles). -# 3) postrm remove -# 4) All the maintainer scripts except the postrm are removed. -# 5) The conffiles and any backup files -# (~-files, #*# files, %-files, .dpkg-{old,new,tmp}, etc.) are removed. -# 6) postrm purge -# 7) The package's file list is removed -# -set -e; - -PACKAGE=sendmail-doc; - -case "$1" in - remove) - # /usr/share/doc/$PACKAGE is a symlink to /usr/share/doc/sendmail - rm -f @docdir@/$PACKAGE 2>/dev/null || true; - rmdir @docdir@/sendmail 2>/dev/null || true; - ;; - - purge) - ;; - - upgrade) - ;; - - failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "$PACKAGE postrm called with unknown argument \`$1'" >&2; - exit 1; - ;; - esac; - -#DEBHELPER# -exit 0; diff --git a/debian/build/debian/sendmail-doc.preinst.in b/debian/build/debian/sendmail-doc.preinst.in index 071f1e5..12860e9 100644 --- a/debian/build/debian/sendmail-doc.preinst.in +++ b/debian/build/debian/sendmail-doc.preinst.in @@ -18,31 +18,15 @@ set -e; PACKAGE=sendmail-doc; case "$1" in - install) - # DPKG doesn't overwrite directories with symlinks... - if [ -d @docdir@/$PACKAGE ]; then - rm -rf @docdir@/$PACKAGE; - fi; - if [ ! -d @docdir@/sendmail ]; then - mkdir -p @docdir@/sendmail; - chmod a+rx @docdir@/sendmail; - fi; - ln -sf sendmail @docdir@/$PACKAGE; - ;; - upgrade) - # DPKG doesn't overwrite directories with symlinks... - if [ -d @docdir@/$PACKAGE ]; then - rm -rf @docdir@/$PACKAGE; - fi; - if [ ! -d @docdir@/sendmail ]; then - mkdir -p @docdir@/sendmail; - chmod a+rx @docdir@/sendmail; + if dpkg --compare-versions "$2" le "8.14.4-2.1"; then + # /usr/share/doc/$PACKAGE is a symlink to /usr/share/doc/sendmail + rm -f @docdir@/$PACKAGE 2>/dev/null || true; + rmdir @docdir@/sendmail 2>/dev/null || true; fi; - ln -sf sendmail @docdir@/$PACKAGE; ;; - abort-upgrade) + install|abort-upgrade) ;; *) diff --git a/debian/build/debian/sensible-mda.postrm.in b/debian/build/debian/sensible-mda.postrm.in deleted file mode 100644 index b447bfd..0000000 --- a/debian/build/debian/sensible-mda.postrm.in +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -e -# -# Debian post removal script -# -# Install of already installed package: -# 1) Upgrade of package: -# new-preinst upgrade old-version -# *) new-postrm abort-upgrade old-version -# 2) package had some configuration files from a previous version installed -# new-preinst install old-version -# *) new-postrm abort-install old-version -# 3) Otherwise (i.e., the package was completely purged) -# new-preinst install -# *) new-postrm abort-install -# -# Removal of a package: -# 1) prerm remove -# 2) The package's files are removed (except conffiles). -# 3) postrm remove -# 4) All the maintainer scripts except the postrm are removed. -# 5) The conffiles and any backup files -# (~-files, #*# files, %-files, .dpkg-{old,new,tmp}, etc.) are removed. -# 6) postrm purge -# 7) The package's file list is removed -# -set -e; - -PACKAGE=sensible-mda; - -case "$1" in - remove) - # /usr/share/doc/$PACKAGE is a symlink to /usr/share/doc/sendmail - rm -f @docdir@/$PACKAGE 2>/dev/null || true; - rmdir @docdir@/sendmail 2>/dev/null || true; - ;; - - purge) - ;; - - upgrade) - ;; - - failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "$PACKAGE postrm called with unknown argument \`$1'" >&2; - exit 1; - ;; - esac; - -#DEBHELPER# -exit 0; diff --git a/debian/build/debian/sensible-mda.preinst.in b/debian/build/debian/sensible-mda.preinst.in index e54cd20..700792b 100644 --- a/debian/build/debian/sensible-mda.preinst.in +++ b/debian/build/debian/sensible-mda.preinst.in @@ -18,31 +18,15 @@ set -e; PACKAGE=sensible-mda; case "$1" in - install) - # DPKG doesn't overwrite directories with symlinks... - if [ -d @docdir@/$PACKAGE ]; then - rm -rf @docdir@/$PACKAGE; - fi; - if [ ! -d @docdir@/sendmail ]; then - mkdir -p @docdir@/sendmail; - chmod a+rx @docdir@/sendmail; - fi; - ln -sf sendmail @docdir@/$PACKAGE; - ;; - upgrade) - # DPKG doesn't overwrite directories with symlinks... - if [ -d @docdir@/$PACKAGE ]; then - rm -rf @docdir@/$PACKAGE; - fi; - if [ ! -d @docdir@/sendmail ]; then - mkdir -p @docdir@/sendmail; - chmod a+rx @docdir@/sendmail; + if dpkg --compare-versions "$2" le "8.14.4-2.1"; then + # /usr/share/doc/$PACKAGE is a symlink to /usr/share/doc/sendmail + rm -f @docdir@/$PACKAGE 2>/dev/null || true; + rmdir @docdir@/sendmail 2>/dev/null || true; fi; - ln -sf sendmail @docdir@/$PACKAGE; ;; - abort-upgrade) + install|abort-upgrade) ;; *) diff --git a/debian/changelog b/debian/changelog index ca64740..c22252d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,19 @@ sendmail (8.14.4-2.2) UNRELEASED; urgency=low * Non-maintainer upload. + [ Tobias Hansen ] + * Directories in /usr/share/doc can only be symlinks for packages + depending on the package they link to. (Policy 12.5) + This source package builds six sets of packages that can all be + installed independently (libmilter1.0.1, rmail, sendmail-base, + sendmail-cf, sendmail-doc, sensible-mda and respective dependencies). + So using symlinks at all is not practicable. + Make all /usr/share/doc/package directories real directories and + ship mandatory files (they were already shipped in all packages). + Put additional documentation into /usr/share/doc/sendmail-doc + and libmilters README.Debian into /usr/share/doc/libmilter-dev. + Closes: #681147 + [ Andreas Beckmann ] * debian/rules clean: Run maintainer-clean and stop shipping a lot of generated files in debian/ in the source package. Do not preserve diff --git a/debian/rules b/debian/rules index 233aa9b..a9ec661 100755 --- a/debian/rules +++ b/debian/rules @@ -382,7 +382,7 @@ common-install-indep:: # libmilter-dev package if [ -d ${DEB_SRCDIR}/libmilter ]; then \ $(INSTALL_DATA) debian/README.Debian.libmilter-dev \ - ${PKG_DOC}/libmilter/README.Debian; \ + debian/libmilter-dev${docdir}/libmilter-dev/README.Debian; \ $(INSTALL_DATA) ${DEB_SRCDIR}/libmilter/README \ ${PKG_DOC}/libmilter/README; \ cp -a ${DEB_SRCDIR}/libmilter/docs/* \ |