From: Mark Wooding Date: Tue, 30 Sep 2003 08:13:28 +0000 (+0100) Subject: Make it work with newer Debian stuff. X-Git-Tag: mdw/1.03-4~1 X-Git-Url: https://git.distorted.org.uk/~mdw/qmail/commitdiff_plain/bcb3f3eb8800267d6f324a1bf1a8fb972c00054a Make it work with newer Debian stuff. --- diff --git a/debian/changelog b/debian/changelog index 354e9b3..721be9b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +qmail (1.03-4) non-free; urgency=low + + * twiddle build system for missed Debians. + + -- Mark Wooding Wed, 1 Oct 2003 01:16:00 +0100 + +qmail (1.03-3) non-free; urgency=low + + * fix uids for new standards. + + -- Mark Wooding Tue, 14 Oct 2000 08:37:50 +0100 + qmail (1.03-2) non-free; urgency=low * add message-id to bounces. diff --git a/debian/debianize-binary-tree b/debian/debianize-binary-tree index 72dbf6f..e3c062d 100644 --- a/debian/debianize-binary-tree +++ b/debian/debianize-binary-tree @@ -3,9 +3,9 @@ set -e function startofpath() { - if [ -f usr/man/man8/`basename $1`.8 ]; then + if [ -f usr/share/man/man8/`basename $1`.8 ]; then echo usr/sbin - elif [ -f usr/man/man1/`basename $1`.1 ]; then + elif [ -f usr/share/man/man1/`basename $1`.1 ]; then echo usr/bin else case `basename $1` in diff --git a/debian/postinst b/debian/postinst index 8014036..bb0db8b 100644 --- a/debian/postinst +++ b/debian/postinst @@ -53,5 +53,10 @@ EOT2 } } +-e "/usr/doc/qmail" or + symlink("../share/doc/qmail", "/usr/doc/qmail") or + die "symlink: $!"; + exit 0; +__END__ diff --git a/debian/preinst b/debian/preinst index bfacc91..92b0d71 100644 --- a/debian/preinst +++ b/debian/preinst @@ -163,16 +163,16 @@ if ( $action eq 'install' ) { } # Check for qmail uids and gids my $errors; - $errors++ unless check_gid('qmail', 70, ()); + $errors++ unless check_gid('qmail', 64010, ()); #$errors++ unless check_gid('nogroup', 65534, ()); - $errors++ unless check_uid('alias', 70, 65534, 'qmail alias', '/var/qmail/alias', '/bin/sh'); - $errors++ unless check_uid('qmaild', 71, 65534, 'qmail daemon', '/var/qmail', '/bin/sh'); - $errors++ unless check_uid('qmails', 72, 70, 'qmail send', '/var/qmail', '/bin/sh'); - $errors++ unless check_uid('qmailr', 73, 70, 'qmail remote', '/var/qmail', '/bin/sh'); - $errors++ unless check_uid('qmailq', 74, 70, 'qmail queue', '/var/qmail', '/bin/sh'); - $errors++ unless check_uid('qmaill', 75, 65534, 'qmail log', '/var/qmail', '/bin/sh'); - $errors++ unless check_uid('qmailp', 76, 65534, 'qmail pw', '/var/qmail', '/bin/sh'); + $errors++ unless check_uid('alias', 64010, 65534, 'qmail alias', '/var/qmail/alias', '/bin/sh'); + $errors++ unless check_uid('qmaild', 64011, 65534, 'qmail daemon', '/var/qmail', '/bin/sh'); + $errors++ unless check_uid('qmails', 64012, 64010, 'qmail send', '/var/qmail', '/bin/sh'); + $errors++ unless check_uid('qmailr', 64013, 64010, 'qmail remote', '/var/qmail', '/bin/sh'); + $errors++ unless check_uid('qmailq', 64015, 64010, 'qmail queue', '/var/qmail', '/bin/sh'); + $errors++ unless check_uid('qmaill', 64016, 65534, 'qmail log', '/var/qmail', '/bin/sh'); + $errors++ unless check_uid('qmailp', 64017, 65534, 'qmail pw', '/var/qmail', '/bin/sh'); #$errors++ unless check_uid('nobody', 65534, 65534, 'nobody', '/tmp', '/bin/sh'); if ( $errors ) { diff --git a/debian/prerm b/debian/prerm index fa2406e..44d0663 100644 --- a/debian/prerm +++ b/debian/prerm @@ -46,4 +46,8 @@ EOT exit $? if $?; } +unlink("/usr/doc/qmail"); + exit 0; + +__END__; diff --git a/debian/rules b/debian/rules index 1aa7998..95cb429 100755 --- a/debian/rules +++ b/debian/rules @@ -28,7 +28,7 @@ binary-arch: checkroot build -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 + 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. @@ -64,21 +64,21 @@ binary-arch: checkroot build # 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.03.orig.tar.gz ../qmail_1.03-2.diff.gz \ - ../qmail_1.03-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 + 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! diff --git a/debian/substvars b/debian/substvars deleted file mode 100644 index 81c50e2..0000000 --- a/debian/substvars +++ /dev/null @@ -1 +0,0 @@ -shlibs:Depends=libc6