Merge ~binli/ubuntu/+source/gdm3:bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic

[Bin Li]

commit 287fe76d874f02c568a1c36660f00e7eb14f70e0 (HEAD -> bionic, binli/bionic)
Author: Bin Li <email address hidden>
Date: Thu Sep 13 15:38:35 2018 +0800

    debian/gdm3.install:
    - install udev rules in the correct folder (following upstream build
      fixes)

commit dd0547c1176bd3e782154483a2f42237b41d039f
Author: Bin Li <email address hidden>
Date: Wed Aug 29 16:47:46 2018 +0800

    data: 61-gdm.rules.in

    Disable wayland for Huawei Hi1710 chipsets.

    The login screen is skewed/distorted on arm server, and I couldn't
    find root cause, and no other developer ever has access to the hardware.

    https://gitlab.gnome.org/GNOME/mutter/issues/219

[Iain Lane (laney)]

Thanks. These need to be shipped as Debian patches though.

https://wiki.ubuntu.com/DesktopTeam/git#Pick_some_upstream_commits

(you can use 'import' instead of 'rebase' if you don't have a patch queue branch already)

After importing, I'd prefer it if you could please "git rebase -i ubuntu/bionic" and put your new commits above the Ubuntu/Debian ones.

And please edit the commit messages so that they contain information about where the patches come from (https://dep-team.pages.debian.net/deps/dep3/ - we'd at least want Bug-Ubuntu, Bug and Origin).

review: Needs Fixing

[Bin Li (binli)]

@Iain,

Follow the tips, I pushed a new branch, could you help me check it? Thanks!

https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/354933

[Iain Lane (laney)]

ok, let's head over there, thanks

Unmerged commits

ad04e1b... by Bin Li on 2018-08-23

data: Makefile.am

The $prefix was /usr in general, but rules in /usr/lib/udev/ can't
be loaded by udev, so just remove it.

287fe76... by Bin Li on 2018-09-13

debian/gdm3.install:
- install udev rules in the correct folder (following upstream build
  fixes)

dd0547c... by Bin Li on 2018-08-29

data: 61-gdm.rules.in

Disable wayland for Huawei Hi1710 chipsets.

The login screen is skewed/distorted on arm server, and I couldn't
find root cause, and no other developer ever has access to the hardware.

https://gitlab.gnome.org/GNOME/mutter/issues/219

diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
index de8e179..c9f6110 100644
--- a/data/61-gdm.rules.in
+++ b/data/61-gdm.rules.in
@@ -1,2 +1,4 @@
 # disable Wayland on Cirrus chipsets
 ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="@libexecdir@/gdm-disable-wayland"
+# disable Wayland on Hi1710 chipsets
+ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="@libexecdir@/gdm-disable-wayland"
diff --git a/data/Makefile.am b/data/Makefile.am
index 192dfa0..e008ed1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -158,7 +158,7 @@ if ENABLE_ARCH_PAM_CONFIG
 pam_files = $(pam_arch_files)
 endif
 
-udevrulesdir = $(prefix)/lib/udev/rules.d
+udevrulesdir = /lib/udev/rules.d
 udevrules_DATA = 61-gdm.rules
 
 EXTRA_DIST += $(srcdir)/61-gdm.rules.in
diff --git a/debian/gdm3.install b/debian/gdm3.install
index c69747c..b7438b8 100644
--- a/debian/gdm3.install
+++ b/debian/gdm3.install
@@ -3,7 +3,7 @@ lib/systemd/
 lib/*/security/*.so
 usr/bin/gdm-screenshot
 usr/lib/gdm3/gdm-*
-usr/lib/udev
+lib/udev
 # gets renamed to gdm3 in binary-install
 usr/sbin/gdm
 usr/share/pixmaps/