X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/qmail/blobdiff_plain/9312c29dd4ff4591809c01f71361d8cfe92db67c..refs/heads/debian:/debian/rules

diff --git a/debian/rules b/debian/rules
old mode 100644
new mode 100755
index e8193f3..30fd481
--- 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,7 +25,7 @@ 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 \
@@ -37,7 +37,7 @@ binary-arch: checkroot build
 		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
+	./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)
@@ -54,25 +54,28 @@ 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
+	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-1.diff.gz \
+		 ../qmail_1.03-1.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
+	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