619216-gnutls-CN-validation.patch: fix the validation of the commonname in the gnutls...

[software/mutt-debian.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 7db0d8fc32a793c8e39635d935c2616f7344e85e..4dc943c94f646fb3a168377fd4a1647eeda3da59 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,9 @@ ifeq ($(HCACHE_DB),qdbm)
 endif
 ifeq ($(HCACHE_DB),tokyocabinet)
     hcache_db := --without-gdbm --without-bdb --without-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                   \
 endif
 
 confflags =    --prefix=/usr                   \


@@ -153,8 +156,11 @@ install: build
          grep '^set' contrib/gpg.rc; \
          echo ) > debian/tmp/gpg.rc
        
          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)
 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
        
        install -D $(objdir)-patched/mutt debian/mutt-patched/usr/bin/mutt-patched
 endif
        


@@ -165,7 +171,6 @@ endif
 
 binary binary-arch: install
        ###################### binary ######################
 
 binary binary-arch: install
        ###################### binary ######################

-       dh_install

        dh_installman
        dh_installmenu
        dh_installmime
        dh_installman
        dh_installmenu
        dh_installmime


@@ -177,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
        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
        
        dh_link
        dh_compress --exclude usr/share/doc/mutt/README.Patches