X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/16ab2f99e95d8ad7fe3298848a15f7f6247c4844..844ccbc0e22f5a4829c875e3cc0daa898d22a54f:/debian/rules?ds=inline

diff --git a/debian/rules b/debian/rules
index 84363f3..1b5641f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ include /usr/share/quilt/quilt.make
 
 ###
 # build a separate mutt-patched package?
-#BUILD_PATCHED := yes -- disabled until there is a sidebar patch for 1.5.19
+BUILD_PATCHED := yes
 ###
 # header cache backend
 # HCACHE_DB := bdb
@@ -14,7 +14,7 @@ HCACHE_DB := gdbm
 # HCACHE_DB := qdbm
 ###
 # GPGME backend
-# GPGME := --enable-gpgme
+GPGME := --enable-gpgme
 ###
 
 ###################### variables ######################
@@ -26,13 +26,13 @@ endif
 # Configure arguments
 
 ifeq ($(HCACHE_DB),bdb)
-    hcache_db := --without-gdbm --without-qdbm
+    hcache_db := --without-gdbm --without-qdbm --without-tokyocabinet
 endif
 ifeq ($(HCACHE_DB),gdbm)
-    hcache_db := --without-qdbm --without-bdb
+    hcache_db := --without-qdbm --without-bdb --without-tokyocabinet
 endif
 ifeq ($(HCACHE_DB),qdbm)
-    hcache_db := --without-gdbm --without-bdb
+    hcache_db := --without-gdbm --without-bdb --without-tokyocabinet
 endif
 
 confflags =	--prefix=/usr			\
@@ -126,13 +126,12 @@ install: build
 	###################### install ######################
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	cd $(objdir) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	
 	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/*