/etc/default/xen: Handle with ucf

We reintroduced this file in
  "d/xen-utils-common.install: ship /etc/default/xen"
  eg 2f34db35dd27abb4280d38ebc4464c21f64df8c9

But I had forgotten that this file was previously shipped and handled
by ucf; and we have machinery to try to remove it.

This leaves the following possible cases:
(a) stretch: file handled by ucf
(b) older buster: file not shipped, ucf postinst action not done
   | file remains recorded by ucf and ucfr, but that the original
   | version of the file is no longer present on the user's machine
(c) newer buster: file shipped, file recorded by ucf with one
   old version and as dpkg conffile by newer version

(a) and (b) will be handled correctly by just using ucf in the normal
way.

(c) xxx needs testing

So:
 * Drop the special call to ucf-remove-fixup; retain the call to ucf
 * Switch to shipping the file in /usr/share as expected by ucf

We do not remove the file's entry from not-installed - see the
comment relating to #831786.

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

diff --git a/debian/rules b/debian/rules
index 4d3ff89219f402c9feec8a61370af74eb2cf34c5..23c982eb414b4aa65500188fe13427ca209e7581 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -320,4 +320,3 @@ override_dh_missing:
 # earlier versions.  See ./ucf-remove-fixup for more details.
 override_dh_ucf:
        dh_ucf
-       debian/ucf-remove-fixup xen-utils-common /etc/default/xen

diff --git a/debian/xen-utils-common.install b/debian/xen-utils-common.install
index 58aad0a9fafbc23daba981d3f7ed2d2e0b71a6ab..7c318a19ddc4616e8b1e6fb8b5d64b80cfb4782b 100755 (executable)
--- a/debian/xen-utils-common.install
+++ b/debian/xen-utils-common.install
@@ -8,7 +8,7 @@ etc/xen/xl*
 etc/bash_completion.d/xl.sh => usr/share/bash-completion/completions/xl
 
 etc/default/xendomains
-etc/default/xencommons => /etc/default/xen
+etc/default/xencommons => usr/share/xen-utils-common/default.xen
 etc/xen/oxenstored.conf
 
 usr/bin