Timo Aaltonen pushed to branch ubuntu at X Strike Force / xorg
Commits:
-
53a9aa3b
by Iain Lane at 2018-06-21T14:01:43+01:00
-
04f1a466
by Iain Lane at 2018-06-21T14:01:43+01:00
3 changed files:
Changes:
| 1 |
+xorg (1:7.7+19ubuntu8) cosmic; urgency=medium
|
|
| 2 |
+ |
|
| 3 |
+ * x11-common.preinst:
|
|
| 4 |
+ - Rename nux config leftovers which might change the environment
|
|
| 5 |
+ even when not running an unity session (LP: #1768610)
|
|
| 6 |
+ * debian/control:
|
|
| 7 |
+ - x11-common breaks nux-tools (<< 4.0.8+18.04.20180613.5-0ubuntu1) - this
|
|
| 8 |
+ version contains the fixed conffile; if it's installed on the system we
|
|
| 9 |
+ need people to be upgraded to the new version.
|
|
| 10 |
+ |
|
| 11 |
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com> Thu, 21 Jun 2018 11:37:03 +0100
|
|
| 12 |
+ |
|
| 1 | 13 |
xorg (1:7.7+19ubuntu7) bionic; urgency=medium
|
| 2 | 14 |
|
| 3 | 15 |
[ Simon Quigley ]
|
| ... | ... | @@ -18,6 +18,7 @@ Package: x11-common |
| 18 | 18 |
Architecture: all
|
| 19 | 19 |
Multi-Arch: foreign
|
| 20 | 20 |
Depends: ${misc:Depends}, lsb-base (>= 1.3-9ubuntu2)
|
| 21 |
+Breaks: nux-tools (<< 4.0.8+18.10.20180613.3-0ubuntu1)
|
|
| 21 | 22 |
Description: X Window System (X.Org) infrastructure
|
| 22 | 23 |
x11-common contains the filesystem infrastructure required for further
|
| 23 | 24 |
installation of the X Window System in any configuration; it does not
|
| 1 |
+#!bin/sh
|
|
| 2 |
+ |
|
| 3 |
+set -e
|
|
| 4 |
+ |
|
| 5 |
+rm_conffiles_if_uninstalled() {
|
|
| 6 |
+ PKGNAME="$1"
|
|
| 7 |
+ MAXVERSION="$2"
|
|
| 8 |
+ |
|
| 9 |
+ if [ "$(dpkg-query --show --showformat='${db:Status-Status}' "$PKGNAME")" != "config-files" ]; then
|
|
| 10 |
+ return 0;
|
|
| 11 |
+ fi
|
|
| 12 |
+ |
|
| 13 |
+ pkg_version=$(dpkg-query --show --showformat='${Version}' "$PKGNAME")
|
|
| 14 |
+ |
|
| 15 |
+ if dpkg --compare-versions "$pkg_version" lt-nl "$MAXVERSION"; then
|
|
| 16 |
+ conffiles="$(dpkg-query --show -f='${Conffiles}' "$PKGNAME")"
|
|
| 17 |
+ filepaths="$(echo "$conffiles" | cut -f-2 -d' ')"
|
|
| 18 |
+ |
|
| 19 |
+ for cfile in $filepaths; do
|
|
| 20 |
+ if [ -f "$cfile" ]; then
|
|
| 21 |
+ echo "Moving obsolete conffile $cfile to $cfile.x11-back..."
|
|
| 22 |
+ mv -f "$cfile" "$cfile".x11-back
|
|
| 23 |
+ fi
|
|
| 24 |
+ done
|
|
| 25 |
+ fi
|
|
| 26 |
+}
|
|
| 27 |
+ |
|
| 28 |
+case "$1" in
|
|
| 29 |
+install|upgrade)
|
|
| 30 |
+ if dpkg --compare-versions "$2" lt 1:7.7+19ubuntu8; then
|
|
| 31 |
+ rm_conffiles_if_uninstalled nux-tools 4.0.8+18.10.20180613.3-0ubuntu1
|
|
| 32 |
+ fi
|
|
| 33 |
+ ;;
|
|
| 34 |
+esac
|
|
| 35 |
+ |
|
| 36 |
+#DEBHELPER#
|