Make it work with newer Debian stuff.

[qmail] / debian / rules

diff --git a/debian/rules b/debian/rules
old mode 100644 (file)
new mode 100755 (executable)
index e8193f3..95cb429
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ clean:
        -$(MAKE) clean
        -rm `find . -name "*~"`
        -rm -rf debian/files
-       -rm -rf `find debian/* -type d -prune`
+       -rm -rf `find debian/* ! \( -name CVS -prune \) -type d -prune`
 
 binary-indep: checkroot build
        $(checkdir)
@@ -25,10 +25,10 @@ binary-indep: checkroot build
 binary-arch: checkroot build
        $(checkdir)
        -rm -rf debian/files debian/substvars debian/tmp
-       -rm -rf `find debian/* -type d -prune`
+       -rm -rf `find ! \( -name CVS -prune \) debian/* -type d -prune`
 # Make the directory tree and copy qmail files.
        install -d debian/tmp/etc/init.d \
-               debian/tmp/usr/doc/qmail \
+               debian/tmp/usr/share/doc/qmail \
                debian/tmp/var/qmail \
                debian/tmp/var/spool \
                debian/tmp/usr/bin \
@@ -36,14 +36,14 @@ binary-arch: checkroot build
                debian/tmp/usr/lib \
                debian/qmail-src/usr/bin \
                debian/qmail-src/usr/src/qmail-src \
-               debian/qmail-src/usr/doc/qmail-src
-       ./qmail-hier | ./install debian/tmp/var/qmail
+               debian/qmail-src/usr/share/doc/qmail-src
+       ./install `pwd`/debian/tmp/var/qmail
        mv debian/tmp/var/qmail/queue debian/tmp/var/spool/qmail
        mv debian/tmp/var/qmail/control debian/tmp/etc/qmail
        (cd debian/tmp/var/qmail && ln -s /var/spool/qmail queue)
        (cd debian/tmp/var/qmail && ln -s /etc/qmail control)
-       mv debian/tmp/var/qmail/man debian/tmp/usr/man && \
-               rm -r debian/tmp/usr/man/cat?
+       mv debian/tmp/var/qmail/man debian/tmp/usr/share/man && \
+               rm -r debian/tmp/usr/share/man/cat?
 # Move /var/qmail/bin programs to either /usr/bin or /usr/sbin
        bash debian/debianize-binary-tree
 # Create /usr/lib/sendmail symlink for backward compatibility.
@@ -54,28 +54,31 @@ binary-arch: checkroot build
        install -o root -g root -m 755 ipmeprint debian/tmp/usr/sbin/qmailconfig-ipmeprint
        install -o root -g root -m 755 dnsptr debian/tmp/usr/sbin/qmailconfig-dnsptr
 # (This one is a bit of a kludge...)
-       sed -e 's|./hostname|hostname|g' \
-           -e 's|\./dnsptr|/usr/sbin/qmailconfig-dnsptr|g' \
-           -e 's|\./dnsip|/usr/sbin/qmailconfig-dnsip|g' \
-           -e 's|\./dnsfq|/usr/sbin/qmailconfig-dnsfq|g' \
-           -e 's|\./ipmeprint|/usr/sbin/qmailconfig-ipmeprint|g' \
-               qmail-config >debian/tmp/usr/sbin/qmailconfig
-       chmod 755 debian/tmp/usr/sbin/qmailconfig
+#   Appears to be defunct in 1.03
+#       sed -e 's|./hostname|hostname|g' \
+#           -e 's|\./dnsptr|/usr/sbin/qmailconfig-dnsptr|g' \
+#           -e 's|\./dnsip|/usr/sbin/qmailconfig-dnsip|g' \
+#           -e 's|\./dnsfq|/usr/sbin/qmailconfig-dnsfq|g' \
+#           -e 's|\./ipmeprint|/usr/sbin/qmailconfig-ipmeprint|g' \
+#               qmail-config >debian/tmp/usr/sbin/qmailconfig
+#       chmod 755 debian/tmp/usr/sbin/qmailconfig
 # Install /etc/init.d/qmail
        install -o root -g root -m 755 debian/qmail debian/tmp/etc/init.d/qmail
-# Copy /usr/doc/qmail files.
-       install -o root -g root -m 644 debian/changelog debian/tmp/usr/doc/qmail/changelog.Debian
+# Copy /usr/share/doc/qmail files.
+       install -o root -g root -m 644 debian/changelog debian/tmp/usr/share/doc/qmail/changelog.Debian
+       rm -rf debian/tmp/var/qmail/doc
 # do the stuff for qmail-src
-       cp ../qmail_1.01.orig.tar.gz ../qmail_1.01-2.diff.gz \
-                ../qmail_1.01-2.dsc debian/qmail-src/usr/src/qmail-src
+       cp ../qmail_1.03.orig.tar.gz ../qmail_1.03-4.diff.gz \
+                ../qmail_1.03-4.dsc debian/qmail-src/usr/src/qmail-src
        install -m 755 debian/build-qmail debian/qmail-src/usr/bin
-       install debian/copyright debian/qmail-src/usr/doc/qmail-src
-       install debian/qmail-src.README debian/qmail-src/usr/doc/qmail-src/README
-       debstd -m CHANGES BLURB* FAQ INTERNALS README RFC* \
-               SECURITY INSTALL.* SYSDEPS THANKS THOUGHTS TODO
+       install debian/copyright debian/qmail-src/usr/share/doc/qmail-src
+       install debian/qmail-src.README debian/qmail-src/usr/share/doc/qmail-src/README
+       debstd -m CHANGES BLURB* FAQ INTERNALS README \
+               SECURITY INSTALL.* PIC.* REMOVE.* SYSDEPS THANKS THOUGHTS \
+               TODO SENDMAIL TEST.* UPGRADE
 # Correct permissions of binaries and manpages...
        chmod go+rx debian/tmp/usr/*bin/*
-       chown -R root.root debian/tmp/usr/man
+       chown -R root.root debian/tmp/usr/share/man
 
        dpkg-gencontrol -pqmail
 # And finally, build the Debian package!