X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/4988a192dab00d86203bd44995b53284abfa1474..92469c2db947a16e6290589c4b71809ee46eabc8:/debian/rules?ds=inline

diff --git a/debian/rules b/debian/rules
index f685c0c..b7c71cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,9 @@ confflags  = 	--prefix=/usr			\
 		--enable-debug			\
 		--enable-fcntl			\
 		--enable-hcache			\
+		--enable-gpgme			\
 		--enable-imap			\
+		--enable-smtp			\
 		--enable-inodesort		\
 		--enable-pop			\
 						\
@@ -93,7 +95,7 @@ $(objdir)/configure-stamp:
 	env LC_COLLATE=C sort PATCHES.unsorted >PATCHES
 	
 	# do not rebuild these files
-	touch configure.in aclocal.m4 Makefile.in configure stamp-h.in config.h.in
+	touch configure.in aclocal.m4 Makefile.in configure config.h.in
 	
 	-mkdir $(objdir)
 	cd $(objdir) && \
@@ -109,7 +111,7 @@ $(objdir)/configure-stamp:
 build: $(objdir)/build-stamp
 $(objdir)/build-stamp: $(objdir)/configure-stamp
 	cd $(objdir) && \
-	$(MAKE)
+	$(MAKE) CFLAGS="$(CFLAGS)"
 	
 	touch $@
 
@@ -125,6 +127,7 @@ clean:
 	# quilt cruft
 	rm -f   patches
 	rm -rf .pc
+	touch PATCHES
 	
 	# please dpkg-source
 	rm -f po/*.gmo
@@ -144,20 +147,21 @@ debian/tmp/install-stamp:
 	dh_clean
 	cd $(objdir) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	
-	rm -rf debian/tmp/usr/share/doc/samples/iconv
-	rm -rf debian/tmp/usr/share/doc/samples/ca-bundle.crt
+	cd debian/tmp/usr/share/doc; \
+	rm -rf samples/iconv samples/ca-bundle.crt; \
+	mv NEWS NEWS.old; \
+	mv ChangeLog.old changelog.old; \
+	cp $(CURDIR)/UPDATING NEWS
 	
 	chmod +x debian/extra/lib/*
 	chmod +x debian/header.awk
 	debian/header.awk debian/patches/features/* >debian/tmp/README.Patches
 	
-	cp $(objdir)/Muttrc.head debian/tmp/Muttrc
-	echo "# GnuPG configuration" >>debian/tmp/Muttrc
-	grep '^set' contrib/gpg.rc \
-		| sed -e 's#pgpewrap#/usr/lib/mutt/pgpewrap#' \
-		| sed -e 's#/usr/bin/gpg#gpg#' \
-		>> debian/tmp/Muttrc
-	cat debian/extra/rc/* >>debian/tmp/Muttrc
+	( cat $(objdir)/Muttrc.head; \
+	  echo "# GnuPG configuration"; \
+	  grep '^set' contrib/gpg.rc; \
+	  echo; \
+	  cat debian/extra/rc/* ) > debian/tmp/Muttrc
 	
 	touch $@
 
@@ -169,9 +173,9 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 	
+	dh_installdirs
 	dh_install
 	dh_installman
-	dh_installmime
 	dh_installmenu
 	dh_installdocs
 	dh_installexamples