diff -Nru nux-4.0.8+18.10.20180613.3/debian/changelog nux-4.0.8+18.10.20180623/debian/changelog --- nux-4.0.8+18.10.20180613.3/debian/changelog 2018-06-25 14:55:15.000000000 +0000 +++ nux-4.0.8+18.10.20180623/debian/changelog 2018-06-25 14:55:15.000000000 +0000 @@ -1,3 +1,15 @@ +nux (4.0.8+18.10.20180623-0ubuntu1) cosmic; 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) Sat, 23 Jun 2018 07:30:26 +0000 + nux (4.0.8+18.10.20180613.3-0ubuntu1) cosmic; urgency=medium * debian/50_check_unity_support: diff -Nru nux-4.0.8+18.10.20180613.3/debian/control nux-4.0.8+18.10.20180623/debian/control --- nux-4.0.8+18.10.20180613.3/debian/control 2018-06-25 14:55:15.000000000 +0000 +++ nux-4.0.8+18.10.20180623/debian/control 2018-06-25 14:55:15.000000000 +0000 @@ -39,7 +39,8 @@ 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 -Nru nux-4.0.8+18.10.20180613.3/debian/nux-tools.preinst nux-4.0.8+18.10.20180623/debian/nux-tools.preinst --- nux-4.0.8+18.10.20180613.3/debian/nux-tools.preinst 1970-01-01 00:00:00.000000000 +0000 +++ nux-4.0.8+18.10.20180623/debian/nux-tools.preinst 2018-06-25 14:55:15.000000000 +0000 @@ -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 -Nru nux-4.0.8+18.10.20180613.3/debian/rules nux-4.0.8+18.10.20180623/debian/rules --- nux-4.0.8+18.10.20180613.3/debian/rules 2018-06-25 14:55:15.000000000 +0000 +++ nux-4.0.8+18.10.20180623/debian/rules 2018-06-25 14:55:15.000000000 +0000 @@ -33,7 +33,7 @@ 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: