Prefer btrfs-progs over now transitional package btrfs-tools

Closes: #878910

debian/changelog

@@ -1,3 +1,17 @@
+xen-tools (4.7-2) UNRELEASED; urgency=medium
+
+  * Fix wrong bug number for #849867 in previous changelog entry.
+  * Declare compliance with Debian Policy 4.1.3.
+    + Change Priority from extra to optional.
+  * Use "$(MAKE)" instead of "make" in debian/rules.
+  * debian/control: Drop "Testsuite: autopkgtest" header, no more needed.
+  * Switch "activate" trigger to "activate-noawait".
+  * Recommend e2fsprogs. (Closes: #887236)
+  * Prefer btrfs-progs over now transitional package btrfs-tools. (Closes:
+    #878910)
+
+ -- Axel Beckert <abe@debian.org>  Mon, 23 Jan 2017 01:36:27 +0100
+
 xen-tools (4.7-1) unstable; urgency=medium
 
   * New upstream release
@@ -11,7 +25,7 @@ xen-tools (4.7-1) unstable; urgency=medium
     + Knows about Ubuntu's "devel" alias.
     + Risen default values for RAM sizes in /etc/xen-tools/xen-tools.cfg
       to cope with risen resource consumption and availability.
-      (Closes: #776487)
+      (Closes: #849867)
     + Default file system is now ext4 (instead of ext3).
     + Fixes inconsistent/non-functional handling of --nopygrub
       parameter. Thanks Daniel Reichelt for the bug report and patch!

debian/control

@@ -1,6 +1,6 @@
 Source: xen-tools
 Section: utils
-Priority: extra
+Priority: optional
 Maintainer: Axel Beckert <abe@debian.org>
 Build-Depends: debhelper (>= 9~),
                devscripts,
@@ -17,11 +17,10 @@ Build-Depends: debhelper (>= 9~),
                libtest-pod-coverage-perl,
                libtest-pod-perl,
                libtext-template-perl
-Standards-Version: 3.9.8
+Standards-Version: 4.1.3
 Homepage: https://xen-tools.org/software/xen-tools
 Vcs-Browser: https://github.com/xen-tools/xen-tools
 Vcs-Git: https://github.com/xen-tools/xen-tools.git
-Testsuite: autopkgtest
 
 Package: xen-tools
 Architecture: all
@@ -40,13 +39,14 @@ Depends: debootstrap | cdebootstrap,
          ${misc:Depends},
          ${perl:Depends}
 Recommends: debian-archive-keyring,
+            e2fsprogs,
             libexpect-perl,
             lvm2,
             rinse (>= 1.9.1-1),
             ubuntu-archive-keyring,
             xen-hypervisor,
             xen-utils
-Suggests: btrfs-tools,
+Suggests: btrfs-progs | btrfs-tools,
           cfengine2,
           reiserfsprogs,
           xfsprogs

debian/rules

@@ -6,7 +6,7 @@
 	dh $@
 
 override_dh_auto_test:
-	make non-author-test
+	$(MAKE) non-author-test
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS.markdown

debian/triggers

@@ -1 +1 @@
-activate update-initramfs
+activate-noawait update-initramfs