Merge ~3v1n0/nux:preinst-conffiles-restore into nux:master

[Marco Trevisan (Treviño)]

debian/nux-tools.preinst: restore backup config files

These might be moved by x11-common.

[Iain Lane (laney)]

Thanks, some small changes needed. (inline comments)

Please run "shellcheck" over the script and make sure it is clean.

review: Needs Fixing

[Iain Lane (laney)]

Thanks for the update. This script and the other one still need "set -e". I'm going to test this a bit now.

review: Needs Fixing

[Iain Lane (laney)]

Oh OK, I didn't look closely enough. You can't use "local" in POSIX sh either.

review: Needs Fixing

[Iain Lane (laney)]

& should use the cosmic version here, I think?

[Iain Lane (laney)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index faa2758..9f09809 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+nux (4.0.8+18.10.20180613.3-0ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/control: update Vcs
+  * debian/nux-tools.preinst:
+    - Restore backup config files before installing nux-tools, so that they
+      will be updaded with the fixed versions (LP: #1768610)
+  * debian/rules:
+    - build tests using LIBGL_ALWAYS_SOFTWARE env var to fix build crash
+      on launchpad builders (there are memory errors in the hw drivers).
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Tue, 19 Jun 2018 05:20:32 +0200
+
 nux (4.0.8+18.10.20180613.3-0ubuntu1) cosmic; urgency=medium
 
   * debian/50_check_unity_support:
diff --git a/debian/control b/debian/control
index e87fa14..b78e6a3 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,8 @@ Section: libs
 Homepage: http://launchpad.net/nux
 # If you aren't a member of ~unity-team but need to upload packaging changes,
 # just go ahead.  ~unity-team will notice and sync up the code again.
-Vcs-Bzr: https://code.launchpad.net/~unity-team/nux/trunk
+Vcs-Browser: https://git.launchpad.net/~unity-team/nux
+Vcs-Git: https://git.launchpad.net/~unity-team/nux
 
 Package: libnux-4.0-0
 Section: libs
diff --git a/debian/nux-tools.preinst b/debian/nux-tools.preinst
 new file mode 100644
index 0000000..0d01d3a
--- /dev/null
+++ b/debian/nux-tools.preinst
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+restore_backup_conffiles() {
+    PKGNAME="$1"
+    PREVERSION="$2"
+    MAXVERSION="$3"
+
+    if dpkg --compare-versions "$PREVERSION" lt-nl "$MAXVERSION"; then
+        conffiles="$(dpkg-query --show -f='${Conffiles}' "$PKGNAME")"
+        filepaths="$(echo "$conffiles" | cut -f-2 -d' ')"
+
+        for cfile in $filepaths; do
+          if [ -e "$cfile".x11-back ]; then
+            echo "Moving conffile $cfile back in place..."
+            mv -f "$cfile".x11-back "$cfile"
+          fi
+        done
+    fi
+}
+
+case "$1" in
+install)
+    restore_backup_conffiles nux-tools "$2" 4.0.8+18.10.20180613.3-0ubuntu1;;
+esac
+
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 0152cdf..784cbe2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ override_dh_install:
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	make check-headless
+	env LIBGL_ALWAYS_SOFTWARE=1 make check-headless
 endif
 
 override_dh_gencontrol: