diff --git a/debian/NEWS b/debian/NEWS
index da277d692920ab18f235559263e4d75d9d4c8c67..4101c83ed75c5eeb6062dd6b799ed0c05a034567 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,17 @@
+mailman (1:2.1.26-1) unstable; urgency=medium
+
+ This package contains the legacy 2.x branch of Mailman. Development
+ happens in the Mailman 3 suite, available in Debian since this release
+ via the 'mailman3' metapackage.
+
+ They are both available in this release, so you can migrate at your own
+ pace. This mailman (2.x) package will be kept in working order for the
+ foreseeable future, but will not see any major changes or improvements.
+ It will be removed from the first Debian release after Mailman upstream
+ has stopped support for this branch.
+
+ -- Thijs Kinkhorst <thijs@debian.org> Sat, 03 Feb 2018 09:30:22 +0000
+
mailman (1:2.1.16-1exp1) experimental; urgency=low
This version has changed the encoding of most strings, templates
diff --git a/debian/README.Debian b/debian/README.Debian
index 43d3468dd822e4cca5e18faf7a66790e0c181a9f..3865b79d7b2039e4e9cae02b35ad6063c5113a74 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,6 +1,21 @@
Notes for the debian mailman package.
=====================================
+This is the legacy Mailman release
+----------------------------------
+
+This package contains the legacy 2.x branch of Mailman. Development
+happens in the Mailman 3 suite, available since Debian 10 'Buster'
+via the 'mailman3' metapackage.
+
+For new installations we recommend to start from the mailman3 package.
+If you have an existing installation of Mailman 2.x, you can migrate
+at your own pace.
+
+This mailman (2.x) package will be kept in working order for the
+foreseeable future, but will not see any major changes or improvements.
+It will be removed from the first Debian release after Mailman upstream
+has stopped support for this branch.
Getting started
---------------
@@ -58,5 +73,3 @@ documentation about how to configure SpamAssassin and Mailman together at
http://www.daa.com.au/~james/articles/mailman-spamassassin/
The current version of this handler used in this package is released on
2003 May 6 by James Henstridge <james@daa.com.au>.
-
- -- Lionel Elie Mamane <lmamane@debian.org>, dim, 27 aoû 2006 19:08:42 +0200
diff --git a/debian/changelog b/debian/changelog
index d3e1f3b79f5a7e07c09589c689ba47251d2b205a..7b499e3f7c2829a80de3ac99cd88fd6839a60a15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mailman (1:2.1.25-2) UNRELEASED; urgency=medium
+
+ * Document that this is the legacy branch of Mailman and that all
+ major development is focused on Mailman 3 (package mailman3).
+
+ -- Thijs Kinkhorst <thijs@debian.org> Sat, 03 Feb 2018 09:54:50 +0000
+
mailman (1:2.1.25-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index 06d4d12dfd76cdd56da99308422e8cbc2e82630c..2e772cb1e15f8a4ee546eb8957379d0ef6c81207 100644
--- a/debian/control
+++ b/debian/control
@@ -19,16 +19,20 @@ Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends},
cron | cron-daemon,
python-dnspython
Recommends: default-mta | mail-transport-agent
-Suggests: spamassassin, lynx, listadmin
-Description: Powerful, web-based mailing list manager
- The GNU Mailing List Manager, which manages email discussion lists
- much like Majordomo and Smartmail. Unlike most similar products,
+Suggests: mailman3,
+ spamassassin, lynx, listadmin
+Description: Web-based mailing list manager (legacy branch)
+ The GNU Mailing List Manager, which manages email discussion lists.
Mailman gives each mailing list a web page, and allows users to
- subscribe, unsubscribe, etc. over the web. Even the list manager can
+ subscribe, unsubscribe, etc. over the web. The list manager can
administer his or her list entirely from the web.
.
Mailman also integrates most things people want to do with mailing
- lists, including archiving, mail <-> news gateways, and so on. It
+ lists, including archiving, mail <-> news gateways, and so on. It
has all of the features you expect from such a product, plus
integrated support for the web (including web based archiving),
automated bounce handling and integrated spam prevention.
+ .
+ Note that this package contains the legacy (2.x) branch of Mailman.
+ All new development happens in the Mailman 3 suite, available in
+ Debian via the mailman3 metapackage.
diff --git a/debian/mailman.dirs b/debian/mailman.dirs
index b0ea74a0555f3192714e63fb2cff4b1b998ada1b..af3f310b9c74ffb44923b70eab746ab454364a90 100644
--- a/debian/mailman.dirs
+++ b/debian/mailman.dirs
@@ -1,5 +1,6 @@
usr/lib/mailman
usr/sbin
+usr/share/bug/mailman
usr/share/lintian/overrides
usr/share/mailman
usr/share/images/mailman
diff --git a/debian/presubj b/debian/presubj
new file mode 100644
index 0000000000000000000000000000000000000000..61fb63bffaa2ae7c323d3dc27b16cac106fb18ac
--- /dev/null
+++ b/debian/presubj
@@ -0,0 +1,10 @@
+This package 'mailman' contains the legacy 2.x branch of Mailman.
+Development happens in the Mailman 3 suite, available in Debian via
+the 'mailman3' metapackage.
+
+The 'mailmam' 2.x package is in maintenance mode. It will be kept in
+(minimal) working order for the foreseeable future, but will not see
+any major changes or improvements.
+
+Therefore it's likely not useful to file wishlist bugs, feature
+requests or items requiring major changes to the packaging.
diff --git a/debian/rules b/debian/rules
index 2e4f0af0f7dd89bad09c896d13728420ba2abb0f..fa7c969b34c5f5e455e1c576fb3ecccf0e450ffb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -136,6 +136,8 @@ binary-arch: build
# make lintian happy
install -m 0644 debian/lintian-overrides debian/mailman/usr/share/lintian/overrides/mailman
+ # reportbug text to discourage wishlist reports for legacy package
+ install -m 0644 debian/presubj debian/mailman/usr/share/bug/mailman/
# Spamassassin plugin
install -m 0644 debian/contrib/SpamAssassin.py debian/mailman/usr/lib/$(package)/Mailman/Handlers
@@ -184,7 +186,6 @@ binary-arch: build
install -d debian/mailman/usr/share/python/runtime.d
install debian/mailman.rtupdate debian/mailman/usr/share/python/runtime.d
-
egrep -rslZ '^#!(.*)python' debian/mailman/usr/lib/mailman | xargs -0 chmod a+x --
find debian/mailman/usr/share/doc/mailman -name "*.html" -exec chmod -x {} \;
find debian/mailman/usr/share/doc/mailman -name "*.txt" -exec chmod -x {} \;