[mutt] 04/16: Fold mutt-patched into mutt
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 7174a9e18702baa17f30e2eef6e93a81442b42f1
Author: Faidon Liambotis <paravoid at debian.org>
Date: Sun Jul 3 22:54:58 2016 +0300
Fold mutt-patched into mutt
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.
- Remove the mutt-patched binary from debian/control.
- 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/.
---
debian/bug/control | 2 +-
debian/changelog | 7 +++
debian/control | 19 ++------
debian/extra/{mutt-patched.rc => rc}/sidebar.rc | 0
debian/mutt-patched.install | 1 -
debian/mutt-patched.links | 1 -
debian/mutt-patched.lintian-overrides | 1 -
debian/mutt-patched.postinst | 15 ------
debian/mutt-patched.prerm | 13 -----
debian/patches/__separator__mutt.org.patch | 17 -------
.../{mutt-patched => features}/multiple-fcc.patch | 0
debian/patches/series | 3 +-
debian/rules | 55 ++++------------------
13 files changed, 21 insertions(+), 113 deletions(-)
diff --git a/debian/bug/control b/debian/bug/control
index 1d19eee..697000b 100644
--- a/debian/bug/control
+++ b/debian/bug/control
@@ -1 +1 @@
-package-status: mutt mutt-patched mutt-dbg
+package-status: mutt mutt-dbg
diff --git a/debian/changelog b/debian/changelog
index 19222bd..03f0357 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,13 @@ 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.
+ * 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.
+ - Remove the mutt-patched binary from debian/control.
+ - 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/.
-- Faidon Liambotis <paravoid at debian.org> Sun, 03 Jul 2016 22:32:37 +0200
diff --git a/debian/control b/debian/control
index 2e68fc8..ab21b36 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: locales, mime-support, libsasl2-modules
Suggests: default-mta | mail-transport-agent, urlview, aspell | ispell, gnupg, mixmaster, openssl, ca-certificates
Provides: mail-reader, imap-client
+Breaks: mutt-patched
+Replaces: mutt-patched
Description: text-based mailreader supporting MIME, GPG, PGP and threading
Mutt is a sophisticated text-based Mail User Agent. Some highlights:
.
@@ -38,18 +40,6 @@ Description: text-based mailreader supporting MIME, GPG, PGP and threading
* Colour support.
* Highly configurable through easy but powerful rc file.
-Package: mutt-patched
-Architecture: any
-Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, mutt (= ${binary:Version})
-Description: Mutt Mail User Agent with extra patches
- Mutt is a sophisticated text-based Mail User Agent.
- .
- This package adds the following patches:
- * sidebar: list mailboxes (with new mail) in a separate column on screen
- * nntp: NNTP support for mutt
- * multiple-fcc: handle FCC with multiple, comma separated entries
-
Package: mutt-dbg
Architecture: any
Section: debug
@@ -58,6 +48,5 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, mutt (= ${binary:Version})
Description: debugging symbols for mutt
Mutt is a sophisticated text-based Mail User Agent.
.
- This package contains the debugging symbols for mutt and mutt-patched; this
- is supposed to be used when there is a core file which should be analyzed
- using gdb.
+ This package contains the debugging symbols for mutt; this is supposed to be
+ used when there is a core file which should be analyzed using gdb.
diff --git a/debian/extra/mutt-patched.rc/sidebar.rc b/debian/extra/rc/sidebar.rc
similarity index 100%
rename from debian/extra/mutt-patched.rc/sidebar.rc
rename to debian/extra/rc/sidebar.rc
diff --git a/debian/mutt-patched.install b/debian/mutt-patched.install
deleted file mode 100644
index 00d4950..0000000
--- a/debian/mutt-patched.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/extra/mutt-patched.rc/*.rc etc/Muttrc.d
diff --git a/debian/mutt-patched.links b/debian/mutt-patched.links
deleted file mode 100644
index d15e658..0000000
--- a/debian/mutt-patched.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/mutt usr/share/doc/mutt-patched
diff --git a/debian/mutt-patched.lintian-overrides b/debian/mutt-patched.lintian-overrides
deleted file mode 100644
index 468783f..0000000
--- a/debian/mutt-patched.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-mutt-patched: possible-documentation-but-no-doc-base-registration
diff --git a/debian/mutt-patched.postinst b/debian/mutt-patched.postinst
deleted file mode 100644
index 75de4f0..0000000
--- a/debian/mutt-patched.postinst
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ] ; then
- update-alternatives --install /usr/bin/mutt mutt /usr/bin/mutt-patched 60 \
- --slave /usr/share/man/man1/mutt.1.gz mutt.1.gz /usr/share/man/man1/mutt-patched.1.gz \
- --slave /usr/share/man/man5/muttrc.5.gz muttrc.5.gz /usr/share/man/man5/muttrc-patched.5.gz \
- --slave /usr/share/doc/mutt/html mutt-doc-html /usr/share/doc/mutt/html-patched \
- --slave /usr/share/doc/mutt/manual.txt.gz mutt-doc-manual /usr/share/doc/mutt/manual-patched.txt.gz
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/mutt-patched.prerm b/debian/mutt-patched.prerm
deleted file mode 100644
index 7117be4..0000000
--- a/debian/mutt-patched.prerm
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- remove|deconfigure)
- update-alternatives --remove mutt /usr/bin/mutt-patched
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/patches/__separator__mutt.org.patch b/debian/patches/__separator__mutt.org.patch
deleted file mode 100644
index 194a6f8..0000000
--- a/debian/patches/__separator__mutt.org.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Antonio Radici <antonio at debian.org>
-Date: Wed, 5 Mar 2014 10:09:15 +0100
-Subject: __separator__mutt.org
-
-Dummy patch to serve as marker separating patches for mutt-patched
----
- .mutt.org | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 .mutt.org
-
-diff --git a/.mutt.org b/.mutt.org
-new file mode 100644
-index 0000000..d0d32f3
---- /dev/null
-+++ b/.mutt.org
-@@ -0,0 +1 @@
-+# dummy patch to serve as marker separating patches for mutt-patched
diff --git a/debian/patches/mutt-patched/multiple-fcc.patch b/debian/patches/features/multiple-fcc.patch
similarity index 100%
rename from debian/patches/mutt-patched/multiple-fcc.patch
rename to debian/patches/features/multiple-fcc.patch
diff --git a/debian/patches/series b/debian/patches/series
index 8922baf..1a33137 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,7 +21,6 @@ upstream/383769-score-match.patch
upstream/771125-CVE-2014-9116-jessie.patch
upstream/path_max.patch
upstream/809802_timeout_hook.patch
-__separator__mutt.org.patch
neomutt/09-sidebar.patch
-mutt-patched/multiple-fcc.patch
+features/multiple-fcc.patch
neomutt-devel/nntp.patch
diff --git a/debian/rules b/debian/rules
index d04f2f0..8d061c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,10 +5,6 @@ QUILT = QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt --quiltrc /dev/null
###################### user serviceable parts ######################
-###
-# build a separate mutt-patched package?
-BUILD_PATCHED := yes
-###
# header cache backend
# HCACHE_DB := bdb
# HCACHE_DB := gdbm
@@ -21,10 +17,6 @@ GPGME := --enable-gpgme
###################### variables ######################
-ifneq ($(BUILD_PATCHED),yes)
-export DH_OPTIONS := -Nmutt-patched
-endif
-
# Configure arguments
ifeq ($(HCACHE_DB),bdb)
@@ -59,6 +51,8 @@ confflags = --prefix=/usr \
--enable-imap \
--enable-smtp \
--enable-pop \
+ --enable-sidebar \
+ --enable-nntp \
\
--with-curses \
--with-gnutls \
@@ -89,36 +83,13 @@ objdir = $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)
###################### main ######################
-$(objdir)-patched/build-stamp: $(QUILT_STAMPFN)
+build build-arch: $(objdir)/build-stamp
+$(objdir)/build-stamp: $(QUILT_STAMPFN)
dh_testdir
dh_clean
- -mkdir $(objdir)-patched
dh_autotools-dev_updateconfig
-ifeq ($(BUILD_PATCHED),yes)
- ###################### building mutt-patched ######################
- mv PATCHES PATCHES.orig
- $(QUILT) applied > PATCHES
- autoreconf --install --include=m4
- cd $(objdir)-patched && \
- env CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
- ../configure $(confflags) \
- --enable-sidebar \
- --enable-nntp
-
- echo '#include "config-debian.h"' >> $(objdir)-patched/config.h
-
- # we should just "make mutt" here, but that doesn't work yet
- cd $(objdir)-patched && $(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)"
-endif
-
- touch $@
-
-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
autoreconf --install --include=m4
@@ -149,8 +120,8 @@ install: build
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/patches/mutt-patched/*) > debian/tmp/README.Patches
+ (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
@@ -166,14 +137,6 @@ install: build
install -D debian/tmp/usr/share/man/man1/mutt.1 debian/mutt/usr/share/man/man1/mutt-org.1
install -D debian/tmp/usr/share/man/man5/muttrc.5 debian/mutt/usr/share/man/man5/muttrc-org.5
install -D debian/tmp/usr/share/doc/manual.txt debian/mutt/usr/share/doc/mutt/manual-org.txt
-ifeq ($(BUILD_PATCHED),yes)
- install -D $(objdir)-patched/mutt debian/mutt-patched/usr/bin/mutt-patched
- install -d debian/mutt-patched/usr/share/doc/mutt/html-patched/
- install -D $(objdir)-patched/doc/*.html debian/mutt-patched/usr/share/doc/mutt/html-patched/
- install -D $(objdir)-patched/doc/manual.txt debian/mutt-patched/usr/share/doc/mutt/manual-patched.txt
- install -D $(objdir)-patched/doc/muttrc.man debian/mutt-patched/usr/share/man/man5/muttrc-patched.5
- install -D $(objdir)-patched/doc/mutt.1 debian/mutt-patched/usr/share/man/man1/mutt-patched.1
-endif
# reportbug driver
dh_installdirs
@@ -191,8 +154,7 @@ binary binary-arch: install
-dh_lintian
dh_strip --dbg-package=mutt-dbg
- rm -rf $(CURDIR)/debian/mutt-dbg/usr/share/doc/mutt-dbg \
- $(CURDIR)/debian/mutt-patched/usr/share/doc/mutt-patched
+ rm -rf $(CURDIR)/debian/mutt-dbg/usr/share/doc/mutt-dbg
dh_link
dh_compress --exclude usr/share/doc/mutt/README.Patches
@@ -213,10 +175,9 @@ clean: unpatch
# please dpkg-source
rm -f po/*.gmo
- -mv PATCHES.orig PATCHES
# remove build trees
- rm -rf $(objdir) $(objdir)-patched
+ rm -rf $(objdir)
# remove autotool-generated files so they don't show up in the diff.gz
dh_autotools-dev_restoreconfig
--
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