Merge ~vmpyr/ubuntu/+source/lptools:merge-lp2131992-resolute into ubuntu/+source/lptools:debian/sid

[Ujjwal Sarswat]

[Ujjwal Sarswat (vmpyr)]

PPA: https://launchpad.net/~vmpyr/+archive/ubuntu/merges/

Basic test:
Installing and Upgrading the package. Binary is working as expected (as much testing possible on a lxc)

Package tests:
This package contains no tests.

Note:
Build for [amd64v3](https://launchpadlibrarian.net/832474212/buildlog_ubuntu-resolute-amd64v3.lptools_0.3.0-4ubuntu1_BUILDING.txt.gz) failed because of a bug in launchpad. The other builds worked fine.

[Benjamin Drung (bdrung)]

0.3.0-4ubuntu1 has been sponsored by someone already.

review: Approve

Unmerged commits

dd0545a... by Ujjwal Sarswat on 2025-11-20

update-maintainer

7ed2063... by Ujjwal Sarswat on 2025-11-20

changelog

ba3417d... by Sudip Mukherjee on 2024-02-07

Drop python3-indicate from Recommends

Signed-off-by: Sudip Mukherjee <email address hidden>

bea6e34... by Sudip Mukherjee on 2024-02-07

Add support for credentials-file in lp-shell

Signed-off-by: Sudip Mukherjee <email address hidden>

00c3c68... by Sudip Mukherjee on 2024-02-07

d/p/failure-to-decompress.patch: don't crash when an attachment cannot be downloaded because it fails to decompress.

Signed-off-by: Sudip Mukherjee <email address hidden>

c1bc162... by Sudip Mukherjee on 2024-02-07

Default to devel api level, as all others are dated now

Signed-off-by: Sudip Mukherjee <email address hidden>

diff --git a/debian/changelog b/debian/changelog
index 9a5b3f1..b579dfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+lptools (0.3.0-4ubuntu1) resolute; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Default to devel api level, as all others are dated now
+    - d/p/failure-to-decompress.patch: don't crash when an attachment cannot be downloaded because it fails to decompress.
+    - Add support for credentials-file in lp-shell
+    - Drop python3-indicate from Recommends
+
+ -- Ujjwal Sarswat <[e-mail]>  Thu, 20 Nov 2025 11:50:18 +0530
+
 lptools (0.3.0-4) unstable; urgency=medium
 
   * Adopt package. (Closes: #1112689)
@@ -14,12 +24,42 @@ lptools (0.3.0-3) unstable; urgency=medium
 
  -- Jelmer Vernooij <[e-mail]>  Sun, 31 Aug 2025 22:43:50 +0100
 
+lptools (0.3.0-2.1ubuntu1) questing; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Default to devel api level, as all others are dated now.
+    - d/p/failure-to-decompress.patch: don't crash when an attachment
+      cannot be downloaded because it fails to decompress.
+    - Drop python3-indicate from Recommends.
+    - Add support for credentials-file in lp-shell
+  * Drop Changes:
+    - d/control: Add runtime dependency on python3-keyring.
+      [Fixed in 0.3.0-2.1]
+
+ -- Sudip Mukherjee <[e-mail]>  Wed, 14 May 2025 19:51:20 +0100
+
 lptools (0.3.0-2) unstable; urgency=medium
 
   * Add missing build-dependency on python3-setuptools. Closes: #1080661
 
  -- Jelmer Vernooij <[e-mail]>  Fri, 14 Mar 2025 19:33:32 +0000
 
+lptools (0.3.0-1ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Default to devel api level, as all others are dated now.
+    - d/p/failure-to-decompress.patch: don't crash when an attachment
+      cannot be downloaded because it fails to decompress.
+    - Drop python3-indicate from Recommends.
+    - Add support for credentials-file in lp-shell
+  * Drop Changes:
+    - d/p/03_ipython_import: Use the updated import path for ipython's
+      InteractiveShellEmbed.
+  * New Changes:
+    - d/control: Add runtime dependency on python3-keyring.
+
+ -- Sudip Mukherjee <[e-mail]>  Thu, 08 Feb 2024 07:12:49 +0000
+
 lptools (0.3.0-1) unstable; urgency=medium
 
   * New upstream release.
@@ -36,6 +76,23 @@ lptools (0.2.0+bzr48-1) unstable; urgency=low
 
  -- Jelmer Vernooij <[e-mail]>  Thu, 28 Sep 2023 13:07:42 +0100
 
+lptools (0.2.0-7ubuntu2) mantic; urgency=medium
+
+  * d/p/03_ipython_import: Use the updated import path for ipython's
+    InteractiveShellEmbed. (LP: #2017644)
+
+ -- Brian Murray <[e-mail]>  Fri, 22 Sep 2023 14:22:16 -0700
+
+lptools (0.2.0-7ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Default to devel api level, as all others are dated now.
+    - d/p/failure-to-decompress.patch: don't crash when an attachment
+      cannot be downloaded because it fails to decompress.
+    - Drop python3-indicate from Recommends.
+
+ -- Brian Murray <[e-mail]>  Tue, 16 Feb 2021 13:55:52 -0800
+
 lptools (0.2.0-7) unstable; urgency=medium
 
   [ dann frazier ]
@@ -55,6 +112,23 @@ lptools (0.2.0-6) unstable; urgency=medium
 
  -- Jelmer Vernooij <[e-mail]>  Wed, 22 Apr 2020 01:42:55 +0000
 
+lptools (0.2.0-5ubuntu2) focal; urgency=medium
+
+  * Add support for credentials-file in lp-shell.
+
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 09 Apr 2020 18:45:19 +0100
+
+lptools (0.2.0-5ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Default to devel api level, as all others are dated now.
+    - d/p/failure-to-decompress.patch: don't crash when an attachment
+      cannot be downloaded because it fails to decompress.
+    - Move to python3.
+    - Drop python3-indicate, python3-gtk2 from Recommends.
+
+ -- Steve Langasek <[e-mail]>  Sat, 01 Feb 2020 19:24:44 -0800
+
 lptools (0.2.0-5) unstable; urgency=medium
 
   * Add patch 02_python3: Convert to Python 3. Closes: #936967
@@ -87,6 +161,25 @@ lptools (0.2.0-3) unstable; urgency=medium
 
  -- Jelmer Vernooij <[e-mail]>  Sun, 27 Jan 2019 19:16:42 +0000
 
+lptools (0.2.0-2ubuntu3) focal; urgency=medium
+
+  * Move to python3.
+
+ -- Steve Langasek <[e-mail]>  Tue, 03 Dec 2019 21:55:45 -0800
+
+lptools (0.2.0-2ubuntu2) artful; urgency=medium
+
+  * d/p/failure-to-decompress.patch: don't crash when an attachment
+    cannot be downloaded because it fails to decompress.
+
+ -- Brian Murray <[e-mail]>  Tue, 11 Jul 2017 10:55:18 -0700
+
+lptools (0.2.0-2ubuntu1) xenial; urgency=medium
+
+  * Default to devel api level, as all others are dated now.
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 09 Feb 2016 13:45:05 +0000
+
 lptools (0.2.0-2) unstable; urgency=low
 
   [ Nathan Handler ]
@@ -180,3 +273,4 @@ lptools (0.0.0-0ubuntu1~ppa1) karmic; urgency=low
   * Initial release.
 
  -- Ted Gould <[e-mail]>  Fri, 11 Sep 2009 22:55:05 -0500
+
diff --git a/debian/control b/debian/control
index 05ca39d..65a020e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: lptools
 Section: python
 Priority: optional
 Build-Depends: python3-all, dh-python, debhelper-compat (= 13), python3-setuptools, python3-keyring
-Maintainer: Sudip Mukherjee <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Sudip Mukherjee <[e-mail]>
 Standards-Version: 4.7.2
 Vcs-Git: https://salsa.debian.org/debian/lptools.git
 Vcs-Browser: https://salsa.debian.org/debian/lptools
@@ -13,7 +14,7 @@ Package: lptools
 Architecture: all
 Breaks: ubuntu-dev-tools (<< 0.129)
 Replaces: ubuntu-dev-tools (<< 0.129)
-Recommends: python3-chameleon, python3-indicate
+Recommends: python3-chameleon
 Suggests: python3-tdb
 Depends: python3 | ipython3,
          python3-breezy,
diff --git a/debian/patches/default-devel.patch b/debian/patches/default-devel.patch
new file mode 100644
index 0000000..6f63911
--- /dev/null
+++ b/debian/patches/default-devel.patch
@@ -0,0 +1,25 @@
+Description: Default to devel api level, as all others are dated now.
+Author: Dimitri John Ledkov <[e-mail]>
+
+Index: lptools-0.2.0-7ubuntu1/bin/lp-shell
+===================================================================
+--- lptools-0.2.0-7ubuntu1.orig/bin/lp-shell
++++ lptools-0.2.0-7ubuntu1/bin/lp-shell
+@@ -29,7 +29,7 @@ def run_command(command, lp):
+ def main():
+     instance = 'production'
+     valid_api_versions = ('beta', '1.0', 'devel')
+-    api_version = '1.0'
++    api_version = 'devel'
+ 
+     usage = 'Usage: %prog [-a] [instance] [LP API version]'
+     opt_parser = OptionParser(usage)
+@@ -61,7 +61,7 @@ def main():
+             api_version = args[1]
+         else:
+             print('E: "%s" is not a valid LP API version.' % (args[1]))
+-            print('I: Falling back to "1.0".')
++            print('I: Falling back to "devel".')
+ 
+     if options.anonymous:
+         launchpad = Launchpad.login_anonymously('lp-shell', instance,
diff --git a/debian/patches/failure-to-decompress.patch b/debian/patches/failure-to-decompress.patch
new file mode 100644
index 0000000..40470bc
--- /dev/null
+++ b/debian/patches/failure-to-decompress.patch
@@ -0,0 +1,27 @@
+Description: continue if an attachment fails to decompress
+ Seen with one of the attachments in bug 1701847
+Author: Brian Murray <[e-mail]>
+
+--- lptools-0.2.0.orig/bin/lp-grab-attachments
++++ lptools-0.2.0/bin/lp-grab-attachments
+@@ -20,6 +20,7 @@
+ #
+ # ##################################################################
+ 
++from httplib2 import FailedToDecompressContent
+ from optparse import OptionParser
+ import codecs
+ import errno
+@@ -49,7 +50,11 @@ def download_attachments(bug, descriptio
+         local_file.close()
+ 
+     for attachment in bug.attachments:
+-        f = attachment.data.open()
++        try:
++            f = attachment.data.open()
++        except FailedToDecompressContent:
++            print("Failed to download %s" % attachment.title)
++            continue
+         filename = os.path.join(os.getcwd(), bug_folder_name, f.filename)
+         local_file = open(filename, "w")
+         local_file.write(f.read())
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8b0e184
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+default-devel.patch
+failure-to-decompress.patch
+support-credentials-file.patch
diff --git a/debian/patches/support-credentials-file.patch b/debian/patches/support-credentials-file.patch
new file mode 100644
index 0000000..fa73a40
--- /dev/null
+++ b/debian/patches/support-credentials-file.patch
@@ -0,0 +1,24 @@
+Description: Add support for credentials-file in lp-shell.
+Author: Dimitri John Ledkov <[e-mail]>
+
+
+--- lptools-0.2.0.orig/bin/lp-shell
++++ lptools-0.2.0/bin/lp-shell
+@@ -39,6 +39,9 @@ def main():
+     opt_parser.add_option('-c', type=str,
+                           dest='command', default=None,
+                           help='Run code passed as string.')
++    opt_parser.add_option('--credentials-file', type=str,
++                          default=None,
++                          help='Use unecrypted credentials file')
+     opt_parser.add_option('--ipython', action='store_const',
+                           dest='shell', const='ipython', default="ipython",
+                           help='Use ipython shell (default).')
+@@ -70,6 +73,7 @@ def main():
+                   '"%s":' % (instance, api_version))
+     else:
+         launchpad = Launchpad.login_with('lp-shell', instance,
++                                         credentials_file=options.credentials_file,
+                                          version=api_version)
+         banner = 'Connected to LP service "%s" with API version "%s":' % \
+                  (instance, api_version)