[Reportbug-commits] r582 - in branches/modules (3 files)

[lawrencc at users.alioth.debian.org]

    Date: Thursday, July 24, 2008 @ 18:53:54
  Author: lawrencc
Revision: 582

Merge commit 'trunk' into modules

Modified:
  branches/modules/debian/changelog
  branches/modules/debian/copyright
  branches/modules/reportbug/debianbts.py

Modified: branches/modules/debian/changelog
===================================================================
--- branches/modules/debian/changelog	2008-07-24 18:50:25 UTC (rev 581)
+++ branches/modules/debian/changelog	2008-07-24 18:53:54 UTC (rev 582)
@@ -19,6 +19,8 @@
   * reportbuglib/reportbug.py
     - show system information only if the bug is not against wnpp; thanks to
       Francois Marier for the report; Closes: #448806
+    - reinforce that RM bugs for testing are for testing only; thanks to
+      Adeodato Simó for the report; Closes: #491013
   * README.Users
     - added how to usertag a bug at submit-time
   * TODO
@@ -26,8 +28,11 @@
       debian/control)
     - removed item for migration to python-btsutils, filed a bug instead:
       #490548
+  * debian/copyright
+    - shortened Format-Specification, removing the GET parameter on the URL
+      (lintian warning)
 
- -- Sandro Tosi <matrixhasu at gmail.com>  Mon, 14 Jul 2008 19:49:59 +0200
+ -- Sandro Tosi <matrixhasu at gmail.com>  Wed, 16 Jul 2008 01:13:58 +0200
 
 reportbug (3.42) unstable; urgency=low
 

Modified: branches/modules/debian/copyright
===================================================================
--- branches/modules/debian/copyright	2008-07-24 18:50:25 UTC (rev 581)
+++ branches/modules/debian/copyright	2008-07-24 18:53:54 UTC (rev 582)
@@ -1,4 +1,4 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=107
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
 Upstream-Author: Chris Lawrence <lawrencc at debian.org>
 Packaged-By: Chris Lawrence <lawrencc at debian.org>
 Packaged-Date: Fri, 14 May 1999 01:07:35 -0500

Modified: branches/modules/reportbug/debianbts.py
===================================================================
--- branches/modules/reportbug/debianbts.py	2008-07-24 18:50:25 UTC (rev 581)
+++ branches/modules/reportbug/debianbts.py	2008-07-24 18:53:54 UTC (rev 582)
@@ -269,7 +269,7 @@
             'oldstable-proposed-updates' : "Old stable proposed updates.",
             'stable' : "Stable.",
             'stable-proposed-updates' : "Stable proposed updates.",
-            'testing' : "Testing",
+            'testing' : "Testing only (NOT unstable)",
 	    'testing-proposed-updates' : "Testing proposed updates",
             'experimental' : "Experimental.",
         }, 'Choose the suite: ', empty_ok=True)