[mutt] 06/16: Remove quilt.mk and manual quilt invocations

[Faidon Liambotis]

This is an automated email from the git hooks/post-receive script.

paravoid pushed a commit to branch experimental
in repository mutt.

commit 643f27944ad774802afabc0ecd5c8fe6a1ff48cc
Author: Faidon Liambotis <paravoid at debian.org>
Date:   Sun Jul 3 23:35:42 2016 +0300

    Remove quilt.mk and manual quilt invocations
    
    Rely on the native 3.0 (quilt) source package format instead for
    applying debian/patches.
---
 debian/changelog |  2 ++
 debian/control   |  2 +-
 debian/rules     | 11 +++--------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index abe6526..d192b53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ mutt (1.6.1-2) UNRELEASED; urgency=medium
     - Add Breaks/Replaces: mutt-patched on the mutt binary package.
     - Remove mutt-patched rules from debian/rules.
     - Move multiple-fcc (the only remaining patch) under features/.
+  * Remove quilt.mk and manual quilt invocations. Rely on the native 3.0
+    (quilt) source package format instead for applying debian/patches.
 
  -- Faidon Liambotis <paravoid at debian.org>  Sun, 03 Jul 2016 22:32:37 +0200
 
diff --git a/debian/control b/debian/control
index ab21b36..3b72173 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Christoph Berg <myon at debian.org>,
 Build-Depends: automake, debhelper (>= 9), autotools-dev,
  docbook-xml, docbook-xsl, w3m, gawk, gettext, libgnutls28-dev,
  libgpgme11-dev, libidn11-dev, libkrb5-dev, libncurses5-dev, libncursesw5-dev,
- libsasl2-dev, libtool, pkg-config, quilt, xsltproc, zlib1g-dev,
+ libsasl2-dev, libtool, pkg-config, xsltproc, zlib1g-dev,
  libtokyocabinet-dev [!hurd-i386], libgdbm-dev [hurd-i386]
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-mutt/mutt.git
diff --git a/debian/rules b/debian/rules
index a6506c7..43bb450 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,5 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
-QUILT = QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt --quiltrc /dev/null
-
 ###################### user serviceable parts ######################
 
 # header cache backend
@@ -84,14 +81,12 @@ objdir = $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)
 ###################### main ######################
 
 build build-arch: $(objdir)/build-stamp
-$(objdir)/build-stamp: $(QUILT_STAMPFN)
+$(objdir)/build-stamp:
 	dh_testdir
 	dh_clean
 	dh_autotools-dev_updateconfig
 	
 	###################### building mutt ######################
-	$(QUILT) applied > PATCHES
-	
 	autoreconf --install --include=m4
 	-mkdir $(objdir)
 	cd $(objdir) && \
@@ -163,7 +158,7 @@ binary binary-arch: install
 build-indep binary-indep:
 	@echo "Nothing to do."
 
-clean: unpatch
+clean:
 	###################### clean ######################
 	dh_testdir
 	dh_testroot
@@ -181,4 +176,4 @@ clean: unpatch
 	
 	dh_clean
 
-.PHONY: configure build build-arch build-indep clean install binary binary-arch binary-indep patch
+.PHONY: configure build build-arch build-indep clean install binary binary-arch binary-indep

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mutt/mutt.git