Drop debian/source/*options and dh_builddeb override

* Drop debian/source/local-options as the only option it contained was
  not applicable to 3.0 (native) source format.
* Drop debian/source/options and dh_builddeb override as XZ compression is
  the default now.

diff --git a/debian/changelog b/debian/changelog
index 58ca28c..6903c77 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ live-boot (1:20160511) UNRELEASED; urgency=medium
     of outdated VERSION file.
   * No longer modify PATH to point to /root and thus stop using executables
     from /root. Closes: #823069
+  * Drop debian/source/local-options as the only option it contained was
+    not applicable to 3.0 (native) source format.
+  * Drop debian/source/options and dh_builddeb override as XZ compression is
+    the default now.
 
  -- Raphaël Hertzog <hertzog@debian.org>  Wed, 11 May 2016 11:40:37 +0200
 

diff --git a/debian/rules b/debian/rules
index e59fceb..0ed4818 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,8 +13,5 @@ override_dh_auto_install:
        mkdir -p debian/live-boot-initramfs-tools/usr/share
        mv debian/tmp/usr/share/initramfs-tools debian/live-boot-initramfs-tools/usr/share
 
-override_dh_builddeb:
-       dh_builddeb -- -Zxz
-
 override_dh_install:
        dh_install --fail-missing

diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644 (file)
index 2ee6f0f..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-abort-on-upstream-changes

diff --git a/debian/source/options b/debian/source/options
deleted file mode 100644 (file)
index 5bd47b7..0000000
--- a/debian/source/options
+++ /dev/null
@@ -1 +0,0 @@
-compression = xz