[beignet] 01/03: properly clean up the pre-multiarch intel-beignet.icd

[Andreas Beckmann]

This is an automated email from the git hooks/post-receive script.

anbe pushed a commit to branch master
in repository beignet.

commit 249ddcc40cc19ae63ea0e3ed718e848509ad71c8
Author: Andreas Beckmann <anbe at debian.org>
Date:   Fri Feb 27 19:12:48 2015 +0100

    properly clean up the pre-multiarch intel-beignet.icd
---
 debian/beignet-opencl-icd.maintscript | 4 +++-
 debian/beignet.maintscript            | 1 +
 debian/changelog                      | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/beignet-opencl-icd.maintscript b/debian/beignet-opencl-icd.maintscript
index 5702ea0..c8187ac 100644
--- a/debian/beignet-opencl-icd.maintscript
+++ b/debian/beignet-opencl-icd.maintscript
@@ -1,2 +1,4 @@
 rm_conffile /etc/OpenCL/vendors/intel-beignet.icd 1.0.1-3~
-rm_conffile /etc/OpenCL/vendors/intel-beignet.icd 1.0.1-1~ beignet
+# also remove the conffile owned by beignet upon initial install of beignet-opencl-icd
+# (the transitional beignet package is possibly being removed instead of being upgraded)
+rm_conffile /etc/OpenCL/vendors/intel-beignet.icd 0.0~ beignet -- "$@" 0
diff --git a/debian/beignet.maintscript b/debian/beignet.maintscript
new file mode 100644
index 0000000..19014da
--- /dev/null
+++ b/debian/beignet.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/OpenCL/vendors/intel-beignet.icd 1.0.1-3~
diff --git a/debian/changelog b/debian/changelog
index 3879edb..184dcb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 beignet (1.0.1-3) experimental; urgency=medium
 
+  [ Rebecca N. Palmer ]
   * Fix two crashes on unsupported hardware.  (Closes: #779213)
   * Fix buffer overflow in error handling.
   * Enable multiarch.
 
+  [ Andreas Beckmann ]
+  * Ensure proper removal of the pre-multiarch intel-beignet.icd.
+
  -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Thu, 26 Feb 2015 14:39:00 +0000
 
 beignet (1.0.1-2) experimental; urgency=medium

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/beignet.git