[mutt] 01/02: neomutt-devel/drop-neomutt-syntax.patch: remove neomutt-syntax.vim otherwise the package does not build.

[Antonio Radici]

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

antonio pushed a commit to branch master
in repository mutt.

commit 87520d6a3a58fbf4b31cafe4e816070607e9eece
Author: Antonio Radici <antonio at debian.org>
Date:   Sun Sep 25 09:37:25 2016 +0100

    neomutt-devel/drop-neomutt-syntax.patch: remove neomutt-syntax.vim otherwise the package does not build.
---
 debian/changelog                                   |  2 +
 .../neomutt-devel/drop-neomutt-syntax.patch        | 48 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 51 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b94b7c7..2bfa7a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ mutt (1.7.0-6) UNRELEASED; urgency=medium
     + added a note about $attribution_locale and the removal of $locale,
       introduced with the latest Neomutt version (Closes: 414828).
   * debian/patches:
+    + neomutt-devel/drop-neomutt-syntax.patch: remove neomutt-syntax.vim
+      otherwise the package does not build.
     + debian-specific/Muttrc.patch: add three more headers to mailto_allow
       (Closes: 834765).
 
diff --git a/debian/patches/neomutt-devel/drop-neomutt-syntax.patch b/debian/patches/neomutt-devel/drop-neomutt-syntax.patch
new file mode 100644
index 0000000..7bf22de
--- /dev/null
+++ b/debian/patches/neomutt-devel/drop-neomutt-syntax.patch
@@ -0,0 +1,48 @@
+Drop neomutt-syntax.vim otherwise the package does not build.
+
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -34,7 +34,7 @@
+ 	makedoc.c makedoc-defs.h 	\
+ 	mutt.css mutt.xsl html.xsl chunk.xsl \
+ 	$(BUILT_DISTFILES) $(SAMPLE_MUTTRC) $(SAMPLE_VIMRC) \
+-	mutt-1.7.0-syntax.vim neomutt-syntax.vim
++	mutt-1.7.0-syntax.vim
+ 
+ SAMPLE_MUTTRC = muttrc.attach-headers-color muttrc.compress muttrc.cond-date \
+ 	muttrc.encrypt-to-self muttrc.forgotten-attachment muttrc.ifdef \
+@@ -65,7 +65,7 @@
+ 
+ all: makedoc-all
+ 
+-makedoc-all: mutt.1 smime_keys.1 muttrc.man manual.html stamp-doc-rc stamp-doc-chunked manual.txt pgpewrap.1 pgpring.1 neomutt-syntax.vim
++makedoc-all: mutt.1 smime_keys.1 muttrc.man manual.html stamp-doc-rc stamp-doc-chunked manual.txt pgpewrap.1 pgpring.1
+ 
+ install-data-local: makedoc-all instdoc
+ 	$(MKDIR_P) $(DESTDIR)$(mandir)/man1
+@@ -102,7 +102,6 @@
+ 	elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ] ; then \
+ 		$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir) ; \
+ 	fi
+-	-$(INSTALL) -m 644 neomutt-syntax.vim $(DESTDIR)$(docdir)
+ 
+ uninstall-local:
+ 	for f in mutt.1 mutt_dotlock.1 smime_keys.1 pgpewrap.1 pgpring.1; do \
+@@ -122,7 +121,6 @@
+ 	  fi ; \
+ 	  rm $(DESTDIR)$(sysconfdir)/$${i}.dist ; \
+ 	done
+-	rm -f $(DESTDIR)$(docdir)/neomutt-syntax.vim
+ 
+ check:
+ manual.txt: manual.html
+@@ -156,9 +154,6 @@
+ 	  openjade -t tex -D $(DSLROOT) -d print/docbook.dsl dtds/decls/xml.dcl manual.xml; \
+ 	fi
+ 
+-neomutt-syntax.vim: $(SAMPLE_VIMRC)
+-	cat mutt-1.7.0-syntax.vim $^ > $@
+-
+ validate: stamp-doc-xml
+ 	xmllint --noout --noblanks --postvalid manual.xml
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3ee3c48..9328419 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 neomutt-20160916.patch
+neomutt-devel/drop-neomutt-syntax.patch
 neomutt-devel/837601-do-not-segfault-on-new-mails.patch
 neomutt-devel/832971-reset-xlabel.patch
 debian-specific/Muttrc.patch

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