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: sbuild

sbuild (0.78.1-2ubuntu1) eoan; urgency=low * Merge from Debian unstable. Remaining changes: - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy packages, as pkgbinarymangler's dpkg-deb expects to be run from a source package. - abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by causing symlinks to files not ending in .dsc to no longer be buildable. - d/t/control: add isolation-machine to the test flags - d/t/build-procenv: only install the built package if the chroot it was built in matches the release of the host system * Dropped changes, included upstream: - utf-8-by-default.patch: Switch to C.UTF-8 by default. -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 02 May 2019 16:24:29 -0700

Modifications :
  1. Download patch debian/tests/control

    --- 0.78.1-2/debian/tests/control 2019-04-03 10:03:51.000000000 +0000 +++ 0.78.1-2ubuntu1/debian/tests/control 2019-04-03 16:12:01.000000000 +0000 @@ -1,3 +1,3 @@ Tests: build-procenv Depends: @, debootstrap, distro-info, lsb-release, apt (>= 1.1~exp2), apt-utils -Restrictions: needs-root +Restrictions: needs-root, isolation-machine
  2. Download patch debian/patches/abs-path-revert.patch

    --- 0.78.1-2/debian/patches/abs-path-revert.patch 1970-01-01 00:00:00.000000000 +0000 +++ 0.78.1-2ubuntu1/debian/patches/abs-path-revert.patch 2018-12-03 13:47:38.000000000 +0000 @@ -0,0 +1,24 @@ +Revert d15d5ea67b81cde811207ff6853b381c3ebe4b41 +Last-Update: 2016-06-28 + +--- a/bin/sbuild ++++ b/bin/sbuild +@@ -84,10 +84,6 @@ sub main () { + my $jobname = $ARGV[0]; + my $source_dir = 0; + +- if (-e $jobname) { +- $jobname = abs_path($jobname); +- } +- + if (-d $jobname) { + $jobname = create_source_package($jobname); + if ($jobname eq '.') { +@@ -171,6 +167,7 @@ sub main () { + + sub create_source_package ($) { + my $dsc = shift; ++ $dsc = abs_path($dsc); + + open(my $pipe, '-|', 'dpkg-parsechangelog', + '-l' . $dsc . '/debian/changelog')
  3. Download patch debian/control

    --- 0.78.1-2/debian/control 2019-04-03 10:03:51.000000000 +0000 +++ 0.78.1-2ubuntu1/debian/control 2019-04-03 16:12:01.000000000 +0000 @@ -1,7 +1,8 @@ Source: sbuild Section: devel Priority: optional -Maintainer: sbuild maintainers <sbuild@packages.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: sbuild maintainers <sbuild@packages.debian.org> Uploaders: Johannes 'josch' Schauer <josch@debian.org>, Michael Banck <mbanck@debian.org>, Francesco Paolo Lovergine <frankie@debian.org>,
  4. Download patch debian/patches/no-pkg-mangle-deps.patch

    --- 0.78.1-2/debian/patches/no-pkg-mangle-deps.patch 1970-01-01 00:00:00.000000000 +0000 +++ 0.78.1-2ubuntu1/debian/patches/no-pkg-mangle-deps.patch 2018-12-03 13:47:38.000000000 +0000 @@ -0,0 +1,17 @@ +Description: Set NO_PKG_MANGLE=1 when building dummy packages + pkgbinarymangler's dpkg-deb expects to be run from a source package. +Author: Colin Watson <cjwatson@ubuntu.com> +Forwarded: not-needed +Last-Update: 2016-06-28 + +--- a/lib/Sbuild/ResolverBase.pm ++++ b/lib/Sbuild/ResolverBase.pm +@@ -1212,7 +1212,7 @@ EOF + + #Now build the package: + $session->run_command( +- { COMMAND => ['dpkg-deb', '--build', $dummy_pkg_dir, $dummy_deb], ++ { COMMAND => ['env', 'NO_PKG_MANGLE=1', 'dpkg-deb', '--build', $dummy_pkg_dir, $dummy_deb], + USER => $self->get_conf('BUILD_USER'), + PRIORITY => 0}); + if ($?) {
  5. Download patch debian/patches/series

    --- 0.78.1-2/debian/patches/series 2019-04-03 11:59:20.000000000 +0000 +++ 0.78.1-2ubuntu1/debian/patches/series 2019-05-02 23:24:29.000000000 +0000 @@ -1,2 +1,4 @@ +no-pkg-mangle-deps.patch +abs-path-revert.patch fix-disk-space-directory-check.patch support-gzip-in-wheezy.patch
  6. Download patch debian/tests/build-procenv

    --- 0.78.1-2/debian/tests/build-procenv 2019-04-03 10:03:51.000000000 +0000 +++ 0.78.1-2ubuntu1/debian/tests/build-procenv 2019-04-03 16:12:01.000000000 +0000 @@ -129,10 +129,7 @@ extract="$ADTTMP/extract" echo "INFO: Extracting '$deb' to '$extract'" dpkg --extract "$deb" "$extract" -# We should probably only attempt to install and run procenv if the release of -# the build chroot is equal to the host, but lets be brave and try anyway -if true -#if [ "$release" = "$host_release" ] +if [ "$release" = "$host_release" ] then echo "INFO: Installing package '$pkg' from '$deb'" apt -o Apt::Cmd::Disable-Script-Warning=1 -o APT::Get::Assume-Yes=1 install "$(pwd)/$deb"
  1. sbuild