diff -pruN 11.6.0/bin/reportbug 11.6.0ubuntu2/bin/reportbug
--- 11.6.0/bin/reportbug	2022-12-03 20:18:12.000000000 +0000
+++ 11.6.0ubuntu2/bin/reportbug	2023-02-01 10:01:21.000000000 +0000
@@ -1119,6 +1119,14 @@ class UI(object):
             print(LICENSE)
             sys.exit(0)
 
+        # Cancel if "bts" is not configured or "ubuntu"
+        if not self.options.bts or self.options.bts == "ubuntu":
+            ui.long_message('*** ERROR: "Ubuntu" BTS is currently unsupported.\n\n'
+                            'Please use "ubuntu-bug" (from the apport package) for reporting bugs in Ubuntu.\n\n'
+                            'You can report bugs to Debian by specifying  \'bts debian\' in your ~/.reportbugrc\n'
+                            'or by passing the -B debian option on the commandline (see reportbug(1)).\n')
+            sys.exit(1)
+
         # These option values may get adjusted below, so give them a variable name.
         sendto = self.options.sendto
         check_available = self.options.check_available
diff -pruN 11.6.0/debian/changelog 11.6.0ubuntu2/debian/changelog
--- 11.6.0/debian/changelog	2022-12-04 18:28:36.000000000 +0000
+++ 11.6.0ubuntu2/debian/changelog	2023-02-01 10:03:46.000000000 +0000
@@ -1,3 +1,20 @@
+reportbug (11.6.0ubuntu2) lunar; urgency=medium
+
+  * Make Python version PEP440 compliant (LP: #1991606)
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Wed, 01 Feb 2023 11:03:46 +0100
+
+reportbug (11.6.0ubuntu1) lunar; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Sat, 21 Jan 2023 22:03:11 -0500
+
 reportbug (11.6.0) unstable; urgency=medium
 
   [ Paul Wise ]
@@ -56,6 +73,17 @@ reportbug (11.5.1) unstable; urgency=med
 
  -- Nis Martensen <nis.martensen@web.de>  Wed, 17 Aug 2022 21:00:03 +0200
 
+reportbug (11.5.0ubuntu1) kinetic; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Sun, 08 May 2022 22:39:36 -0400
+
 reportbug (11.5.0) unstable; urgency=medium
 
   [ Mickaël Schoentgen ]
@@ -92,6 +120,17 @@ reportbug (11.5.0) unstable; urgency=med
 
  -- Nis Martensen <nis.martensen@web.de>  Sat, 30 Apr 2022 12:10:55 +0200
 
+reportbug (11.4.1ubuntu1) jammy; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Sat, 19 Mar 2022 19:05:05 -0400
+
 reportbug (11.4.1) unstable; urgency=medium
 
   [ Philippe SWARTVAGHER ]
@@ -104,6 +143,17 @@ reportbug (11.4.1) unstable; urgency=med
 
  -- Nis Martensen <nis.martensen@web.de>  Sat, 26 Feb 2022 21:29:40 +0100
 
+reportbug (11.4.0ubuntu1) jammy; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Sun, 20 Feb 2022 18:19:37 -0500
+
 reportbug (11.4.0) unstable; urgency=medium
 
   * reportbug/submit.py: do not output extra info when saving to file
@@ -129,6 +179,17 @@ reportbug (11.4.0) unstable; urgency=med
 
  -- Nis Martensen <nis.martensen@web.de>  Sun, 13 Feb 2022 00:15:46 +0100
 
+reportbug (11.3.0ubuntu1) jammy; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Mon, 24 Jan 2022 21:47:02 -0500
+
 reportbug (11.3.0) unstable; urgency=medium
 
   [ Takahide Nojima ]
@@ -156,6 +217,17 @@ reportbug (11.3.0) unstable; urgency=med
 
  -- Nis Martensen <nis.martensen@web.de>  Sat, 22 Jan 2022 20:39:34 +0100
 
+reportbug (11.2.0ubuntu1) jammy; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Sun, 02 Jan 2022 16:07:38 -0500
+
 reportbug (11.2.0) unstable; urgency=medium
 
   [ Nis Martensen ]
@@ -172,6 +244,17 @@ reportbug (11.2.0) unstable; urgency=med
 
  -- Nis Martensen <nis.martensen@web.de>  Thu, 30 Dec 2021 22:58:24 +0100
 
+reportbug (11.1.0ubuntu1) jammy; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Sun, 07 Nov 2021 14:08:23 -0500
+
 reportbug (11.1.0) unstable; urgency=medium
 
   [ Nelson A. de Oliveira ]
@@ -229,12 +312,34 @@ reportbug (11.0.0) unstable; urgency=med
 
  -- Sandro Tosi <morph@debian.org>  Wed, 25 Aug 2021 23:54:19 -0400
 
+reportbug (7.10.3ubuntu1) hirsute; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Sat, 27 Feb 2021 17:46:58 -0500
+
 reportbug (7.10.3) unstable; urgency=medium
 
   * reportbug/debbugs.py: handle installation-reports (Closes: #931438)
 
  -- Nis Martensen <nis.martensen@web.de>  Wed, 24 Feb 2021 22:32:29 +0100
 
+reportbug (7.10.2ubuntu1) hirsute; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Fri, 12 Feb 2021 22:00:29 -0500
+
 reportbug (7.10.2) unstable; urgency=medium
 
   * autopkgtest: set a valid sender address
@@ -247,6 +352,17 @@ reportbug (7.10.1) unstable; urgency=med
 
  -- Nis Martensen <nis.martensen@web.de>  Tue, 09 Feb 2021 19:02:10 +0100
 
+reportbug (7.10.0ubuntu1) hirsute; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Mon, 08 Feb 2021 21:46:21 -0500
+
 reportbug (7.10.0) unstable; urgency=medium
 
   [ Logan Rosen ]
@@ -277,6 +393,17 @@ reportbug (7.10.0) unstable; urgency=med
 
  -- Nis Martensen <nis.martensen@web.de>  Mon, 08 Feb 2021 18:47:18 +0100
 
+reportbug (7.9.0ubuntu1) hirsute; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Tue, 22 Dec 2020 23:27:16 -0500
+
 reportbug (7.9.0) unstable; urgency=medium
 
   [ Roderich Schupp ]
@@ -316,6 +443,17 @@ reportbug (7.9.0) unstable; urgency=medi
 
  -- Nis Martensen <nis.martensen@web.de>  Tue, 22 Dec 2020 11:39:14 +0100
 
+reportbug (7.8.0ubuntu1) hirsute; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Sun, 08 Nov 2020 22:32:47 -0500
+
 reportbug (7.8.0) unstable; urgency=medium
 
   [ Anuradha Weeraman ]
@@ -359,6 +497,16 @@ reportbug (7.8.0) unstable; urgency=medi
 
  -- Nis Martensen <nis.martensen@web.de>  Sun, 25 Oct 2020 09:21:16 +0100
 
+reportbug (7.7.0ubuntu1) groovy; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+ -- Logan Rosen <logan@ubuntu.com>  Fri, 10 Jul 2020 16:50:29 -0400
+
 reportbug (7.7.0) unstable; urgency=medium
 
   [ Bastian Venthur ]
@@ -520,6 +668,17 @@ reportbug (7.7.0) unstable; urgency=medi
 
  -- Sandro Tosi <morph@debian.org>  Thu, 09 Jul 2020 22:18:36 -0400
 
+reportbug (7.6.0ubuntu1) focal; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Wed, 05 Feb 2020 01:33:09 +0000
+
 reportbug (7.6.0) unstable; urgency=medium
 
   [ Bastian Venthur ]
@@ -582,6 +741,17 @@ reportbug (7.5.3) unstable; urgency=medi
 
  -- Sandro Tosi <morph@debian.org>  Wed, 28 Aug 2019 19:54:08 -0400
 
+reportbug (7.5.2ubuntu1) disco; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Fri, 01 Feb 2019 22:29:46 -0500
+
 reportbug (7.5.2) unstable; urgency=medium
 
   * bin/reportbug
@@ -623,6 +793,17 @@ reportbug (7.5.2) unstable; urgency=medi
 
  -- Sandro Tosi <morph@debian.org>  Thu, 31 Jan 2019 20:57:49 -0500
 
+reportbug (7.5.1ubuntu1) disco; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Sun, 25 Nov 2018 20:55:24 -0500
+
 reportbug (7.5.1) unstable; urgency=medium
 
   * debian/control
@@ -646,6 +827,17 @@ reportbug (7.5.1) unstable; urgency=medi
 
  -- Sandro Tosi <morph@debian.org>  Sat, 24 Nov 2018 15:27:06 -0500
 
+reportbug (7.5.0ubuntu1) disco; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Sat, 17 Nov 2018 22:24:49 -0500
+
 reportbug (7.5.0) unstable; urgency=medium
 
   * debian/control
@@ -705,6 +897,17 @@ reportbug (7.1.9) unstable; urgency=medi
 
  -- Sandro Tosi <morph@debian.org>  Sat, 24 Feb 2018 20:56:22 -0500
 
+reportbug (7.1.8ubuntu1) bionic; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Sat, 30 Dec 2017 19:41:19 +0530
+
 reportbug (7.1.8) unstable; urgency=medium
 
   * reportbug/debbugs.py
@@ -756,6 +959,17 @@ reportbug (7.1.8) unstable; urgency=medi
 
  -- Sandro Tosi <morph@debian.org>  Thu, 28 Dec 2017 23:25:43 -0500
 
+reportbug (7.1.7ubuntu1) artful; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Wed, 31 May 2017 08:46:30 +0530
+
 reportbug (7.1.7) unstable; urgency=medium
 
   * reportbug/utils.py
@@ -804,6 +1018,17 @@ reportbug (7.1.7) unstable; urgency=medi
 
  -- Sandro Tosi <morph@debian.org>  Mon, 29 May 2017 16:00:17 -0400
 
+reportbug (7.1.6ubuntu1) artful; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Sat, 22 Apr 2017 14:59:15 +0530
+
 reportbug (7.1.6) unstable; urgency=medium
 
   * reportbug/utils.py
@@ -845,6 +1070,17 @@ reportbug (7.1.4) unstable; urgency=medi
 
  -- Sandro Tosi <morph@debian.org>  Sun, 22 Jan 2017 18:16:04 -0500
 
+reportbug (7.1.3ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Tue, 17 Jan 2017 16:42:10 +0530
+
 reportbug (7.1.3) unstable; urgency=medium
 
   * debian/control
@@ -873,6 +1109,17 @@ reportbug (7.1.3) unstable; urgency=medi
 
  -- Sandro Tosi <morph@debian.org>  Sun, 15 Jan 2017 20:30:27 -0500
 
+reportbug (7.1.2ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Sat, 07 Jan 2017 05:20:13 -0500
+
 reportbug (7.1.2) unstable; urgency=medium
 
   * reportbug/utils.py
@@ -893,6 +1140,17 @@ reportbug (7.1.2) unstable; urgency=medi
 
  -- Sandro Tosi <morph@debian.org>  Wed, 04 Jan 2017 20:17:13 -0500
 
+reportbug (7.1.1ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Sat, 24 Dec 2016 17:01:44 -0500
+
 reportbug (7.1.1) unstable; urgency=medium
 
   * Upload to unstable
@@ -931,6 +1189,17 @@ reportbug (7.0.0) experimental; urgency=
 
  -- Sandro Tosi <morph@debian.org>  Wed, 30 Nov 2016 20:25:52 -0500
 
+reportbug (6.6.6ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Fri, 15 Jan 2016 23:33:48 -0500
+
 reportbug (6.6.6) unstable; urgency=medium
 
   * reportbug/utils.py
@@ -980,6 +1249,17 @@ reportbug (6.6.6) unstable; urgency=medi
 
  -- Sandro Tosi <morph@debian.org>  Sat, 02 Jan 2016 01:47:46 +0000
 
+reportbug (6.6.5ubuntu1) wily; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Fri, 18 Sep 2015 23:49:07 -0400
+
 reportbug (6.6.5) unstable; urgency=medium
 
   * reportbug/debbugs.py
@@ -1002,6 +1282,17 @@ reportbug (6.6.5) unstable; urgency=medi
 
  -- Sandro Tosi <morph@debian.org>  Fri, 18 Sep 2015 21:38:56 +0100
 
+reportbug (6.6.4ubuntu1) wily; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Tue, 04 Aug 2015 02:07:55 -0400
+
 reportbug (6.6.4) unstable; urgency=medium
 
   * reportbug/debbugs.py
@@ -1048,6 +1339,17 @@ reportbug (6.6.4) unstable; urgency=medi
 
  -- Sandro Tosi <morph@debian.org>  Mon, 03 Aug 2015 20:46:01 +0100
 
+reportbug (6.6.3ubuntu1) vivid; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Fri, 09 Jan 2015 12:55:35 -0500
+
 reportbug (6.6.3) unstable; urgency=medium
 
   * reportbug/debbugs.py
@@ -1056,6 +1358,17 @@ reportbug (6.6.3) unstable; urgency=medi
 
  -- Sandro Tosi <morph@debian.org>  Sun, 04 Jan 2015 10:41:18 +0000
 
+reportbug (6.6.2ubuntu1) vivid; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Sun, 04 Jan 2015 02:19:37 -0500
+
 reportbug (6.6.2) unstable; urgency=medium
 
   * reportbug/debbugs.py
@@ -1064,6 +1377,17 @@ reportbug (6.6.2) unstable; urgency=medi
 
  -- Sandro Tosi <morph@debian.org>  Fri, 02 Jan 2015 20:48:12 +0000
 
+reportbug (6.6.1ubuntu1) vivid; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and
+      refer user to "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/{rules,dirs}: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Thu, 04 Dec 2014 21:06:42 -0500
+
 reportbug (6.6.1) unstable; urgency=medium
 
   * reportbug/utils.py
@@ -1078,6 +1402,17 @@ reportbug (6.6.1) unstable; urgency=medi
 
  -- Sandro Tosi <morph@debian.org>  Tue, 02 Dec 2014 21:52:57 +0000
 
+reportbug (6.6.0ubuntu1) vivid; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an
+      an error and refer user "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/rules, debian/dirs: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Thu, 06 Nov 2014 00:38:47 -0500
+
 reportbug (6.6.0) unstable; urgency=medium
 
   * bin/reportbug, man/reportbug.1 share/reportbug.el
@@ -1127,6 +1462,17 @@ reportbug (6.6.0) unstable; urgency=medi
 
  -- Sandro Tosi <morph@debian.org>  Wed, 29 Oct 2014 00:30:49 +0000
 
+reportbug (6.5.1ubuntu1) utopic; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an
+      an error and refer user "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/rules, debian/dirs: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Mon, 08 Sep 2014 14:20:54 -0400
+
 reportbug (6.5.1) unstable; urgency=medium
 
   * debian/rules
@@ -1151,6 +1497,23 @@ reportbug (6.5.1) unstable; urgency=medi
 
  -- Sandro Tosi <morph@debian.org>  Fri, 05 Sep 2014 22:34:23 +0100
 
+reportbug (6.5.0+nmu1ubuntu2) utopic; urgency=medium
+
+  * Use 6.5.0 as version to match release regex that excludes +nmu.
+
+ -- Scott Kitterman <scott@kitterman.com>  Tue, 05 Aug 2014 15:19:08 -0400
+
+reportbug (6.5.0+nmu1ubuntu1) utopic; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes (LP: #1353046):
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an
+      an error and refer user "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/rules, debian/dirs: Do not install .desktop file.
+
+ -- Scott Kitterman <scott@kitterman.com>  Tue, 05 Aug 2014 14:49:52 -0400
+
 reportbug (6.5.0+nmu1) unstable; urgency=high
 
   * Non-maintainer upload.
@@ -1161,6 +1524,17 @@ reportbug (6.5.0+nmu1) unstable; urgency
 
  -- Salvatore Bonaccorso <carnil@debian.org>  Sun, 03 Aug 2014 16:03:15 +0200
 
+reportbug (6.5.0ubuntu1) trusty; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an
+      an error and refer user "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/rules, debian/dirs: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Tue, 28 Jan 2014 14:01:57 -0500
+
 reportbug (6.5.0) unstable; urgency=low
 
   [ Sandro Tosi ]
@@ -1196,6 +1570,17 @@ reportbug (6.5.0) unstable; urgency=low
 
  -- Sandro Tosi <morph@debian.org>  Sun, 26 Jan 2014 20:40:56 +0100
 
+reportbug (6.4.4ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an
+      an error and refer user "ubuntu-bug" instead.
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+    - debian/rules, debian/dirs: Do not install .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Mon, 18 Mar 2013 20:30:52 -0400
+
 reportbug (6.4.4) unstable; urgency=low
 
   * reportbug/ui/gtk2_ui.py
@@ -1206,6 +1591,17 @@ reportbug (6.4.4) unstable; urgency=low
 
  -- Sandro Tosi <morph@debian.org>  Tue, 12 Mar 2013 23:45:13 +0100
 
+reportbug (6.4.3ubuntu1) quantal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+   - bin/reportbug: If bts=ubuntu or unconfigured, exit with an
+     an error and refer user "ubuntu-bug" instead.
+   - reportbug/__init__.py: Match reportbug version with package version.
+   - debian/control: Add prominent note to package description.
+   - debian/rules, debian/dirs: Do not install .desktop file.
+
+ -- Felix Geyer <debfx@ubuntu.com>  Sun, 19 Aug 2012 17:48:32 +0200
+
 reportbug (6.4.3) unstable; urgency=low
 
   * reportbug/debbugs.py
@@ -1242,6 +1638,17 @@ reportbug (6.4.1) unstable; urgency=low
 
  -- Sandro Tosi <morph@debian.org>  Sun, 29 Jul 2012 11:10:25 +0200
 
+reportbug (6.4ubuntu1) quantal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+   - bin/reportbug: If bts=ubuntu or unconfigured, exit with an
+     an error and refer user "ubuntu-bug" instead.
+   - reportbug/__init__.py: Match reportbug version with package version.
+   - debian/control: Add prominent note to package description.
+   - debian/rules, debian/dirs: Do not install .desktop file.
+
+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com>  Mon, 25 Jun 2012 23:35:46 -0400
+
 reportbug (6.4) unstable; urgency=low
 
   * reportbug/checkversions.py
@@ -1288,6 +1695,17 @@ reportbug (6.4) unstable; urgency=low
 
  -- Sandro Tosi <morph@debian.org>  Wed, 06 Jun 2012 22:10:17 +0200
 
+reportbug (6.3.1ubuntu1) precise; urgency=low
+
+  * Merge from Debian testing.  Remaining changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an
+      an error and refer user "ubuntu-bug" instead.
+   - reportbug/__init__.py: Match reportbug version with package version.
+   - debian/control: Add prominent note to package description.
+   - debian/rules, debian/dirs: Do not install .desktop file.
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Fri, 16 Dec 2011 19:05:08 +0530
+
 reportbug (6.3.1) unstable; urgency=low
 
   * bin/reportbug
@@ -1310,6 +1728,17 @@ reportbug (6.3.1) unstable; urgency=low
 
  -- Sandro Tosi <morph@debian.org>  Sun, 04 Dec 2011 22:48:02 +0100
 
+reportbug (6.3ubuntu1) precise; urgency=low
+
+  * Merge from Debian Testing. Remaining Ubuntu changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an
+      an error and refer user "ubuntu-bug" instead.
+   - reportbug/__init__.py: Match reportbug version with package version.
+   - debian/control: Add prominent note to package description.
+   - debian/rules, debian/dirs: Do not install .desktop file.
+
+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com>  Tue, 22 Nov 2011 20:04:40 -0500
+
 reportbug (6.3) unstable; urgency=low
 
   * reportbug/utils.py
@@ -1360,6 +1789,19 @@ reportbug (6.3) unstable; urgency=low
 
  -- Sandro Tosi <morph@debian.org>  Sun, 06 Nov 2011 18:04:26 +0100
 
+reportbug (6.2.2ubuntu1) precise; urgency=low
+
+  * Merge from Debian Testing. Remaining Ubuntu changes:
+    - bin/reportbug: If bts=ubuntu or unconfigured, exit with an
+      an error and refer user "ubuntu-bug" instead.
+   - reportbug/__init__.py: Match reportbug version with package version.
+   - debian/control: Add prominent note to package description.
+   - debian/rules: Do not install .desktop file.
+  * debian/dirs: As we don't install the desktop file, we don't
+    need usr/share/applications.
+
+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com>  Fri, 04 Nov 2011 16:30:49 -0400
+
 reportbug (6.2.2) unstable; urgency=low
 
   * reportbug/utils.py
@@ -1527,6 +1969,19 @@ reportbug (6.0) unstable; urgency=low
 
  -- Sandro Tosi <morph@debian.org>  Thu, 11 Aug 2011 01:33:11 +0200
 
+reportbug (5.1.1ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - bin/reportbug
+     + Make reportbug stop working for bts=ubuntu and refer to "ubuntu-bug"
+       instead.
+     + exit with an error, if bts=ubuntu (or unconfigured).
+   - reportbug/__init__.py: Match reportbug version with package version.
+   - debian/control: Add prominent note to package description
+   - debian/rules: Do not install .desktop file.
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Sat, 07 May 2011 14:03:27 +0530
+
 reportbug (5.1.1) unstable; urgency=low
 
   * reportbug/ui/text_ui.py
@@ -1653,6 +2108,19 @@ reportbug (4.99.0) experimental; urgency
 
  -- Sandro Tosi <morph@debian.org>  Tue, 18 Jan 2011 22:38:07 +0100
 
+reportbug (4.12.6ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable. Remaining changes:
+    - bin/reportbug
+     + Make reportbug stop working for bts=ubuntu and refer to "ubuntu-bug"
+       instead.
+     + exit with an error, if bts=ubuntu (or unconfigured).
+   - reportbug/__init__.py: Match reportbug version with package version.
+   - debian/control: Add prominent note to package description
+   - debian/rules: Do not install .desktop file.
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Tue, 19 Oct 2010 10:30:04 +0530
+
 reportbug (4.12.6) unstable; urgency=low
 
   * reportbug/debianbts.py
@@ -1682,6 +2150,19 @@ reportbug (4.12.5) unstable; urgency=low
 
  -- Sandro Tosi <morph@debian.org>  Fri, 06 Aug 2010 15:15:41 +0200
 
+reportbug (4.12.4ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable. (LP: #600917) Remaining changes:
+    - bin/reportbug
+     + Make reportbug stop working for bts=ubuntu and refer to "ubuntu-bug"
+       instead.
+     + exit with an error, if bts=ubuntu (or unconfigured).
+   - reportbug/__init__.py: Match reportbug version with package version.
+   - debian/control: Add prominent note to package description
+   - debian/rules: Do not install .desktop file.
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Fri, 02 Jul 2010 11:42:58 +0530
+
 reportbug (4.12.4) unstable; urgency=low
 
   * man/reportbug.1
@@ -1693,6 +2174,19 @@ reportbug (4.12.4) unstable; urgency=low
 
  -- Sandro Tosi <morph@debian.org>  Thu, 01 Jul 2010 20:56:57 +0200
 
+reportbug (4.12.3ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable. Remaining changes:
+   - bin/reportbug
+     + Make reportbug stop working for bts=ubuntu and refer to "ubuntu-bug"
+       instead.
+     + exit with an error, if bts=ubuntu (or unconfigured).
+   - reportbug/__init__.py: Match reportbug version with package version.
+   - debian/control: Add prominent note to package description
+   - debian/rules: Do not install .desktop file.
+
+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com>  Thu, 10 Jun 2010 11:24:24 -0400
+
 reportbug (4.12.3) unstable; urgency=low
 
   * reportbug/utils.py
@@ -1717,6 +2211,19 @@ reportbug (4.12.3) unstable; urgency=low
 
  -- Sandro Tosi <morph@debian.org>  Mon, 07 Jun 2010 20:59:28 +0200
 
+reportbug (4.12.2ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+   - bin/reportbug
+     + Make reportbug stop working for bts=ubuntu and refer to "ubuntu-bug"
+       instead.
+     + exit with an error, if bts=ubuntu (or unconfigured).
+   - reportbug/__init__.py: Match reportbug version with package version.
+   - debian/control: Add prominent note to package description
+   - debian/rules: Do not install .desktop file.
+
+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com>  Tue, 25 May 2010 23:45:58 -0400
+
 reportbug (4.12.2) unstable; urgency=low
 
   * bin/reportbug
@@ -1736,6 +2243,19 @@ reportbug (4.12.2) unstable; urgency=low
 
  -- Sandro Tosi <morph@debian.org>  Wed, 12 May 2010 19:21:22 +0200
 
+reportbug (4.12.1ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+   - bin/reportbug
+     + Make reportbug stop working for bts=ubuntu and refer to "ubuntu-bug"
+       instead.
+     + exit with an error, if bts=ubuntu (or unconfigured).
+   - reportbug/__init__.py: Match reportbug version with package version.
+   - debian/control: Add prominent note to package description
+   - debian/rules: Do not install .desktop file.
+
+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com>  Mon, 10 May 2010 20:31:35 -0400
+
 reportbug (4.12.1) unstable; urgency=low
 
   * reportbug/utils.py
@@ -1888,6 +2408,19 @@ reportbug (4.11) unstable; urgency=low
 
  -- Sandro Tosi <morph@debian.org>  Tue, 16 Mar 2010 19:31:44 +0100
 
+reportbug (4.10.2ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing.  Remaining changes:
+   - bin/reportbug
+     + Make reportbug stop working for bts=ubuntu and refer to "ubuntu-bug"
+       instead.
+     + exit with an error, if bts=ubuntu (or unconfigured).
+   - reportbug/__init__.py: Match reportbug version with package version.
+   - debian/control: Add prominent note to package description
+   - debian/rules: Do not install .desktop file.
+
+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com>  Sat, 13 Feb 2010 17:58:18 -0500
+
 reportbug (4.10.2) unstable; urgency=low
 
   * reportbug/utils.py
@@ -1896,6 +2429,32 @@ reportbug (4.10.2) unstable; urgency=low
 
  -- Sandro Tosi <morph@debian.org>  Tue, 26 Jan 2010 23:51:23 +0100
 
+reportbug (4.10.1ubuntu3) lucid; urgency=low
+
+  * reportbug/__init__.py: Update version string to match the one from
+    debian/changelog (fixes FTBFS).
+
+ -- Michael Bienia <geser@ubuntu.com>  Sat, 06 Feb 2010 11:44:50 +0100
+
+reportbug (4.10.1ubuntu2) lucid; urgency=low
+
+  * debian/rules: do not install .desktop file, so it won't show up in the
+    desktop menu anymore (LP: #395126)
+
+ -- Daniel Hahler <ubuntu@thequod.de>  Thu, 04 Feb 2010 02:07:22 +0100
+
+reportbug (4.10.1ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing. Remaining changes:
+    - bin/reportbug
+      + Make reportbug stop working for bts=ubuntu and refer to "ubuntu-bug"
+        instead.
+      + exit with an error, if bts=ubuntu (or unconfigured).
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description
+
+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com>  Wed, 27 Jan 2010 13:57:02 -0500
+
 reportbug (4.10.1) unstable; urgency=low
 
   * bin/reportbug
@@ -1998,6 +2557,18 @@ reportbug (4.10) unstable; urgency=low
 
  -- Sandro Tosi <morph@debian.org>  Thu, 07 Jan 2010 11:43:20 +0100
 
+reportbug (4.9ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing. Remaining changes:
+    - bin/reportbug
+      + Make reportbug stop working for bts=ubuntu and refer to "ubuntu-bug"
+        instead.
+      + exit with an error, if bts=ubuntu (or unconfigured).
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description
+
+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com>  Mon, 28 Dec 2009 20:24:30 -0500
+
 reportbug (4.9) unstable; urgency=low
 
   [ Sandro Tosi ]
@@ -2055,6 +2626,18 @@ reportbug (4.9) unstable; urgency=low
 
  -- Sandro Tosi <morph@debian.org>  Fri, 27 Nov 2009 20:12:38 +0100
 
+reportbug (4.8ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing, remaining changes:
+    - bin/reportbug
+      + Make reportbug stop working for bts=ubuntu and refer to "ubuntu-bug"
+        instead.
+      + exit with an error, if bts=ubuntu (or unconfigured).
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description
+
+ -- Scott Kitterman <scott@kitterman.com>  Mon, 09 Nov 2009 23:14:03 -0500
+
 reportbug (4.8) unstable; urgency=low
 
   [ Sandro Tosi ]
@@ -2080,6 +2663,18 @@ reportbug (4.8) unstable; urgency=low
 
  -- Sandro Tosi <morph@debian.org>  Wed, 16 Sep 2009 22:56:10 +0200
 
+reportbug (4.7ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - bin/reportbug
+      + Make reportbug stop working for bts=ubuntu and refer to "ubuntu-bug"
+        instead.
+      + exit with an error, if bts=ubuntu (or unconfigured).
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+
+ -- Scott Kitterman <scott@kitterman.com>  Wed, 09 Sep 2009 14:30:34 -0400
+
 reportbug (4.7) unstable; urgency=low
 
   [ Sandro Tosi ]
@@ -2114,6 +2709,18 @@ reportbug (4.7) unstable; urgency=low
 
  -- Sandro Tosi <morph@debian.org>  Wed, 02 Sep 2009 23:12:16 +0200
 
+reportbug (4.6ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #414338
+    - bin/reportbug
+      + Make reportbug stop working for bts=ubuntu and refer to "ubuntu-bug"
+        instead.
+      + exit with an error, if bts=ubuntu (or unconfigured).
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Sun, 16 Aug 2009 12:06:53 +0530
+
 reportbug (4.6) unstable; urgency=low
 
   * reportbug/__init__.py
@@ -2166,6 +2773,18 @@ reportbug (4.6) unstable; urgency=low
 
  -- Sandro Tosi <morph@debian.org>  Wed, 12 Aug 2009 10:57:03 +0200
 
+reportbug (4.5ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #401925), remaining changes:
+   - bin/reportbug
+      + Make reportbug stop working for bts=ubuntu and refer to "ubuntu-bug"
+        instead.
+      + exit with an error, if bts=ubuntu (or unconfigured).
+    - reportbug/__init__.py: Match reportbug version with package version.
+    - debian/control: Add prominent note to package description.
+
+ -- Andres Rodriguez <andreserl@ubuntu.com>  Mon, 20 Jul 2009 15:47:06 -0500
+
 reportbug (4.5) unstable; urgency=low
 
   [ Sandro Tosi ]
@@ -2222,6 +2841,18 @@ reportbug (4.5) unstable; urgency=low
 
  -- Sandro Tosi <morph@debian.org>  Mon, 29 Jun 2009 18:14:33 +0200
 
+reportbug (4.4ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #382562), remaining changes:
+    - Make reportbug stop working for bts=ubuntu and refer to
+      "ubuntu-bug" instead
+    - reportbug: exit with an error, if bts=ubuntu (or unconfigured)
+    - Match reportbug version with package version.
+    - debian/control: add prominent note to package description
+    - debian/rules: Remove dh_desktop, no longer does anything.
+
+ -- Kenneth E. Drake <kd.drake@comcast.net>  Mon, 01 Jun 2009 16:06:13 -0500
+
 reportbug (4.4) unstable; urgency=low
 
   * reportbug/__init__.py
@@ -2284,6 +2915,25 @@ reportbug (4.3) unstable; urgency=low
 
  -- Sandro Tosi <morph@debian.org>  Sun, 24 May 2009 21:54:21 +0200
 
+reportbug (4.2ubuntu1) karmic; urgency=low
+
+  [ Kenneth E. Drake ]
+  * Merge with Debian unstable (LP: #378591), remaining changes:
+    - Make reportbug stop working for bts=ubuntu and refer to
+      "ubuntu-bug" instead
+    - reportbug: exit with an error, if bts=ubuntu (or unconfigured)
+    - Match reportbug version with package version.
+    - debian/control: add prominent note to package description
+    - debian/rules:
+      + Append "--install-layout=deb" to distutils install command.
+       This ensures installation to the correct directory with python2.6.
+      + Remove dh_desktop, no longer does anything.
+
+  [ Iain Lane ]
+  * bin/reportbug: Modify Ubuntu error  message to be slightly more explicit.
+
+ -- Kenneth E. Drake <kd.drake@comcast.net>  Wed, 20 May 2009 02:29:33 -0500
+
 reportbug (4.2) unstable; urgency=low
 
   [ Sandro Tosi ]
@@ -2507,6 +3157,16 @@ reportbug (3.99.0) experimental; urgency
 
  -- Sandro Tosi <morph@debian.org>  Thu, 23 Oct 2008 16:04:28 +0200
 
+reportbug (3.48ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable (LP: #314556), remaining changes:
+    - Make reportbug stop working for bts=ubuntu and refer to
+      "ubuntu-bug" instead
+    - reportbug: exit with an error, if bts=ubuntu (or unconfigured)
+    - debian/control: add prominent note to package description
+
+ -- Iain Lane <laney@ubuntu.com>  Tue, 06 Jan 2009 23:24:20 +0000
+
 reportbug (3.48) unstable; urgency=low
 
   [ Don Armstrong ]
@@ -2520,6 +3180,16 @@ reportbug (3.48) unstable; urgency=low
 
  -- Sandro Tosi <morph@debian.org>  Sun, 14 Dec 2008 15:39:20 +0100
 
+reportbug (3.47ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Make reportbug stop working for bts=ubuntu and refer to
+      "ubuntu-bug" instead (LP: #228183, #123414)
+    - reportbug: exit with an error, if bts=ubuntu (or unconfigured)
+    - debian/control: add prominent note to package description
+
+ -- Daniel Hahler <ubuntu@thequod.de>  Wed, 10 Dec 2008 21:52:53 +0100
+
 reportbug (3.47) unstable; urgency=low
 
   * reportbuglib/reportbug_ui_text.py
@@ -2649,6 +3319,28 @@ reportbug (3.42) unstable; urgency=low
 
  -- Sandro Tosi <matrixhasu@gmail.com>  Mon, 30 Jun 2008 00:39:27 +0200
 
+reportbug (3.41ubuntu2) intrepid; urgency=low
+
+  * reportbug: pick new shebang line from 3.42, which fixes import of
+    python-urwid (LP: #276062)
+
+ -- Daniel Hahler <ubuntu@thequod.de>  Mon, 29 Sep 2008 22:19:12 +0200
+
+reportbug (3.41ubuntu1) intrepid; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu specific changes:
+    - reportbug.conf:
+      - "bts ubuntu"
+      - "smtphost fiordland.ubuntu.com":
+        Added the fiordland.ubuntu.com SMTP server in reportbug.conf so
+        that reportbug works without a MTA.
+    - reportbug_submit.py: only display ubuntu-users specific message if
+      BTS "ubuntu" is used in send_report.
+    - reportbug.1: mention Ubuntu specific changes (LP: #163924)
+  * Fixes LP: #239124, #204009
+
+ -- Daniel Hahler <ubuntu@thequod.de>  Fri, 20 Jun 2008 18:11:24 +0200
+
 reportbug (3.41) unstable; urgency=high
 
   [ Sandro Tosi ]
@@ -2787,6 +3479,33 @@ reportbug (3.39-0.1) unstable; urgency=l
 
  -- Y Giridhar Appaji Nag <giridhar@appaji.net>  Sat, 22 Mar 2008 15:33:23 +0530
 
+reportbug (3.39ubuntu3) hardy; urgency=low
+
+  * reportbug.1: mention Ubuntu specific changes (LP: #163924)
+
+ -- Daniel Hahler <ubuntu@thequod.de>  Tue, 29 Jan 2008 23:41:19 +0100
+
+reportbug (3.39ubuntu2) hardy; urgency=low
+
+  * reportbug_submit.py: only display ubuntu-users specific message if
+    BTS "ubuntu" is used in send_report.
+    Restore the general debbugs message to be used in all other
+    cases. (LP: #114917)
+
+ -- dAniel hAhler <ubuntu@thequod.de>  Wed, 16 Jan 2008 01:54:11 +0100
+
+reportbug (3.39ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - send bug reports to the ubuntu-users mailing list.
+    - Added the fiordland.ubuntu.com SMTP server in reportbug.conf so
+      that reportbug works without a MTA.
+  * Add a -P option to allow to set pseudo-headers. This is useful to
+    set usertags at bug submission time. (patch is from Debian bug
+    #445144)
+
+ -- Lucas Nussbaum <lucas@lucas-nussbaum.net>  Wed, 03 Oct 2007 16:44:28 +0200
+
 reportbug (3.39) unstable; urgency=low
 
   * Add man page for reportbug.conf, thanks to Y Giridhar Appaji Nag.
@@ -2798,6 +3517,20 @@ reportbug (3.39) unstable; urgency=low
 
  -- Chris Lawrence <lawrencc@debian.org>  Thu, 16 Aug 2007 17:40:08 -0500
 
+reportbug (3.38ubuntu2) gutsy; urgency=low
+
+  * Added the fiordland.ubuntu.com SMTP server in reportbug.conf so that
+    reportbug works without a MTA.
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Sat, 16 Jun 2007 17:00:42 +1000
+
+reportbug (3.38ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - send bug reports to the the ubuntu-users mailing list
+
+ -- Andrea Veri <bluekuja@ubuntu.com>  Sat, 12 May 2007 12:01:49 +0200
+
 reportbug (3.38) unstable; urgency=low
 
   * Use apt-cache showsrc and apt-cache show to eliminate churns of the
@@ -2807,6 +3540,14 @@ reportbug (3.38) unstable; urgency=low
 
  -- Chris Lawrence <lawrencc@debian.org>  Fri, 11 May 2007 21:00:36 -0500
 
+reportbug (3.37ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - send bug reports to the the ubuntu-users mailing list
+  * Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Kjell Braden <fnord@pentabarf.de>  Sat,  5 May 2007 09:29:23 +0200
+
 reportbug (3.37) unstable; urgency=low
 
   * More Unicode cleanups (Closes: #420038)
diff -pruN 11.6.0/debian/control 11.6.0ubuntu2/debian/control
--- 11.6.0/debian/control	2022-08-17 18:48:30.000000000 +0000
+++ 11.6.0ubuntu2/debian/control	2023-02-01 10:01:21.000000000 +0000
@@ -1,7 +1,8 @@
 Source: reportbug
 Section: utils
 Priority: standard
-Maintainer: Reportbug Maintainers <debian-reportbug@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Reportbug Maintainers <debian-reportbug@lists.debian.org>
 Uploaders: Sandro Tosi <morph@debian.org>,
            Nis Martensen <nis.martensen@web.de>,
 Standards-Version: 4.6.1
@@ -52,6 +53,10 @@ Description: reports bugs in the Debian
  .
  This package also includes the "querybts" script for browsing the
  Debian bug tracking system.
+ .
+ REPORTBUG IS MEANT FOR UBUNTU DEVELOPERS TO FORWARD BUGS TO DEBIAN.
+ IF YOU WANT TO REPORT A BUG IN UBUNTU, PLEASE USE "ubuntu-bug"
+ INSTEAD (from the "apport" package).
 
 Package: python3-reportbug
 Section: python
diff -pruN 11.6.0/debian/make_pep440_compliant 11.6.0ubuntu2/debian/make_pep440_compliant
--- 11.6.0/debian/make_pep440_compliant	1970-01-01 00:00:00.000000000 +0000
+++ 11.6.0ubuntu2/debian/make_pep440_compliant	2023-02-01 10:02:19.000000000 +0000
@@ -0,0 +1,24 @@
+#!/usr/bin/python3
+
+import re
+import sys
+
+
+def make_pep440_compliant(version: str) -> str:
+    """Convert the version into a PEP440 compliant version."""
+    public_version_re = re.compile(
+        r"^([0-9][0-9.]*(?:(?:a|b|rc|.post|.dev)[0-9]+)*)\+?"
+    )
+    _, public, local = public_version_re.split(version, maxsplit=1)
+    if not local:
+        return version
+    sanitized_local = re.sub("[+~]+", ".", local).strip(".")
+    pep440_version = f"{public}+{sanitized_local}"
+    assert re.match(
+        "^[a-zA-Z0-9.]+$", sanitized_local
+    ), f"'{pep440_version}' not PEP440 compliant"
+    return pep440_version
+
+
+if __name__ == "__main__":
+    print(make_pep440_compliant(sys.argv[1]))
diff -pruN 11.6.0/debian/rules 11.6.0ubuntu2/debian/rules
--- 11.6.0/debian/rules	2022-04-18 16:33:14.000000000 +0000
+++ 11.6.0ubuntu2/debian/rules	2023-02-01 10:02:19.000000000 +0000
@@ -3,15 +3,16 @@
 include /usr/share/dpkg/pkg-info.mk
 
 REPORTBUG_VERSION := $(shell python3 -c "import reportbug; print(reportbug.VERSION_NUMBER)")
+PEP440_DEB_VERSION := $(shell debian/make_pep440_compliant "$(DEB_VERSION)")
 
 %:
 	dh $@ --with=python3
 
 override_dh_auto_build:
 	# Test if versions are synchronized (only if releasing); this will bomb if not synced
-	if [ "$(DEB_DISTRIBUTION)" != "UNRELEASED" -a "$(REPORTBUG_VERSION)" != "$(DEB_VERSION)" ] ; \
+	if [ "$(DEB_DISTRIBUTION)" != "UNRELEASED" -a "$(REPORTBUG_VERSION)" != "$(PEP440_DEB_VERSION)" ] ; \
 	then \
-		echo 'Please update VERSION_NUMBER variable in reportbug/__init__.py'; exit 1 ; \
+		echo 'Please update VERSION_NUMBER variable in reportbug/__init__.py to $(PEP440_DEB_VERSION)'; exit 1 ; \
 	fi
 
 	python3 setup.py build
diff -pruN 11.6.0/reportbug/__init__.py 11.6.0ubuntu2/reportbug/__init__.py
--- 11.6.0/reportbug/__init__.py	2022-12-04 18:28:36.000000000 +0000
+++ 11.6.0ubuntu2/reportbug/__init__.py	2023-02-01 10:03:46.000000000 +0000
@@ -25,7 +25,7 @@ SOFTWARE."""
 __all__ = ['bugreport', 'utils', 'urlutils', 'checkbuildd', 'checkversions',
            'debbugs', 'exceptions', 'submit', 'tempfile', 'mailer']
 
-VERSION_NUMBER = "11.6.0"
+VERSION_NUMBER = "11.6.0+ubuntu2"
 
 VERSION = "reportbug " + VERSION_NUMBER
 COPYRIGHT = VERSION + '\nCopyright (C) 1999-2008 Chris Lawrence <lawrencc@debian.org>' + \
