Merge lp:~3v1n0/unity-settings-daemon/use-and-migrate-unity-monitors-xml into lp:unity-settings-daemon

[Marco Trevisan (Treviño)]

gsd-rr-config: rename monitor config files to unity-monitors.xml*

The migration is using simple bash, as it's simple enough not to require a proper xml parser in python, avoiding any new dependency.

[lp:~3v1n0/unity-settings-daemon/use-and-migrate-unity-monitors-xml]

4182. By Marco Trevisan (Treviño) on 2018-04-13

script: monitors-xml migration, make copies instead of moving files

4183. By Marco Trevisan (Treviño) on 2018-04-13

script: monitors-xml migration, if a monitors-v1-backup is found use it

[Sebastien Bacher (seb128)]

Thank you for your work, that seems fine to me

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2018-02-16 01:57:58 +0000
+++ debian/changelog	2018-04-13 20:23:24 +0000
@@ -1,3 +1,16 @@
+unity-settings-daemon (15.04.1+18.04.20180216-0ubuntu2) UNRELEASED; urgency=medium
+
+  * gsd-rr-config: rename monitor config files to unity-monitors.xml*
+    (LP: #1763806)
+  * debian:
+    - build-depends on dh-migrations and run dh_migrations on post-install
+    - add debian/unity-settings-daemon.migrations to install migration files
+  * scripts/01-usd-migration-monitors-xml.sh:
+    - Move monitors.xml to unity-monitors.xml if migration is needed
+      (LP: #1763806)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Fri, 13 Apr 2018 14:30:18 -0400
+
 unity-settings-daemon (15.04.1+18.04.20180216-0ubuntu1) bionic; urgency=medium
 
   * No-change rebuild against latest gnome-desktop3

=== modified file 'debian/control'
--- debian/control	2017-09-22 00:32:24 +0000
+++ debian/control	2018-04-13 20:23:24 +0000
@@ -7,6 +7,7 @@
                gnome-pkg-tools,
                gtk-doc-tools,
                dh-autoreconf,
+               dh-migrations,
                autotools-dev,
                intltool (>= 0.37.1),
                libdbus-glib-1-dev (>= 0.74),

=== modified file 'debian/rules'
--- debian/rules	2018-02-14 12:40:59 +0000
+++ debian/rules	2018-04-13 20:23:24 +0000
@@ -29,8 +29,10 @@
 	find debian -name '*.a' -delete
 	find debian -name '*.la' -delete
 
+binary-post-install/unity-settings-daemon::
+	dh_migrations
+
 common-binary-post-install-arch:: list-missing
 
 clean::
 	rm -f gnome-settings-daemon/gnome-update-wallpaper-cache
-

=== added file 'debian/unity-settings-daemon.migrations'
--- debian/unity-settings-daemon.migrations	1970-01-01 00:00:00 +0000
+++ debian/unity-settings-daemon.migrations	2018-04-13 20:23:24 +0000
@@ -0,0 +1,1 @@
+scripts/*-usd-migration-*

=== modified file 'gnome-settings-daemon/gsd-rr-config.c'
--- gnome-settings-daemon/gsd-rr-config.c	2014-06-26 02:32:12 +0000
+++ gnome-settings-daemon/gsd-rr-config.c	2018-04-13 20:23:24 +0000
@@ -43,8 +43,8 @@
 #include "edid.h"
 #include "gsd-rr-private.h"
 
-#define CONFIG_INTENDED_BASENAME "monitors.xml"
-#define CONFIG_BACKUP_BASENAME "monitors.xml.backup"
+#define CONFIG_INTENDED_BASENAME "unity-monitors.xml"
+#define CONFIG_BACKUP_BASENAME "unity-monitors.xml.backup"
 
 /* Look for DPI_FALLBACK in:
  * http://git.gnome.org/browse/gnome-settings-daemon/tree/plugins/xsettings/gsd-xsettings-manager.c

=== modified file 'plugins/xrandr/gsd-xrandr-manager.c'
--- plugins/xrandr/gsd-xrandr-manager.c	2016-05-20 16:50:05 +0000
+++ plugins/xrandr/gsd-xrandr-manager.c	2018-04-13 20:23:24 +0000
@@ -560,8 +560,8 @@
 
         /* ENOENT means the original file didn't exist.  That is *not* an error;
          * the backup was not created because there wasn't even an original
-         * monitors.xml (such as on a first-time login).  Note that *here* there
-         * is a "didn't work" monitors.xml, so we must delete that one.
+         * unity-monitors.xml (such as on a first-time login).  Note that *here*
+         * there is a "didn't work" unity-monitors.xml, so we must delete that one.
          */
         if (saved_errno == ENOENT)
                 unlink (intended_filename);

=== added directory 'scripts'
=== added file 'scripts/01-usd-migration-monitors-xml.sh'
--- scripts/01-usd-migration-monitors-xml.sh	1970-01-01 00:00:00 +0000
+++ scripts/01-usd-migration-monitors-xml.sh	2018-04-13 20:23:24 +0000
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+MONITORS_FILES="monitors.xml monitors.xml.backup monitors-v1-backup.xml"
+config_path="$HOME/.config"
+
+if [ -n "$XDG_CONFIG_HOME" ]; then
+    config_path="$XDG_CONFIG_HOME";
+fi
+
+for monitor_file in $MONITORS_FILES; do
+    old_monitors="$config_path/$monitor_file"
+    new_monitors="$config_path/unity-$monitor_file"
+
+    if [ -f "$old_monitors" ]; then
+        if grep '<monitors[^>]*>' "$old_monitors" | grep -Fq 'version="1"'; then
+           cp -v "$old_monitors" "$new_monitors"
+        fi
+    fi
+done
+
+if [ -f "$config_path/unity-monitors-v1-backup.xml" ] &&
+   [ ! -f "$config_path/unity-monitors.xml" ]; then
+   cp -v "$config_path/unity-monitors-v1-backup.xml" \
+         "$config_path/unity-monitors.xml"
+fi