Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: debhelper

debhelper (12.6.1ubuntu2) eoan; urgency=medium * Remove /xxx and /man/ cruft from the previous merge to reduce delta noise. -- Adam Conrad <adconrad@ubuntu.com> Tue, 17 Sep 2019 06:57:56 -0600 debhelper (12.6.1ubuntu1) eoan; urgency=medium * Merge from Debian unstable. Remaining changes: - Generate ddebs from debhelper instead of pkg-create-dbgsym: + Make debhelper Conflict/Replace pkg-create-dbgsym to force it off. + Set DBGSYM_PACKAGE_TYPE to ddeb to get correct debian/files output. - dh_installchangelogs: Do not install upstream changelog in compat level 7 and higher to avoid pointlessly bloating installed packages. * dh_strip: Strip LTO sections unless --keep-lto is given. -- Matthias Klose <doko@ubuntu.com> Tue, 17 Sep 2019 11:23:57 +0200

Modifications :
  1. Download patch dh_installchangelogs

    --- 12.6.1/dh_installchangelogs 2019-05-28 19:53:59.000000000 +0000 +++ 12.6.1ubuntu2/dh_installchangelogs 2019-09-17 12:57:56.000000000 +0000 @@ -21,20 +21,7 @@ B<dh_installchangelogs> [S<I<debhelper o B<dh_installchangelogs> is a debhelper program that is responsible for installing changelogs into package build directories. -An upstream F<changelog> file may be specified as an option. If none -is specified, B<dh_installchangelogs> may look for files with names -that seem likely to be changelogs as described in the next paragraphs -(assuming the package is using compatibility level 7 or above). - -In non-native packages, B<dh_installchangelogs> will first look for -changelog files installed by the upstream build system into F<< -usr/share/doc/I<package> >> (of the package build directory) and -rename the most likely candidate (if any) to F<< -usr/share/doc/I<package>/changelog >>. Note that -B<dh_installchangelogs> does I<not> look into any source directory -(such as F<debian/tmp>). Otherwise, B<dh_installchangelogs> (at -compatibility level 7 or any later) will look for changelog files in -the source directory (e.g. the root or the F<docs> subdirectory). +An upstream F<changelog> file may be specified as an option. If there is an upstream F<changelog> file, it will be installed as F<usr/share/doc/package/changelog> in the package build directory. @@ -159,16 +146,6 @@ my $default_upstream = $ARGV[0]; my $default_upstream_text=$default_upstream; my $default_upstream_html; if (! defined($default_upstream)) { - if (! isnative($dh{MAINPACKAGE}) && !compat(6)) { - foreach my $dir (qw{. doc docs}) { - my $changelog = find_changelog($dir); - if ($changelog) { - $default_upstream = $changelog; - $default_upstream_text = $default_upstream; - last; - } - } - } if (isnative($dh{MAINPACKAGE})) { $changelog_name='changelog'; } @@ -209,17 +186,6 @@ on_pkgs_in_parallel { $upstream_changelog = $default_upstream; $upstream_changelog_text = $default_upstream_text; $upstream_changelog_html = $default_upstream_html; - } else { - # Check if the upstream build system provided a - # changelog - $upstream_changelog = find_changelog("${tmp}/usr/share/doc/${package}"); - if ($upstream_changelog) { - $upstream_changelog_text = $upstream_changelog; - $changelog_from_tmp_dir = 1; - } else { - $upstream_changelog = $default_upstream; - $upstream_changelog_text = $upstream_changelog; - } } if (!$changelog) {
  2. Download patch debian/control

    --- 12.6.1/debian/control 2019-09-08 05:59:36.000000000 +0000 +++ 12.6.1ubuntu2/debian/control 2019-09-17 12:57:56.000000000 +0000 @@ -1,7 +1,8 @@ Source: debhelper Section: devel Priority: optional -Maintainer: Debhelper Maintainers <debhelper@packages.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debhelper Maintainers <debhelper@packages.debian.org> Uploaders: Niels Thykier <niels@thykier.net>, Build-Depends: dpkg-dev (>= 1.18.0~), perl:any, @@ -46,7 +47,8 @@ Breaks: dh-systemd (<< 1.38), # The qmake cross wrapper was introduced in 5.9.2+dfsg-5, but got some important # fixes in the subsequent uploads. It is only needed for cross-building. # qt5-qmake (<< 5.9.2+dfsg-8), -Replaces: dh-systemd (<< 1.38) +Replaces: dh-systemd (<< 1.38), pkg-create-dbgsym +Conflicts: pkg-create-dbgsym Suggests: dh-make Provides: ${dh:CompatLevels}, dh-sequence-dwz,
  3. Download patch lib/Debian/Debhelper/Dh_Lib.pm

    --- 12.6.1/lib/Debian/Debhelper/Dh_Lib.pm 2019-08-18 18:26:47.000000000 +0000 +++ 12.6.1ubuntu2/lib/Debian/Debhelper/Dh_Lib.pm 2019-09-17 12:57:56.000000000 +0000 @@ -32,7 +32,7 @@ use constant { # Package-Type / extension for dbgsym packages # TODO: Find a way to determine this automatically from the vendor # - blocked by Dpkg::Vendor having a rather high load time (for debhelper) - 'DBGSYM_PACKAGE_TYPE' => DEFAULT_PACKAGE_TYPE, + 'DBGSYM_PACKAGE_TYPE' => 'ddeb', }; use Errno qw(ENOENT EXDEV);
  4. Download patch dh_strip

    --- 12.6.1/dh_strip 2019-09-08 06:34:14.000000000 +0000 +++ 12.6.1ubuntu2/dh_strip 2019-09-17 12:57:56.000000000 +0000 @@ -114,6 +114,14 @@ Historical name for B<--automatic-dbgsym Historical name for B<--dbgsym-migration>. +=item B<--keep-lto> + +Sections containing information generated by B<-flto -ffat-lto-objects> +are normally removed from static archives, because the streaming +format changes even in minor GCC versions, and because cross package +link time optimizations are normally not desired. This option allows +to keep this information in the static libraries. + =back =head1 NOTES @@ -138,6 +146,7 @@ Debian policy, version 3.0.1 init(options => { 'keep-debug|keep|k' => \$dh{K_FLAG}, + 'keep-lto' => \$dh{KEEP_LTO}, 'dbgsym-migration=s' => \$dh{MIGRATE_DBGSYM}, 'automatic-dbgsym!' => \$dh{ENABLE_DBGSYM}, # Deprecated variants @@ -376,8 +385,15 @@ sub process_packages { foreach (@static_libs) { # NB: The short variant (-D) is broken in Jessie # (binutils/2.25-3) - doit($strip, '--strip-debug', '--remove-section=.comment', - '--remove-section=.note', '--enable-deterministic-archives', $_); + if ($dh{KEEP_LTO}) { + doit($strip, '--strip-debug', '--remove-section=.comment', + '--remove-section=.note', '--enable-deterministic-archives', $_); + } else { + doit($strip, '--strip-debug', '--remove-section=.comment', + '--remove-section=.note', '--enable-deterministic-archives', + '-R', '.gnu.lto_*', '-R', '.gnu.debuglto_*', + '-N', '__gnu_lto_slim', '-N', '__gnu_lto_v1', $_); + } } if (-d "$tmp/usr/lib/debug/.dwz" and ($use_build_id > 1 or ($dh{DEBUGPACKAGE} and $dh{DEBUGPACKAGE} ne $package))) { my @files = glob_expand(["$tmp/usr/lib/debug/.dwz"], \&glob_expand_error_handler_reject, '*');
  1. debhelper