diff -pruN 35/convert-etc-shells 35ubuntu1/convert-etc-shells --- 35/convert-etc-shells 2022-09-29 03:12:28.000000000 +0000 +++ 35ubuntu1/convert-etc-shells 2022-11-22 10:35:19.000000000 +0000 @@ -8,6 +8,7 @@ # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. +use lib "/usr/lib/usrmerge/lib"; use warnings; use strict; use autodie; diff -pruN 35/convert-usrmerge 35ubuntu1/convert-usrmerge --- 35/convert-usrmerge 2022-12-11 23:23:01.000000000 +0000 +++ 35ubuntu1/convert-usrmerge 2023-05-22 20:48:35.000000000 +0000 @@ -8,6 +8,7 @@ # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. +use lib "/usr/lib/usrmerge/lib"; use warnings; use strict; use autodie; diff -pruN 35/debian/changelog 35ubuntu1/debian/changelog --- 35/debian/changelog 2022-12-11 23:36:05.000000000 +0000 +++ 35ubuntu1/debian/changelog 2023-05-22 20:49:42.000000000 +0000 @@ -1,3 +1,13 @@ +usrmerge (35ubuntu1) mantic; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - Drop usrmerge.maintscript. + - debian/rules, debian/control, convert-etc-shells, convert-usrmerge: + Vendorize a few Perl modules, to make usrmerge only depend on + perl-base. + + -- Benjamin Drung Mon, 22 May 2023 22:49:42 +0200 + usrmerge (35) unstable; urgency=medium * Partially revert and further change the fix for #1024596, because it @@ -19,6 +29,16 @@ usrmerge (34) unstable; urgency=medium -- Marco d'Itri Sun, 11 Dec 2022 18:59:21 +0100 +usrmerge (33ubuntu1) lunar; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - Drop usrmerge.maintscript. + - debian/rules, debian/control, convert-etc-shells, convert-usrmerge: + Vendorize a few Perl modules, to make usrmerge only depend on + perl-base. + + -- Benjamin Drung Tue, 22 Nov 2022 11:37:03 +0100 + usrmerge (33) unstable; urgency=medium * Added a version number to the conflict with cruft. (See #941998.) @@ -77,6 +97,35 @@ usrmerge (30) unstable; urgency=medium -- Marco d'Itri Mon, 12 Sep 2022 01:10:54 +0200 +usrmerge (29ubuntu2) kinetic; urgency=medium + + * Change regexp for early conversion files to account for new ldd + output. Previously: + ldd /bin/cp + linux-vdso.so.1 (0x00007fff4ffb3000) + /lib64/ld-linux-x86-64.so.2 (0x00007f857f0e3000) + Now is: + ldd /bin/cp + linux-vdso.so.1 => linux-vdso.so.1 (0x00007ffc035e5000) + /lib64/ld-linux-x86-64.so.2 => /lib64/ld-linux-x86-64.so.2 (0x00007f07f15de000) + Which breaks usrmerge conversion. + + -- Dimitri John Ledkov Tue, 06 Sep 2022 16:58:47 +0100 + +usrmerge (29ubuntu1) kinetic; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - Drop usrmerge.maintscript. + - debian/rules, debian/control, convert-etc-shells, convert-usrmerge: + Vendorize a few perl modules, to make usrmerge only depend on + perl-base. + Dropped changes: + - Drop debconf prompts, translations, applied upstream. + - Clear generated files if they have already been re-generated, + applied upstream. (LP: #1930573) + + -- Lukas Märdian Mon, 22 Aug 2022 15:54:45 +0200 + usrmerge (29) unstable; urgency=medium * Made postinst skip convert-etc-shells too if the flag file is present, @@ -105,6 +154,22 @@ usrmerge (27) unstable; urgency=medium -- Marco d'Itri Thu, 14 Jul 2022 23:58:40 +0200 +usrmerge (25ubuntu2) jammy; urgency=medium + + * Clear generated files if they have already been re-generated (LP: #1930573) + + -- Lukas Märdian Tue, 26 Oct 2021 11:12:18 +0200 + +usrmerge (25ubuntu1) impish; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Drop debconf prompts, translations and usrmerge.maintscript. + - debian/rules, debian/control, convert-etc-shells, convert-usrmerge: + Vendorize a few perl modules, to make usrmerge only depend on + perl-base. + + -- Brian Murray Fri, 04 Jun 2021 15:34:39 -0700 + usrmerge (25) unstable; urgency=medium * Remove prerm, which has not been needed or even possibly used since @@ -114,6 +179,27 @@ usrmerge (25) unstable; urgency=medium -- Marco d'Itri Tue, 27 Apr 2021 01:21:48 +0200 +usrmerge (24ubuntu3) hirsute; urgency=medium + + * Fix failure to build from source, when multiple perl-modules-* are + installed. + + -- Dimitri John Ledkov Wed, 14 Apr 2021 10:25:34 +0100 + +usrmerge (24ubuntu2) hirsute; urgency=medium + + * Vendorize a few perl modules, to make usrmerge only depend on + perl-base. + + -- Dimitri John Ledkov Tue, 13 Apr 2021 11:02:45 +0100 + +usrmerge (24ubuntu1) hirsute; urgency=medium + + * Drop debconf prompts, translations, and unused maintainer scripts. LP: + #1915731 + + -- Dimitri John Ledkov Mon, 15 Feb 2021 16:35:28 +0000 + usrmerge (24) unstable; urgency=medium * Moved the scripts to /usr/lib/usrmerge/ on request of Ubuntu for better diff -pruN 35/debian/control 35ubuntu1/debian/control --- 35/debian/control 2022-12-11 17:59:00.000000000 +0000 +++ 35ubuntu1/debian/control 2023-05-22 20:48:35.000000000 +0000 @@ -1,10 +1,11 @@ Source: usrmerge Section: admin Priority: optional -Maintainer: Marco d'Itri +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Marco d'Itri Standards-Version: 4.6.1.0 Rules-Requires-Root: no -Build-Depends: debhelper-compat (= 13) +Build-Depends: debhelper-compat (= 13), libfile-find-rule-perl Vcs-Git: https://salsa.debian.org/md/usrmerge.git Vcs-Browser: https://salsa.debian.org/md/usrmerge Homepage: https://wiki.debian.org/UsrMerge @@ -13,7 +14,7 @@ Package: usrmerge Architecture: all Multi-Arch: foreign Provides: usr-is-merged -Depends: ${misc:Depends}, ${perl:Depends}, libfile-find-rule-perl +Depends: ${misc:Depends}, perl-base (>= 5.32.1-3) Breaks: cruft-ng (<< 0.4.4~), initramfs-tools (<< 0.121~), diff -pruN 35/debian/rules 35ubuntu1/debian/rules --- 35/debian/rules 2019-09-03 00:17:07.000000000 +0000 +++ 35ubuntu1/debian/rules 2022-11-22 10:38:46.000000000 +0000 @@ -1,3 +1,20 @@ #!/usr/bin/make -f +perldir:=$(shell find /usr/share/perl/ -mindepth 1 -maxdepth 1 -type d | sort | tail -n1) + %: dh $@ + +override_dh_install: + dh_install + mkdir -p debian/usrmerge/usr/lib/usrmerge/lib debian/usrmerge/usr/lib/usrmerge/lib/File debian/usrmerge/usr/lib/usrmerge/lib/Tie debian/usrmerge/usr/lib/usrmerge/lib/autodie/Scope debian/usrmerge/usr/lib/usrmerge/lib/File/Find debian/usrmerge/usr/lib/usrmerge/lib/Number debian/usrmerge/usr/lib/usrmerge/lib/Text + cp -a $(perldir)/Fatal.pm debian/usrmerge/usr/lib/usrmerge/lib + cp -a $(perldir)/File/Find.pm debian/usrmerge/usr/lib/usrmerge/lib/File + cp -a $(perldir)/Tie/RefHash.pm debian/usrmerge/usr/lib/usrmerge/lib/Tie + cp -a $(perldir)/autodie.pm debian/usrmerge/usr/lib/usrmerge/lib + cp -a $(perldir)/autodie/Scope/Guard.pm debian/usrmerge/usr/lib/usrmerge/lib/autodie/Scope + cp -a $(perldir)/autodie/Scope/GuardStack.pm debian/usrmerge/usr/lib/usrmerge/lib/autodie/Scope + cp -a $(perldir)/autodie/Util.pm debian/usrmerge/usr/lib/usrmerge/lib/autodie + cp -a $(perldir)/if.pm debian/usrmerge/usr/lib/usrmerge/lib + cp -a /usr/share/perl5/File/Find/Rule.pm debian/usrmerge/usr/lib/usrmerge/lib/File/Find + cp -a /usr/share/perl5/Number/Compare.pm debian/usrmerge/usr/lib/usrmerge/lib/Number + cp -a /usr/share/perl5/Text/Glob.pm debian/usrmerge/usr/lib/usrmerge/lib/Text diff -pruN 35/debian/usrmerge.maintscript 35ubuntu1/debian/usrmerge.maintscript --- 35/debian/usrmerge.maintscript 2018-09-30 16:57:20.000000000 +0000 +++ 35ubuntu1/debian/usrmerge.maintscript 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -rm_conffile /etc/dpkg/dpkg.cfg.d/usrmerge 19~ usrmerge