From cda9b7f1c8b4fa91921cf5d2ba665c94b176b135 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@brickies.net>
Date: Tue, 5 Jun 2018 22:27:49 -0400
Subject: [PATCH] debian: minor package cleanups.

run 'wrap-and-sort' and drop bzr as a build-depends.
---
 debian/control           | 23 +++++++++--------------
 debian/subiquity.install |  2 +-
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/debian/control b/debian/control
index 9bfecf32..737384b8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,17 +2,16 @@ Source: subiquity
 Section: admin
 Priority: extra
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-Build-Depends: bzr,
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                dh-python,
                dh-systemd,
-               iso-codes,
                git,
+               iso-codes,
                python3,
-               python3-setuptools,
+               python3-attr,
                python3-distutils-extra,
-               python3-yaml,
-               python3-attr
+               python3-setuptools,
+               python3-yaml
 Standards-Version: 3.9.5
 Homepage: https://github.com/CanonicalLtd/subiquity
 X-Python3-Version: >= 3.3
@@ -22,10 +21,10 @@ Vcs-Git: https://github.com/CanonicalLtd/subiquity.git
 Package: subiquity
 Architecture: all
 Depends: curtin,
+         iso-codes,
          python3,
          python3-attr,
          subiquitycore,
-         iso-codes,
          ${misc:Depends},
          ${python3:Depends}
 Description: Ubuntu Server Installer
@@ -65,10 +64,7 @@ Description: Ubuntu Server Installer - core libraries
 
 Package: console-conf
 Architecture: all
-Depends: python3,
-         subiquitycore,
-         ${misc:Depends},
-         ${python3:Depends}
+Depends: python3, subiquitycore, ${misc:Depends}, ${python3:Depends}
 Description: Ubuntu Core Pre-Ownership Configurator
  SUbiquity is an installer system for servers, embedded devices and desktops
  or laptops meant to build systems as quickly as possible for users to reach
@@ -85,9 +81,7 @@ Description: Ubuntu Core Pre-Ownership Configurator
 
 Package: subiquity-tools
 Architecture: all
-Depends: bzr,
-         ${misc:Depends},
-         cloud-image-utils,
+Depends: cloud-image-utils,
          devscripts,
          extlinux,
          gdisk,
@@ -113,6 +107,7 @@ Depends: bzr,
          subiquity,
          syslinux-common,
          ubuntu-cloudimage-keyring,
+         ${misc:Depends},
          ${python3:Depends}
 Description: Ubuntu Server Installer
  SUbiquity is an installer system for servers, embedded devices and desktops
diff --git a/debian/subiquity.install b/debian/subiquity.install
index dee19bc5..1c8f1af9 100644
--- a/debian/subiquity.install
+++ b/debian/subiquity.install
@@ -1,5 +1,5 @@
 debian/tmp/usr/bin/subiquity-debug      usr/share/subiquity
 debian/tmp/usr/bin/subiquity-loadkeys   usr/share/subiquity
-debian/tmp/usr/bin/subiquity-tui        usr/share/subiquity
 debian/tmp/usr/bin/subiquity-service    usr/share/subiquity
+debian/tmp/usr/bin/subiquity-tui        usr/share/subiquity
 usr/share/subiquity/subiquity