From 92822060b25d8115d44fea8c63f40bbb5acb9899 Mon Sep 17 00:00:00 2001
From: Adam Conrad <adconrad@0c3.net>
Date: Tue, 24 Apr 2018 05:12:33 -0600
Subject: [PATCH] mk-sbuild: Add ubuntu_dist_ge and use it to set BUILD_PKGS
 for Ubuntu.

---
 debian/changelog |  6 ++++++
 mk-sbuild        | 37 +++++++++++++++++++++++++++++++++----
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dfd7047..f79b493 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ubuntu-dev-tools (0.163) unstable; urgency=medium
+
+  * mk-sbuild: Add ubuntu_dist_ge and use it to set BUILD_PKGS for Ubuntu.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 24 Apr 2018 05:11:18 -0600
+
 ubuntu-dev-tools (0.162) unstable; urgency=medium
 
   [ Mattia Rizzolo ]
diff --git a/mk-sbuild b/mk-sbuild
index ed09416..1d3110b 100755
--- a/mk-sbuild
+++ b/mk-sbuild
@@ -330,6 +330,29 @@ elif [ -z "$DISTRO" ]; then
     exit 1
 fi
 
+if [ "$DISTRO" = "ubuntu" ]; then
+    ubuntu_dist_ge() {
+      local releases="$(ubuntu-distro-info --all)"
+      local seq=1
+      for i in $releases; do
+        if [ $1 = $i ]; then
+          local left=$seq
+          break
+        fi
+        seq=$((seq+1))
+      done
+      seq=1
+      for i in $releases; do
+        if [ $2 = $i ]; then
+          local right=$seq
+          break
+        fi
+        seq=$((seq+1))
+      done
+      [ $left -ge $right ] && return 0 || return 1
+    }
+fi
+
 # By default, name the schroot the same as the release
 if [ -z "$name" ]; then
     name="$RELEASE"
@@ -494,11 +517,17 @@ ubuntu)
         esac
     fi
     # Add edgy+ buildd tools
-    if [ "$RELEASE" != "breezy" ] && [ "$RELEASE" != "dapper" ]; then
+    if ubuntu_dist_ge "$RELEASE" "edgy"; then
+        # Add pkgbinarymangler (edgy and later)
+        BUILD_PKGS="$BUILD_PKGS pkgbinarymangler"
         # Disable recommends for a smaller chroot (gutsy and later only)
-        BUILD_PKGS="--no-install-recommends $BUILD_PKGS"
-        # Add buildd tools
-        BUILD_PKGS="$BUILD_PKGS pkg-create-dbgsym pkgbinarymangler"
+        if ubuntu_dist_ge "$RELEASE" "gutsy"; then
+            BUILD_PKGS="--no-install-recommends $BUILD_PKGS"
+        fi
+        # Add pkg-create-dbgsym (edgy through zesty)
+        if ! ubuntu_dist_ge "$RELEASE" "artful"; then
+            BUILD_PKGS="$BUILD_PKGS pkg-create-dbgsym"
+        fi
     fi
     ;;
 debian)