Bug#1032052: python-apt: diff for NMU version 2.5.2+nmu1
Package: python-apt
Version: 2.5.2
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for python-apt (versioned as 2.5.2+nmu1). The diff
is attached to this message.
Regards.
diff -Nru python-apt-2.5.2/apt/package.py python-apt-2.5.2+nmu1/apt/package.py
--- python-apt-2.5.2/apt/package.py 2023-01-23 09:51:16.000000000 +0000
+++ python-apt-2.5.2+nmu1/apt/package.py 2023-02-20 12:21:39.000000000 +0000
@@ -878,7 +878,7 @@
% (
self.package.name,
self.version,
- getattr(index, "describe", "<unkown>"),
+ getattr(index, "describe", "<unknown>"),
)
)
if not self.uri:
diff -Nru python-apt-2.5.2/debian/changelog python-apt-2.5.2+nmu1/debian/changelog
--- python-apt-2.5.2/debian/changelog 2023-01-23 09:51:16.000000000 +0000
+++ python-apt-2.5.2+nmu1/debian/changelog 2023-02-20 12:48:12.000000000 +0000
@@ -1,3 +1,10 @@
+python-apt (2.5.2+nmu1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix typo from "unkown" to "unknown"
+
+ -- Aristo Chen <aristo.chen@canonical.com> Mon, 20 Feb 2023 12:48:12 +0000
+
python-apt (2.5.2) unstable; urgency=medium
[ Jelmer Vernooij ]
diff -Nru python-apt-2.5.2/po/python-apt.pot python-apt-2.5.2+nmu1/po/python-apt.pot
--- python-apt-2.5.2/po/python-apt.pot 2023-01-23 09:51:16.000000000 +0000
+++ python-apt-2.5.2+nmu1/po/python-apt.pot 2023-02-20 12:44:57.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-30 17:37+0100\n"
+"POT-Creation-Date: 2023-02-20 12:44+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -74,7 +74,7 @@
msgstr ""
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:140 ../data/templates/Debian.info.in:90
+#: ../data/templates/Ubuntu.info.in:140 ../data/templates/Debian.info.in:113
msgid "Officially supported"
msgstr ""
@@ -119,7 +119,7 @@
msgstr ""
#. Description
-#: ../data/templates/Ubuntu.info.in:195 ../data/templates/Debian.info.in:36
+#: ../data/templates/Ubuntu.info.in:195 ../data/templates/Debian.info.in:53
msgid "Recommended updates"
msgstr ""
@@ -136,51 +136,57 @@
#. ChangelogURI
#: ../data/templates/Debian.info.in.h:4
#, no-c-format
-msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog";
+msgid ""
+"https://metadata.ftp-master.debian.org/changelogs/%s/%s/%s/%s_%s_changelog";
msgstr ""
#. Description
-#: ../data/templates/Debian.info.in:9
+#: ../data/templates/Debian.info.in:25
msgid "Debian {version} '{codename}'"
msgstr ""
#. Description
-#: ../data/templates/Debian.info.in:30
+#: ../data/templates/Debian.info.in:47
msgid "Security updates"
msgstr ""
#. Description
-#: ../data/templates/Debian.info.in:42
+#: ../data/templates/Debian.info.in:59
msgid "Proposed updates"
msgstr ""
#. Description
-#: ../data/templates/Debian.info.in:49
+#: ../data/templates/Debian.info.in:66
msgid "Debian current stable release"
msgstr ""
#. Description
-#: ../data/templates/Debian.info.in:62
+#: ../data/templates/Debian.info.in:81
msgid "Debian testing"
msgstr ""
#. Description
-#: ../data/templates/Debian.info.in:88
+#: ../data/templates/Debian.info.in:111
msgid "Debian 'Sid' (unstable)"
msgstr ""
#. CompDescription
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:115
msgid "DFSG-compatible Software with Non-Free Dependencies"
msgstr ""
#. CompDescription
-#: ../data/templates/Debian.info.in:94
+#: ../data/templates/Debian.info.in:117
+msgid "Non-DFSG-compatible Firmware for Hardware Support"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Debian.info.in:119
msgid "Non-DFSG-compatible Software"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:215 ../aptsources/distro.py:446
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:461
#, python-format
msgid "Server for %s"
msgstr ""
@@ -188,31 +194,31 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../aptsources/distro.py:233 ../aptsources/distro.py:239
-#: ../aptsources/distro.py:255
+#: ../aptsources/distro.py:225 ../aptsources/distro.py:237
+#: ../aptsources/distro.py:258
msgid "Main server"
msgstr ""
-#: ../aptsources/distro.py:259
+#: ../aptsources/distro.py:267
msgid "Custom servers"
msgstr ""
-#: ../apt/package.py:592
+#: ../apt/package.py:619
#, python-format
msgid "Missing description for '%s'.Please report."
msgstr ""
-#: ../apt/package.py:600
+#: ../apt/package.py:629
#, python-format
msgid "Invalid unicode in description for '%s' (%s). Please report."
msgstr ""
-#: ../apt/package.py:1276 ../apt/package.py:1288 ../apt/package.py:1397
-#: ../apt/package.py:1411
+#: ../apt/package.py:1330 ../apt/package.py:1346 ../apt/package.py:1459
+#: ../apt/package.py:1475
msgid "The list of changes is not available"
msgstr ""
-#: ../apt/package.py:1404
+#: ../apt/package.py:1467
#, python-format
msgid ""
"The list of changes is not available yet.\n"
@@ -221,18 +227,18 @@
"until the changes become available or try again later."
msgstr ""
-#: ../apt/package.py:1417
+#: ../apt/package.py:1482
msgid ""
"Failed to download the list of changes. \n"
"Please check your Internet connection."
msgstr ""
-#: ../apt/debfile.py:97
+#: ../apt/debfile.py:96
#, python-format
msgid "List of files for '%s' could not be read"
msgstr ""
-#: ../apt/debfile.py:110
+#: ../apt/debfile.py:108
#, python-format
msgid "List of control files for '%s' could not be read"
msgstr ""
@@ -242,72 +248,73 @@
msgid "Dependency is not satisfiable: %s\n"
msgstr ""
-#: ../apt/debfile.py:268
+#: ../apt/debfile.py:272
#, python-format
msgid "Conflicts with the installed package '%s'"
msgstr ""
-#: ../apt/debfile.py:428
+#: ../apt/debfile.py:434
#, python-format
msgid ""
"Breaks existing package '%(pkgname)s' dependency %(depname)s "
"(%(deprelation)s %(depversion)s)"
msgstr ""
-#: ../apt/debfile.py:455
+#: ../apt/debfile.py:465
#, python-format
msgid ""
"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
"%(targetver)s)"
msgstr ""
-#: ../apt/debfile.py:469
+#: ../apt/debfile.py:482
#, python-format
msgid ""
"Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But "
"the '%(debfile)s' provides it via: '%(provides)s'"
msgstr ""
-#: ../apt/debfile.py:528
+#: ../apt/debfile.py:543
msgid "No Architecture field in the package"
msgstr ""
-#: ../apt/debfile.py:538
+#: ../apt/debfile.py:555
#, python-format
msgid ""
"Wrong architecture '%s' -- Run dpkg --add-architecture to add it and update "
"afterwards"
msgstr ""
-#: ../apt/debfile.py:549
+#. the deb is older than the installed
+#: ../apt/debfile.py:570
msgid "A later version is already installed"
msgstr ""
-#: ../apt/debfile.py:574
+#: ../apt/debfile.py:596
msgid "Failed to satisfy all dependencies (broken cache)"
msgstr ""
-#: ../apt/debfile.py:605
+#: ../apt/debfile.py:627
#, python-format
msgid "Cannot install '%s'"
msgstr ""
-#: ../apt/debfile.py:687
+#: ../apt/debfile.py:707
msgid ""
"Automatically decompressed:\n"
"\n"
msgstr ""
-#: ../apt/debfile.py:693
+#: ../apt/debfile.py:713
msgid "Automatically converted to printable ascii:\n"
msgstr ""
-#: ../apt/debfile.py:804
+#: ../apt/debfile.py:824
#, python-format
msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
msgstr ""
-#: ../apt/debfile.py:819
+#: ../apt/debfile.py:838
msgid "An essential package would be removed"
msgstr ""
@@ -316,27 +323,27 @@
msgid "%c%s... Done"
msgstr ""
-#: ../apt/progress/text.py:140
+#: ../apt/progress/text.py:143
msgid "Hit "
msgstr ""
-#: ../apt/progress/text.py:150
+#: ../apt/progress/text.py:153
msgid "Ign "
msgstr ""
-#: ../apt/progress/text.py:152
+#: ../apt/progress/text.py:155
msgid "Err "
msgstr ""
-#: ../apt/progress/text.py:164
+#: ../apt/progress/text.py:167
msgid "Get:"
msgstr ""
-#: ../apt/progress/text.py:231
+#: ../apt/progress/text.py:238
msgid " [Working]"
msgstr ""
-#: ../apt/progress/text.py:243
+#: ../apt/progress/text.py:252
#, python-format
msgid ""
"Media change: please insert the disc labeled\n"
@@ -344,16 +351,15 @@
"in the drive '%s' and press enter\n"
msgstr ""
-#. Trick for getting a translation from apt
-#: ../apt/progress/text.py:253
+#: ../apt/progress/text.py:267
#, python-format
msgid "Fetched %sB in %s (%sB/s)\n"
msgstr ""
-#: ../apt/progress/text.py:270
+#: ../apt/progress/text.py:291
msgid "Please provide a name for this medium, such as 'Debian 2.1r1 Disk 1'"
msgstr ""
-#: ../apt/progress/text.py:288
+#: ../apt/progress/text.py:312
msgid "Please insert an installation medium and press enter"
msgstr ""
diff -Nru python-apt-2.5.2/python_apt.egg-info/PKG-INFO python-apt-2.5.2+nmu1/python_apt.egg-info/PKG-INFO
--- python-apt-2.5.2/python_apt.egg-info/PKG-INFO 1970-01-01 00:00:00.000000000 +0000
+++ python-apt-2.5.2+nmu1/python_apt.egg-info/PKG-INFO 2023-02-20 12:44:58.000000000 +0000
@@ -0,0 +1,10 @@
+Metadata-Version: 2.1
+Name: python-apt
+Version: 2.5.2+nmu1
+Summary: Python bindings for APT
+Author: APT Development Team
+Author-email: deity@lists.debian.org
+License: GNU GPL
+Platform: posix
+License-File: COPYING.GPL
+License-File: AUTHORS
diff -Nru python-apt-2.5.2/python_apt.egg-info/SOURCES.txt python-apt-2.5.2+nmu1/python_apt.egg-info/SOURCES.txt
--- python-apt-2.5.2/python_apt.egg-info/SOURCES.txt 1970-01-01 00:00:00.000000000 +0000
+++ python-apt-2.5.2+nmu1/python_apt.egg-info/SOURCES.txt 2023-02-20 12:44:58.000000000 +0000
@@ -0,0 +1,59 @@
+AUTHORS
+COPYING.GPL
+README.md
+setup.cfg
+setup.py
+apt/__init__.py
+apt/auth.py
+apt/cache.py
+apt/cdrom.py
+apt/debfile.py
+apt/package.py
+apt/py.typed
+apt/utils.py
+apt/progress/__init__.py
+apt/progress/base.py
+apt/progress/text.py
+aptsources/__init__.py
+aptsources/_deb822.py
+aptsources/distinfo.py
+aptsources/distro.py
+aptsources/sourceslist.py
+data/templates/Blankon.mirrors
+data/templates/Debian.mirrors
+data/templates/Kali.mirrors
+data/templates/Tanglu.mirrors
+data/templates/Ubuntu.mirrors
+data/templates/gNewSense.mirrors
+python/acquire-item.cc
+python/acquire.cc
+python/apt_instmodule.cc
+python/apt_pkgmodule.cc
+python/arfile.cc
+python/cache.cc
+python/cachegroup.cc
+python/cdrom.cc
+python/configuration.cc
+python/depcache.cc
+python/generic.cc
+python/hashes.cc
+python/hashstring.cc
+python/hashstringlist.cc
+python/indexfile.cc
+python/lock.cc
+python/metaindex.cc
+python/orderlist.cc
+python/pkgmanager.cc
+python/pkgrecords.cc
+python/pkgsrcrecords.cc
+python/policy.cc
+python/progress.cc
+python/python-apt-helpers.cc
+python/sourcelist.cc
+python/string.cc
+python/tag.cc
+python/tarfile.cc
+python_apt.egg-info/PKG-INFO
+python_apt.egg-info/SOURCES.txt
+python_apt.egg-info/dependency_links.txt
+python_apt.egg-info/top_level.txt
\ No newline at end of file
diff -Nru python-apt-2.5.2/python_apt.egg-info/dependency_links.txt python-apt-2.5.2+nmu1/python_apt.egg-info/dependency_links.txt
--- python-apt-2.5.2/python_apt.egg-info/dependency_links.txt 1970-01-01 00:00:00.000000000 +0000
+++ python-apt-2.5.2+nmu1/python_apt.egg-info/dependency_links.txt 2023-02-20 12:44:58.000000000 +0000
@@ -0,0 +1 @@
+
diff -Nru python-apt-2.5.2/python_apt.egg-info/top_level.txt python-apt-2.5.2+nmu1/python_apt.egg-info/top_level.txt
--- python-apt-2.5.2/python_apt.egg-info/top_level.txt 1970-01-01 00:00:00.000000000 +0000
+++ python-apt-2.5.2+nmu1/python_apt.egg-info/top_level.txt 2023-02-20 12:44:58.000000000 +0000
@@ -0,0 +1,4 @@
+apt
+apt_inst
+apt_pkg
+aptsources
diff -Nru python-apt-2.5.2/tests/data/aptsources/sources.list.enable_comps python-apt-2.5.2+nmu1/tests/data/aptsources/sources.list.enable_comps
--- python-apt-2.5.2/tests/data/aptsources/sources.list.enable_comps 1970-01-01 00:00:00.000000000 +0000
+++ python-apt-2.5.2+nmu1/tests/data/aptsources/sources.list.enable_comps 2023-02-20 12:44:44.000000000 +0000
@@ -0,0 +1 @@
+deb http://archive.ubuntu.com/ubuntu lucid main
Binary files /tmp/PR208a5Zs7/python-apt-2.5.2/tests/data/test-provides/var/cache/apt/pkgcache.bin and /tmp/NAfTWFuSuq/python-apt-2.5.2+nmu1/tests/data/test-provides/var/cache/apt/pkgcache.bin differ
Binary files /tmp/PR208a5Zs7/python-apt-2.5.2/tests/data/test-provides/var/cache/apt/srcpkgcache.bin and /tmp/NAfTWFuSuq/python-apt-2.5.2+nmu1/tests/data/test-provides/var/cache/apt/srcpkgcache.bin differ
diff -Nru python-apt-2.5.2/tests/data/tmp/etc/apt/sources.list python-apt-2.5.2+nmu1/tests/data/tmp/etc/apt/sources.list
--- python-apt-2.5.2/tests/data/tmp/etc/apt/sources.list 1970-01-01 00:00:00.000000000 +0000
+++ python-apt-2.5.2+nmu1/tests/data/tmp/etc/apt/sources.list 2023-02-20 12:44:55.000000000 +0000
@@ -0,0 +1 @@
+deb-src [trusted=yes] copy:/home/vagrant/aristo/python-apt-2.5.2+nmu1/tests/data/test-source-repo /
Binary files /tmp/PR208a5Zs7/python-apt-2.5.2/tests/data/tmp/var/cache/apt/pkgcache.bin and /tmp/NAfTWFuSuq/python-apt-2.5.2+nmu1/tests/data/tmp/var/cache/apt/pkgcache.bin differ
Binary files /tmp/PR208a5Zs7/python-apt-2.5.2/tests/data/tmp/var/cache/apt/srcpkgcache.bin and /tmp/NAfTWFuSuq/python-apt-2.5.2+nmu1/tests/data/tmp/var/cache/apt/srcpkgcache.bin differ
diff -Nru python-apt-2.5.2/tests/data/tmp/var/lib/apt/lists/_home_vagrant_aristo_python-apt-2.5.2+nmu1_tests_data_test-source-repo_Sources python-apt-2.5.2+nmu1/tests/data/tmp/var/lib/apt/lists/_home_vagrant_aristo_python-apt-2.5.2+nmu1_tests_data_test-source-repo_Sources
--- python-apt-2.5.2/tests/data/tmp/var/lib/apt/lists/_home_vagrant_aristo_python-apt-2.5.2+nmu1_tests_data_test-source-repo_Sources 1970-01-01 00:00:00.000000000 +0000
+++ python-apt-2.5.2+nmu1/tests/data/tmp/var/lib/apt/lists/_home_vagrant_aristo_python-apt-2.5.2+nmu1_tests_data_test-source-repo_Sources 2023-01-23 09:51:16.000000000 +0000
@@ -0,0 +1,25 @@
+Package: dh-autoreconf
+Format: 3.0 (native)
+Binary: dh-autoreconf
+Architecture: all
+Version: 16
+Maintainer: Julian Andres Klode <jak@debian.org>
+Standards-Version: 4.1.1
+Build-Depends: debhelper (>= 9)
+Vcs-Browser: https://anonscm.debian.org/git/collab-maint/dh-autoreconf.git
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/dh-autoreconf.git
+Package-List:
+ dh-autoreconf deb devel optional arch=all
+Files:
+ 6576a28fe1918ce10bd31543ba545901 1578 dh-autoreconf_16.dsc
+ 302c8bf43db02412e3f2197fd0f2ee0f 7372 dh-autoreconf_16.tar.xz
+Checksums-Sha1:
+ c9bf7a920013021dad5fbd898dfd5a79c7a150f9 1578 dh-autoreconf_16.dsc
+ 58459600164398ad6807ddd877a6f814c799c62c 7372 dh-autoreconf_16.tar.xz
+Checksums-Sha256:
+ 1c1b2ab5f1ae5496bd50dbb3c30e9b7d181a06c8d02ee8d7e9c35ed6f2a69b5f 1578 dh-autoreconf_16.dsc
+ 5c6a6a362907327bec77a867ff3fd0eceba8015d1b881b48275aff7e4ce0f629 7372 dh-autoreconf_16.tar.xz
+Checksums-Sha512:
+ 4b1a3299f2a8b01b0c75db97fd16cb39919949c74d19ea6cf28e1bbd4891d3515b3e2b90b96a64df665cebf6d95409e704e670909ae91fcfe92409ee1339bffc 1578 dh-autoreconf_16.dsc
+ 10448dd179ec12bf4310a9a514110a85f56e51893aa36a97ac3a6f8d7ce99d099e62cfdb78e271e2d94431e8832da0f643de821b6643b80e3f0b0f5d682cf9a9 7372 dh-autoreconf_16.tar.xz
+
diff -Nru python-apt-2.5.2/tests/fetch_sources.list python-apt-2.5.2+nmu1/tests/fetch_sources.list
--- python-apt-2.5.2/tests/fetch_sources.list 1970-01-01 00:00:00.000000000 +0000
+++ python-apt-2.5.2+nmu1/tests/fetch_sources.list 2023-02-20 12:44:51.000000000 +0000
@@ -0,0 +1 @@
+deb [allow-insecure=yes] file:/home/vagrant/aristo/python-apt-2.5.2+nmu1/tests/data/fake-packages/ /
diff -Nru python-apt-2.5.2/tests/tmp/_home_vagrant_aristo_python-apt-2.5.2+nmu1_tests_data_fake-packages_Packages python-apt-2.5.2+nmu1/tests/tmp/_home_vagrant_aristo_python-apt-2.5.2+nmu1_tests_data_fake-packages_Packages
--- python-apt-2.5.2/tests/tmp/_home_vagrant_aristo_python-apt-2.5.2+nmu1_tests_data_fake-packages_Packages 1970-01-01 00:00:00.000000000 +0000
+++ python-apt-2.5.2+nmu1/tests/tmp/_home_vagrant_aristo_python-apt-2.5.2+nmu1_tests_data_fake-packages_Packages 2023-01-23 09:51:16.000000000 +0000
@@ -0,0 +1,21 @@
+Package: 2vcard
+Priority: optional
+Section: universe/utils
+Installed-Size: 108
+Maintainer: Arvind Autar <Autar022@planet.nl>
+Architecture: amd64
+Version: 0.5-1ubuntu1
+Filename: pool/universe/2/2vcard/2vcard_0.5-1ubuntu1_amd64.deb
+Size: 14164
+MD5sum: 105ea91f0a75417d0f9e8e9624513b2a
+SHA1: d55beee01c08efc33cd131e106330dca72ee14be
+SHA256: 4a72edaf87cdb826e5508b85311fcf0bec9b7e019a55740ded7feb1b9e197f11
+Description: A little perl script to convert an adressbook to VCARD file format
+ 2vcard is a little perl script that you can use to convert the popular vcard
+ file format. Currently 2vcard can only convert adressbooks and alias files from
+ the following formats: abook,eudora,juno,ldif,mutt,mh and pine.
+ .
+ The VCARD format is used by gnomecard, for example, which is turn is used by
+ the balsa email client.
+Bugs: mailto:ubuntu-users@lists.ubuntu.com
+Origin: Ubuntu
Reply to: