[mutt] 13/14: upstream/fix_doc_builddir.patch created, to source html files from the builddir.

Antonio Radici antonio at moszumanska.debian.org
Sat Jun 24 12:02:33 UTC 2017


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

antonio pushed a commit to branch master
in repository mutt.

commit 3bb6bed8607da2caafb6ad3550e9e7d66a022fab
Author: Antonio Radici <antonio at debian.org>
Date:   Sat Jun 24 12:04:07 2017 +0100

    upstream/fix_doc_builddir.patch created, to source html files from the builddir.
---
 debian/changelog                               |  2 ++
 debian/patches/series                          |  1 +
 debian/patches/upstream/fix_doc_builddir.patch | 16 ++++++++++++++++
 3 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 88c332c..e5b16ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ mutt (1.8.3+20170609-1) UNRELEASED; urgency=medium
     + upstream/611410-no-implicit_autoview-for-text-html.patch removed,
       already upstream.
     + upstream/644992-ipv6-literal.patch partially superseded by libidn.
+    + upstream/fix_doc_builddir.patch created, to source html files from the
+      builddir.
     + general patch refresh where applicable.
   * debian/control:
     + Standards-Version updated to 4.0.0, no changes required.
diff --git a/debian/patches/series b/debian/patches/series
index f73516a..25c00df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ upstream/771125-CVE-2014-9116-jessie.patch
 upstream/693993-manpage-corrections.patch
 upstream/749483-conststrings.patch
 upstream/644992-ipv6-literal.patch
+upstream/fix_doc_builddir.patch
diff --git a/debian/patches/upstream/fix_doc_builddir.patch b/debian/patches/upstream/fix_doc_builddir.patch
new file mode 100644
index 0000000..a6d820a
--- /dev/null
+++ b/debian/patches/upstream/fix_doc_builddir.patch
@@ -0,0 +1,16 @@
+html files are autogenreated, therefore they should be sourced from the builddir.
+
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -70,9 +70,9 @@
+ 	for f in $(srcdir_DOCFILES) ; do \
+ 		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
+ 	done
+-	-$(INSTALL) -m 644 $(srcdir)/manual.txt $(DESTDIR)$(docdir)
++	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
+ 	-for f in $(HTML_DOCFILES) ; do \
+-		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
++		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
+ 	done
+ 	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
+ 	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \

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



More information about the pkg-mutt-commits mailing list