debian/patches: Drop build-recipe-dsc-Move-all-build-results-not-just-.deb-and.patch and debootstrap-add-fallback-for-Debian-SID-distro.patch. Applied upstream.

3 files changed, 0 insertions, 87 deletions

diff --git a/debian/patches/build-recipe-dsc-Move-all-build-results-not-just-.deb-and.patch b/debian/patches/build-recipe-dsc-Move-all-build-results-not-just-.deb-and.patch
deleted file mode 100644
index 480931b..0000000
--- a/debian/patches/build-recipe-dsc-Move-all-build-results-not-just-.deb-and.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Simon McVittie <smcv@collabora.com>
-Date: Mon, 18 Mar 2019 17:26:43 +0000
-Subject: build-recipe-dsc: Move all build results,
- not just *.deb and *.changes
-
-The purpose of the changes file is to list everything that is to be
-installed into the Debian (or derivative) archive, including *.deb,
-*.udeb (micro-debs for the Debian installer), *.ddeb (detached debug
-symbols, in Ubuntu and its derivatives) and *.buildinfo (details of the
-build environment, mainly for reproducible builds). If we're providing
-an equivalent of the Debian archive, then we should include all the
-same files.
-
-This change ensures that all build products get moved into the right
-place, even if they are file types that obs-build doesn't yet know about,
-or even file types that haven't been invented yet.
-
-When obs-build is used in conjunction with OBS, changes to bs_publish
-are also likely to be necessary for a full-stack solution.
-
-Signed-off-by: Simon McVittie <smcv@collabora.com>
-Forwarded: https://github.com/openSUSE/obs-build/pull/496
----
- build-recipe-dsc | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/build-recipe-dsc b/build-recipe-dsc
-index c104890..3ee4077 100644
---- a/build-recipe-dsc
-+++ b/build-recipe-dsc
-@@ -114,8 +114,13 @@ dsc_build() {
- }
- 
- dsc_move_build_result() {
--    for DEB in $BUILD_ROOT/$TOPDIR/*.{deb,changes} ; do
--	test -e "$DEB" && mv "$DEB" "$BUILD_ROOT/$TOPDIR/DEBS"
-+    local changes
-+
-+    for changes in $BUILD_ROOT/$TOPDIR/*.changes ; do
-+	while read f ; do
-+	    mv "$BUILD_ROOT/$TOPDIR/$f" "$BUILD_ROOT/$TOPDIR/DEBS/"
-+	done < <(sed -ne '/Files:/,$s/^ ................................ [0-9][0-9]* [^ ]* [^ ]* //p' "$changes")
-+	mv "$changes" "$BUILD_ROOT/$TOPDIR/DEBS"
-     done
- 
-     # link used sources over to DEB directory
diff --git a/debian/patches/debootstrap-add-fallback-for-Debian-SID-distro.patch b/debian/patches/debootstrap-add-fallback-for-Debian-SID-distro.patch
deleted file mode 100644
index 82c1f3f..0000000
--- a/debian/patches/debootstrap-add-fallback-for-Debian-SID-distro.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: =?utf-8?b?SMOpY3RvciBPcsOzbiBNYXJ0w61uZXo=?=
- <hector.oron@collabora.co.uk>
-Date: Mon, 6 Nov 2017 15:55:02 +0100
-Subject: debootstrap: add fallback for Debian SID distro
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-  When attempting to build Debian unstable, distribution is
-  calculated using lsb, which relies on apt cache. As our
-  build systems lack apt cache and network we cannot detect
-  we are building for Debian SID (aka unstable).
-  For more background information see: DebianBug#845651
-
-Signed-off-by: Héctor Orón Martínez <hector.oron@collabora.co.uk>
-Tested-by: Héctor Orón Martínez <hector.oron@collabora.co.uk>
-Forwarded: https://github.com/openSUSE/obs-build/pull/460
-Last-Update: 2018-08-30
----
- build-recipe-debootstrap | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/build-recipe-debootstrap b/build-recipe-debootstrap
-index 2404fdc..f28cdfc 100644
---- a/build-recipe-debootstrap
-+++ b/build-recipe-debootstrap
-@@ -31,7 +31,11 @@ recipe_prepare_debootstrap() {
- 
- recipe_build_debootstrap() {
-     local arch=$(chroot $BUILD_ROOT su -c "dpkg-architecture -qDEB_BUILD_ARCH")
--    local dist=$(chroot $BUILD_ROOT su -c "lsb_release --codename --short")
-+    if $(chroot $BUILD_ROOT grep -q '/sid' /etc/debian_version) ; then
-+        local dist=unstable
-+    else
-+        local dist=$(chroot $BUILD_ROOT su -c "lsb_release --codename --short")
-+    fi
-     local myroot=debootstraproot
-     test -d $BUILD_ROOT/.build.binaries || cleanup_and_exit 1
-     if test "$DO_INIT" = true -o ! -d "$BUILD_ROOT/.build.binaries/dists" ; then
diff --git a/debian/patches/series b/debian/patches/series
index 4af9838..8535040 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,8 +2,6 @@
 0003-HACK-make-glibc-build.patch
 0005-dsc-keep-everything.patch
 build-recipe-dsc-don-t-rebuild-the-source-package.patch
-debootstrap-add-fallback-for-Debian-SID-distro.patch
-build-recipe-dsc-Move-all-build-results-not-just-.deb-and.patch
 Log-the-version-number-during-startup.patch
 debootstrap-Print-the-exact-command-we-re-going-to-run.patch
 deb-Show-version-of-each-package-that-we-preinstall.patch