IMAP: only close socket when not already disconnected (Closes: 493719)

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

diff --git a/debian/rules b/debian/rules
index 2b4aa78340c68048f26b9d6c18853c7cfbd64f8b..ff10811f77d9a71976dce43de0b90b5e8674e883 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,11 @@
 
 include /usr/share/quilt/quilt.make
 
 
 include /usr/share/quilt/quilt.make
 

+###################### user serviceable parts ######################
+
+###
+# build a separate mutt-patched package?
+BUILD_PATCHED := yes

 ###
 # header cache backend
 # HCACHE_DB := bdb
 ###
 # header cache backend
 # HCACHE_DB := bdb


@@ -12,16 +17,22 @@ HCACHE_DB := gdbm
 # GPGME := --enable-gpgme
 ###
 
 # GPGME := --enable-gpgme
 ###
 

+###################### variables ######################
+
+ifneq ($(BUILD_PATCHED),yes)
+export DH_OPTIONS := -Nmutt-patched
+endif
+

 # Configure arguments
 
 ifeq ($(HCACHE_DB),bdb)
 # 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)
 endif
 ifeq ($(HCACHE_DB),gdbm)

-    hcache_db := --without-qdbm --without-bdb
+    hcache_db := --without-qdbm --without-bdb --without-tokyocabinet

 endif
 ifeq ($(HCACHE_DB),qdbm)
 endif
 ifeq ($(HCACHE_DB),qdbm)

-    hcache_db := --without-gdbm --without-bdb
+    hcache_db := --without-gdbm --without-bdb --without-tokyocabinet

 endif
 
 confflags =    --prefix=/usr                   \
 endif
 
 confflags =    --prefix=/usr                   \


@@ -45,6 +56,7 @@ confflags =   --prefix=/usr                   \
                                                \
                --with-curses                   \
                --with-gnutls                   \
                                                \
                --with-curses                   \
                --with-gnutls                   \

+               --with-gss                      \

                --with-idn                      \
                --with-mixmaster                \
                --with-sasl                     \
                --with-idn                      \
                --with-mixmaster                \
                --with-sasl                     \


@@ -71,13 +83,16 @@ endif
 # Directory to make the build on
 objdir = $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)
 
 # Directory to make the build on
 objdir = $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)
 

+###################### main ######################
+

 $(objdir)-patched/build-stamp: $(QUILT_STAMPFN)
        dh_testdir
        dh_clean
 $(objdir)-patched/build-stamp: $(QUILT_STAMPFN)
        dh_testdir
        dh_clean

+       -mkdir $(objdir)-patched

        
        

+ifeq ($(BUILD_PATCHED),yes)

        ###################### building mutt-patched ######################
        autoreconf --install --include=m4
        ###################### building mutt-patched ######################
        autoreconf --install --include=m4

-       -mkdir $(objdir)-patched

        cd $(objdir)-patched && \
        env CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
        ../configure $(confflags)
        cd $(objdir)-patched && \
        env CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
        ../configure $(confflags)


@@ -86,6 +101,7 @@ $(objdir)-patched/build-stamp: $(QUILT_STAMPFN)
        
        # we should just "make mutt" here, but that doesn't work yet
        cd $(objdir)-patched && $(MAKE) CFLAGS="$(CFLAGS)"
        
        # we should just "make mutt" here, but that doesn't work yet
        cd $(objdir)-patched && $(MAKE) CFLAGS="$(CFLAGS)"

+endif

        
        touch $@
 
        
        touch $@
 


@@ -110,13 +126,12 @@ install: build
        ###################### install ######################
        dh_testdir
        dh_testroot
        ###################### 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 && \
        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/*
        cp $(CURDIR)/UPDATING NEWS
        
        chmod +x debian/extra/lib/*


@@ -131,8 +146,10 @@ install: build
          grep '^set' contrib/gpg.rc; \
          echo ) > debian/tmp/gpg.rc
        
          grep '^set' contrib/gpg.rc; \
          echo ) > debian/tmp/gpg.rc
        

+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
        # 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

        
        # reportbug driver
        dh_installdirs
        
        # reportbug driver
        dh_installdirs


@@ -144,6 +161,7 @@ binary binary-arch: install
        dh_install
        dh_installman
        dh_installmenu
        dh_install
        dh_installman
        dh_installmenu

+       dh_installmime

        dh_installdocs
        dh_installexamples
        dh_installchangelogs ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installchangelogs ChangeLog


@@ -152,7 +170,9 @@ 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
        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