From 2fe9cdc3c33ac1d3941eadc0017a046a0371caa74a75eb9344d3083310bebc58 Mon Sep 17 00:00:00 2001 From: Martin Schreiner Date: Tue, 28 Nov 2023 13:45:55 +0000 Subject: [PATCH] Accepting request 1129286 from home:mschreiner:branches:system:packagemanager - Update to version 1.22.1. The full changelog is very large. Please check it here: https://git.dpkg.org/cgit/dpkg/dpkg.git/tree/debian/changelog?h=1.22.1 - Refresh update-alternatives-suse.patch so it applies cleanly. OBS-URL: https://build.opensuse.org/request/show/1129286 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=100 --- dpkg.changes | 8 ++++++ dpkg.spec | 2 +- dpkg_1.22.0.tar.xz | 3 --- dpkg_1.22.1.tar.xz | 3 +++ update-alternatives-suse.patch | 49 +++++++--------------------------- update-alternatives.changes | 8 ++++++ update-alternatives.spec | 2 +- 7 files changed, 30 insertions(+), 45 deletions(-) delete mode 100644 dpkg_1.22.0.tar.xz create mode 100644 dpkg_1.22.1.tar.xz diff --git a/dpkg.changes b/dpkg.changes index 8e5dc23..368c346 100644 --- a/dpkg.changes +++ b/dpkg.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Nov 22 20:45:45 UTC 2023 - Martin Schreiner + +- Update to version 1.22.1. + The full changelog is very large. Please check it here: + https://git.dpkg.org/cgit/dpkg/dpkg.git/tree/debian/changelog?h=1.22.1 +- Refresh update-alternatives-suse.patch so it applies cleanly. + ------------------------------------------------------------------- Mon Sep 18 04:57:23 UTC 2023 - Martin Schreiner diff --git a/dpkg.spec b/dpkg.spec index a3fdc89..98e9aed 100644 --- a/dpkg.spec +++ b/dpkg.spec @@ -17,7 +17,7 @@ Name: dpkg -Version: 1.22.0 +Version: 1.22.1 Release: 0 Summary: Debian package management system License: GPL-2.0-or-later diff --git a/dpkg_1.22.0.tar.xz b/dpkg_1.22.0.tar.xz deleted file mode 100644 index bcb0560..0000000 --- a/dpkg_1.22.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd1525aa169afa0e60044b23f31c23523a339023754878a4210d74abd98c72ed -size 5519320 diff --git a/dpkg_1.22.1.tar.xz b/dpkg_1.22.1.tar.xz new file mode 100644 index 0000000..d0b11fe --- /dev/null +++ b/dpkg_1.22.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a4824e9869494e501953c7466ab1960a7fa23d9b0b911b8a6f113094e0226cf +size 5584944 diff --git a/update-alternatives-suse.patch b/update-alternatives-suse.patch index 0bde901..6988953 100644 --- a/update-alternatives-suse.patch +++ b/update-alternatives-suse.patch @@ -10,28 +10,10 @@ Subject: [PATCH 3/4] update-alternatives-suse utils/update-alternatives.c | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) -Index: dpkg-1.21.8/man/update-alternatives.pod +Index: dpkg-1.22.1/man/update-alternatives.pod =================================================================== ---- dpkg-1.21.8.orig/man/update-alternatives.pod -+++ dpkg-1.21.8/man/update-alternatives.pod -@@ -37,7 +37,7 @@ B - - B - creates, removes, maintains and displays information about the symbolic --links comprising the Debian alternatives system. -+links comprising the SUSE alternatives system. - - It is possible for several programs fulfilling the same or similar - functions to be installed on a single system at the same time. -@@ -47,7 +47,7 @@ different editor, if desired, but makes - to make a good choice for an editor to invoke if the - user has not specified a particular preference. - --Debian's alternatives system aims to solve this problem. -+SUSE's alternatives system aims to solve this problem. - A generic name in the filesystem is - shared by all files providing interchangeable functionality. - The alternatives system and the system administrator +--- dpkg-1.22.1.orig/man/update-alternatives.pod ++++ dpkg-1.22.1/man/update-alternatives.pod @@ -85,8 +85,8 @@ installed, changed or removed, B is called to update information about that file in the alternatives system. @@ -43,10 +25,10 @@ Index: dpkg-1.21.8/man/update-alternatives.pod (configure) to install the alternative and from B and B (remove) to remove the alternative. -Index: dpkg-1.21.8/utils/Makefile.am +Index: dpkg-1.22.1/utils/Makefile.am =================================================================== ---- dpkg-1.21.8.orig/utils/Makefile.am -+++ dpkg-1.21.8/utils/Makefile.am +--- dpkg-1.22.1.orig/utils/Makefile.am ++++ dpkg-1.22.1/utils/Makefile.am @@ -47,8 +47,8 @@ update_alternatives_SOURCES = \ update_alternatives_CPPFLAGS = \ @@ -71,10 +53,10 @@ Index: dpkg-1.21.8/utils/Makefile.am UA_ADMINDIR_DEFAULT=$(admindir) \ # EOL -Index: dpkg-1.21.8/utils/t/update_alternatives.t +Index: dpkg-1.22.1/utils/t/update_alternatives.t =================================================================== ---- dpkg-1.21.8.orig/utils/t/update_alternatives.t -+++ dpkg-1.21.8/utils/t/update_alternatives.t +--- dpkg-1.22.1.orig/utils/t/update_alternatives.t ++++ dpkg-1.22.1/utils/t/update_alternatives.t @@ -32,8 +32,8 @@ my $bindir = File::Spec->rel2abs("$tmpdi my @ua = ("$ENV{builddir}/update-alternatives", '--log', '/dev/null', '--quiet', '--admindir', "$admindir", '--altdir', "$altdir"); @@ -86,16 +68,3 @@ Index: dpkg-1.21.8/utils/t/update_alternatives.t delete $ENV{$rootdir_envvar}; delete $ENV{$admindir_envvar}; -Index: dpkg-1.21.8/utils/update-alternatives.c -=================================================================== ---- dpkg-1.21.8.orig/utils/update-alternatives.c -+++ dpkg-1.21.8/utils/update-alternatives.c -@@ -116,7 +116,7 @@ static int opt_force = 0; - static void - version(void) - { -- printf(_("Debian %s version %s.\n"), PROGNAME, VERSION); -+ printf(_("SUSE %s version %s.\n"), PROGNAME, VERSION); - printf("\n"); - - printf(_( diff --git a/update-alternatives.changes b/update-alternatives.changes index 4452ef1..9a5dbde 100644 --- a/update-alternatives.changes +++ b/update-alternatives.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Nov 22 20:45:45 UTC 2023 - Martin Schreiner + +- Update to version 1.22.1. + The full changelog is very large. Please check it here: + https://git.dpkg.org/cgit/dpkg/dpkg.git/tree/debian/changelog?h=1.22.1 +- Refresh update-alternatives-suse.patch so it applies cleanly. + ------------------------------------------------------------------- Mon Sep 18 04:57:23 UTC 2023 - Martin Schreiner diff --git a/update-alternatives.spec b/update-alternatives.spec index 729db2d..7dbc213 100644 --- a/update-alternatives.spec +++ b/update-alternatives.spec @@ -17,7 +17,7 @@ Name: update-alternatives -Version: 1.22.0 +Version: 1.22.1 Release: 0 Summary: Maintain symbolic links determining default commands License: GPL-2.0-or-later