[mutt] 11/11: Restore PATCHES before quilt push/pops

[Faidon Liambotis]

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

paravoid pushed a commit to branch wip-neomutt
in repository mutt.

commit 918b58d092ca99d8d6e1bf640b8e258cef1c17ba
Author: Faidon Liambotis <paravoid at debian.org>
Date:   Wed May 11 03:02:38 2016 +0300

    Restore PATCHES before quilt push/pops
    
    Our new neomutt patches modify PATCHES, which results in conflicts with
    our debian/rules code that also modifies it. Back PATCHES up and restore
    it before any quilt operations.
---
 debian/rules | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 7fc7c45..d04f2f0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -97,6 +97,7 @@ $(objdir)-patched/build-stamp: $(QUILT_STAMPFN)
 	
 ifeq ($(BUILD_PATCHED),yes)
 	###################### building mutt-patched ######################
+	mv PATCHES PATCHES.orig
 	$(QUILT) applied > PATCHES
 	autoreconf --install --include=m4
 	cd $(objdir)-patched && \
@@ -116,6 +117,7 @@ endif
 build build-arch: $(objdir)/build-stamp
 $(objdir)/build-stamp: $(objdir)-patched/build-stamp
 	###################### building mutt ######################
+	-mv PATCHES.orig PATCHES
 	$(QUILT) pop __separator__mutt.org.patch
 	$(QUILT) applied > PATCHES
 	
@@ -211,7 +213,7 @@ clean: unpatch
 	
 	# please dpkg-source
 	rm -f po/*.gmo
-	echo -n > PATCHES
+	-mv PATCHES.orig PATCHES
 	
 	# remove build trees
 	rm -rf $(objdir) $(objdir)-patched

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