X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/228ef588576668a0ae8d0d2d89ad9ab672b35282..84c25006839a4c849ec0cb1a2c8b9c34eb37f690:/debian/rules

diff --git a/debian/rules b/debian/rules
index e6f6744..4dc943c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/quilt/quilt.make
+QUILT = QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt --quiltrc /dev/null
 
 ###################### user serviceable parts ######################
 
@@ -37,6 +38,9 @@ ifeq ($(HCACHE_DB),qdbm)
 endif
 ifeq ($(HCACHE_DB),tokyocabinet)
     hcache_db := --without-gdbm --without-bdb --without-qdbm
+    ifeq ($(shell dpkg --print-architecture),hurd-i386)
+	hcache_db := --without-bdb --without-qdbm
+    endif
 endif
 
 confflags =	--prefix=/usr			\
@@ -96,6 +100,7 @@ $(objdir)-patched/build-stamp: $(QUILT_STAMPFN)
 	
 ifeq ($(BUILD_PATCHED),yes)
 	###################### building mutt-patched ######################
+	$(QUILT) applied > PATCHES
 	autoreconf --install --include=m4
 	cd $(objdir)-patched && \
 	env CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
@@ -112,7 +117,8 @@ endif
 build build-arch: $(objdir)/build-stamp
 $(objdir)/build-stamp: $(objdir)-patched/build-stamp
 	###################### building mutt ######################
-	QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt --quiltrc /dev/null pop mutt.org
+	$(QUILT) pop mutt.org
+	$(QUILT) applied > PATCHES
 	
 	autoreconf --install --include=m4
 	-mkdir $(objdir)
@@ -150,8 +156,11 @@ install: build
 	  grep '^set' contrib/gpg.rc; \
 	  echo ) > debian/tmp/gpg.rc
 	
+	dh_install
+	
+	# prepare files for update-alternatives
+	mv debian/mutt/usr/bin/mutt debian/mutt/usr/bin/mutt-org
 ifeq ($(BUILD_PATCHED),yes)
-	# temporarily call the binary mutt-patched so dh_strip gets the debug file name right
 	install -D $(objdir)-patched/mutt debian/mutt-patched/usr/bin/mutt-patched
 endif
 	
@@ -162,7 +171,6 @@ endif
 
 binary binary-arch: install
 	###################### binary ######################
-	dh_install
 	dh_installman
 	dh_installmenu
 	dh_installmime
@@ -174,9 +182,6 @@ binary binary-arch: install
 	dh_strip --dbg-package=mutt-dbg
 	rm -rf $(CURDIR)/debian/mutt-dbg/usr/share/doc/mutt-dbg \
 		$(CURDIR)/debian/mutt-patched/usr/share/doc/mutt-patched
-ifeq ($(BUILD_PATCHED),yes)
-	mv debian/mutt-patched/usr/bin/mutt-patched debian/mutt-patched/usr/bin/mutt
-endif
 	
 	dh_link
 	dh_compress --exclude usr/share/doc/mutt/README.Patches
@@ -197,7 +202,7 @@ clean: unpatch
 	
 	# please dpkg-source
 	rm -f po/*.gmo
-	touch PATCHES
+	echo -n > PATCHES
 	
 	# remove build trees
 	rm -rf $(objdir) $(objdir)-patched
@@ -206,9 +211,6 @@ clean: unpatch
 	rm -f configure config.h.in
 	rm -f Makefile.in contrib/Makefile.in imap/Makefile.in doc/Makefile.in m4/Makefile.in
 	
-	# clean PATCHES hunks (blame quilt refresh)
-	for p in `grep -rl PATCHES debian/patches` ; do perl -wi debian/fix-PATCHES.pl $$p ; done
-	
 	dh_clean
 
 .PHONY: configure build build-arch build-indep clean install binary binary-arch binary-indep patch