[Reportbug-commits] [reportbug] 05/06: Closes: #831848 - revert the description of www.debian.org to the official one (see also #813108); Closes: #813113

[Sandro Tosi]

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

morph pushed a commit to branch master
in repository reportbug.

commit e6832ed290f80118b5c89df42a6748bad8e6ec70
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Dec 18 16:08:45 2016 -0500

        Closes: #831848 - revert the description of www.debian.org to the official one (see also #813108); Closes: #813113
---
 debian/changelog     | 6 ++++--
 reportbug/debbugs.py | 2 +-
 test/test_debbugs.py | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a82ca40..7f91347 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,11 +4,13 @@ reportbug (7.1.1) UNRELEASED; urgency=medium
     - add sections for Rust and JavaScript, patch by Josh Triplett;
       Closes: #847537
     - update the list of pseudopackages (and fix & re-enable unittest);
-      Closes: #831848, 
+      Closes: #831848
+    - revert the description of www.debian.org to the official one (see also
+      #813108); Closes: #813113
   * doc/README.Users
     - grammar fixes/improvements; patch by Vilius Panevėžys; Closes: #811193
 
- -- Sandro Tosi <morph at debian.org>  Sun, 18 Dec 2016 15:45:46 -0500
+ -- Sandro Tosi <morph at debian.org>  Sun, 18 Dec 2016 16:07:26 -0500
 
 reportbug (7.1.0) experimental; urgency=medium
 
diff --git a/reportbug/debbugs.py b/reportbug/debbugs.py
index 86a8305..8d8f32a 100644
--- a/reportbug/debbugs.py
+++ b/reportbug/debbugs.py
@@ -201,7 +201,7 @@ debother = {
     'upgrade-reports': 'Reports of upgrade problems for stable & testing',
     'wiki.debian.org': 'Problems with the Debian wiki',
     'wnpp': 'Work-Needing and Prospective Packages list',
-    'www.debian.org': 'Problems with the WWW site (including other *.debian.org sites, except alioth)'
+    'www.debian.org': 'Problems with the WWW site'
 }
 
 progenyother = {
diff --git a/test/test_debbugs.py b/test/test_debbugs.py
index 699901c..28d4df0 100644
--- a/test/test_debbugs.py
+++ b/test/test_debbugs.py
@@ -172,7 +172,7 @@ class TestMiscFunctions(unittest.TestCase):
         # we removed base from reportbug
         del bdo_list['base']
         # uniform reportbug customized descriptions
-        for customized in 'www.debian.org', 'ftp.debian.org':
+        for customized in ['ftp.debian.org', ]:
             bdo_list[customized] = debbugs.debother[customized]
         self.maxDiff = None
         self.assertEqual(debbugs.debother, bdo_list)

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