[mutt] 05/16: Remove README.Patches from /usr/share/doc

Faidon Liambotis paravoid at moszumanska.debian.org
Mon Jul 4 15:51:48 UTC 2016


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

paravoid pushed a commit to branch experimental
in repository mutt.

commit d56682010496eb1ba5968841e972c9264043adce
Author: Faidon Liambotis <paravoid at debian.org>
Date:   Sun Jul 3 23:33:36 2016 +0300

    Remove README.Patches from /usr/share/doc
    
    Including a unified diff in /usr/share/doc isn't very useful; the source
    package can always be used instead.
---
 debian/changelog           |  3 +++
 debian/copyright           |  3 ---
 debian/extra/rc/sidebar.rc |  3 +--
 debian/header.awk          | 23 -----------------------
 debian/mutt.docs           |  1 -
 debian/rules               |  7 +------
 6 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 03f0357..abe6526 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ mutt (1.6.1-2) UNRELEASED; urgency=medium
     as it's too old (even wheezy shipped with 1.5.21-6.2).
   * Remove Conflicts/Replaces mutt-utf8, it was last shipped with version
     1.5.5.1-20040105+1, released over 12 years ago.
+  * Remove README.Patches from /usr/share/doc. Including a unified diff in
+    /usr/share/doc isn't very useful; the source package can always be used
+    instead.
   * Fold mutt-patched into mutt, as the line between the wo has became more
     blurry since its introduction. Upstream mutt has merged the sidebar and
     the Debian mutt binary package already carries a lot of feature patches.
diff --git a/debian/copyright b/debian/copyright
index 2feccaf..a573627 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -84,6 +84,3 @@ md5c.c:
     without express or implied warranty of any kind.
     These notices must be retained in any copies of any part of this
     documentation and/or software.
-
-The list of authors of the applied patches to this version of mutt can
-be found in `/usr/share/doc/mutt/README.Patches'.
diff --git a/debian/extra/rc/sidebar.rc b/debian/extra/rc/sidebar.rc
index b8ae716..fb7de56 100644
--- a/debian/extra/rc/sidebar.rc
+++ b/debian/extra/rc/sidebar.rc
@@ -1,5 +1,4 @@
-# Configuration for the sidebar patch.
-# See /usr/share/doc/mutt/README.Patches for documentation.
+# Configuration for the sidebar.
 
 ifdef sidebar_visible set sidebar_visible sidebar_width=20
 
diff --git a/debian/header.awk b/debian/header.awk
deleted file mode 100755
index 82cf656..0000000
--- a/debian/header.awk
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /usr/bin/gawk -f
-
-BEGIN {
-	sep = "============================================================================="
-}
-
-FILENAME ~ /debian$/ {
-	nextfile
-}
-
-/^== END PATCH$/ {
-	print ""
-	nextfile
-}
-
-FNR == 1 {
-	print FILENAME "\n" substr(sep, 0, length(FILENAME)) "\n"
-	next
-}
-
-{
-	print
-}
diff --git a/debian/mutt.docs b/debian/mutt.docs
index 36e3ede..f24764f 100644
--- a/debian/mutt.docs
+++ b/debian/mutt.docs
@@ -1,5 +1,4 @@
 debian/extra/README.SMIME
-debian/tmp/README.Patches
 debian/tmp/usr/share/doc/NEWS
 debian/tmp/usr/share/doc/NEWS.old
 debian/tmp/usr/share/doc/TODO
diff --git a/debian/rules b/debian/rules
index 8d061c1..a6506c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -117,11 +117,6 @@ install: build
 	cp $(CURDIR)/UPDATING NEWS
 	
 	chmod +x debian/extra/lib/*
-	chmod +x debian/header.awk
-	# Glob expansions are sorted in a locale-sensitive manner;
-	# set the locale to make the order reproducible.
-	(LC_ALL=C; export LC_ALL; debian/header.awk debian/patches/features/*) \
-		> debian/tmp/README.Patches
 	
 	( sed -e '/## More settings/,$$d' $(objdir)/doc/Muttrc || exit 1 ; \
 	  cat debian/extra/rc/Muttrc.foot ) > debian/tmp/Muttrc
@@ -157,7 +152,7 @@ binary binary-arch: install
 	rm -rf $(CURDIR)/debian/mutt-dbg/usr/share/doc/mutt-dbg
 	
 	dh_link
-	dh_compress --exclude usr/share/doc/mutt/README.Patches
+	dh_compress
 	dh_fixperms --exclude usr/bin/mutt_dotlock
 	dh_installdeb
 	dh_shlibdeps

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