Working on multi-arch...

11 files changed, 36 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index 88c07186..8f0867d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lightdm (1.15.3-0ubuntu3) wily; urgency=medium
+
+  * Make package multi-arch
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Tue, 25 Aug 2015 08:51:47 +0100
+
 lightdm (1.15.3-0ubuntu2) wily; urgency=medium
 
   * debian/lightdm.lightdm-greeter.pam:
diff --git a/debian/compat b/debian/compat
index 7f8f011e..ec635144 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 0decdcaf..ba8f485d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Robert Ancell <robert.ancell@ubuntu.com>
 Uploaders: Julien Lavergne <gilir@ubuntu.com>
 Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 9),
                gnome-common,
                intltool (>= 0.35.0),
                quilt,
@@ -58,6 +58,8 @@ Description: Display Manager
 
 Package: liblightdm-gobject-1-0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Recommends: accountsservice
@@ -68,6 +70,7 @@ Description: LightDM GObject client library
 Package: gir1.2-lightdm-1
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          liblightdm-gobject-1-0 (= ${binary:Version}),
 Description: Typelib file for liblightdm-1
@@ -75,6 +78,8 @@ Description: Typelib file for liblightdm-1
 
 Package: liblightdm-qt-3-0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Recommends: lightdm         
@@ -85,6 +90,8 @@ Description: LightDM Qt client library
 
 Package: liblightdm-qt5-3-0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Recommends: lightdm,
@@ -94,6 +101,7 @@ Description: LightDM Qt 5 client library
 Package: liblightdm-gobject-1-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          liblightdm-gobject-1-0 (= ${binary:Version}),
          libglib2.0-dev,
@@ -108,6 +116,7 @@ Description: LightDM GObject client library (development files)
 Package: liblightdm-qt-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          liblightdm-qt-3-0 (= ${binary:Version}),
          libqt4-dev,
@@ -122,6 +131,7 @@ Description: LightDM Qt client library (development files)
 Package: liblightdm-qt5-3-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          liblightdm-qt5-3-0 (= ${binary:Version}),
          libqt4-dev,
diff --git a/debian/gir1.2-lightdm-1.install b/debian/gir1.2-lightdm-1.install
index 06de5beb..9d512bb2 100644
--- a/debian/gir1.2-lightdm-1.install
+++ b/debian/gir1.2-lightdm-1.install
@@ -1 +1 @@
-debian/tmp/usr/lib/girepository-1.0
+debian/tmp/usr/lib/*/girepository-1.0
diff --git a/debian/liblightdm-gobject-1-0.install b/debian/liblightdm-gobject-1-0.install
index c428e11a..3e8a0532 100644
--- a/debian/liblightdm-gobject-1-0.install
+++ b/debian/liblightdm-gobject-1-0.install
@@ -1 +1 @@
-usr/lib/liblightdm-gobject-*.so.*
+usr/lib/*/liblightdm-gobject-*.so.*
diff --git a/debian/liblightdm-gobject-1-dev.install b/debian/liblightdm-gobject-1-dev.install
index 0f904875..ed9da07d 100644
--- a/debian/liblightdm-gobject-1-dev.install
+++ b/debian/liblightdm-gobject-1-dev.install
@@ -1,5 +1,5 @@
 usr/share/gir-1.0/LightDM-*.gir
 usr/include/lightdm-gobject-*
-usr/lib/pkgconfig/liblightdm-gobject-*.pc
-usr/lib/liblightdm-gobject-*.so
+usr/lib/*/pkgconfig/liblightdm-gobject-*.pc
+usr/lib/*/liblightdm-gobject-*.so
 usr/share/vala/vapi
diff --git a/debian/liblightdm-qt-3-0.install b/debian/liblightdm-qt-3-0.install
index 89d14dd5..7e9811ff 100644
--- a/debian/liblightdm-qt-3-0.install
+++ b/debian/liblightdm-qt-3-0.install
@@ -1 +1 @@
-usr/lib/liblightdm-qt-*.so.*
+usr/lib/*/liblightdm-qt-*.so.*
diff --git a/debian/liblightdm-qt-dev.install b/debian/liblightdm-qt-dev.install
index a0d22f72..a32f22b0 100644
--- a/debian/liblightdm-qt-dev.install
+++ b/debian/liblightdm-qt-dev.install
@@ -1,3 +1,3 @@
 usr/include/lightdm-qt-*
-usr/lib/pkgconfig/liblightdm-qt-*.pc
-usr/lib/liblightdm-qt-*.so
+usr/lib/*/pkgconfig/liblightdm-qt-*.pc
+usr/lib/*/liblightdm-qt-*.so
diff --git a/debian/liblightdm-qt5-3-0.install b/debian/liblightdm-qt5-3-0.install
index bfb4024e..51baf6b2 100644
--- a/debian/liblightdm-qt5-3-0.install
+++ b/debian/liblightdm-qt5-3-0.install
@@ -1 +1 @@
-usr/lib/liblightdm-qt5-*.so.*
+usr/lib/*/liblightdm-qt5-*.so.*
diff --git a/debian/liblightdm-qt5-3-dev.install b/debian/liblightdm-qt5-3-dev.install
index 6da31fc7..3d4f5f90 100644
--- a/debian/liblightdm-qt5-3-dev.install
+++ b/debian/liblightdm-qt5-3-dev.install
@@ -1,3 +1,3 @@
 usr/include/lightdm-qt5-*
-usr/lib/pkgconfig/liblightdm-qt5-*.pc
-usr/lib/liblightdm-qt5-*.so
+usr/lib/*/pkgconfig/liblightdm-qt5-*.pc
+usr/lib/*/liblightdm-qt5-*.so
diff --git a/debian/rules b/debian/rules
index b83cccfe..164c72cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,11 @@ override_dh_autoreconf:
 # NOTE: Using GNOME for now, but we still need a proper configuration system
 # See https://launchpad.net/bugs/799754
 override_dh_auto_configure:
-	dh_auto_configure -- --with-greeter-user=lightdm --with-user-session=ubuntu --enable-gtk-doc
+	dh_auto_configure -- \
+        --libexecdir=/usr/lib/lightdm \
+        --with-greeter-user=lightdm \
+        --with-user-session=ubuntu \
+        --enable-gtk-doc
 
 override_dh_auto_test:
 	#Disabled for now, are failing for some reason
@@ -21,9 +25,9 @@ override_dh_install:
 	rm -r debian/tmp/usr/share/help/C/
 	# we do install pam through installpam and init through installinit
 	dh_install -X.a -X.la -Xpam.d -X'etc/init/lightdm.conf' --fail-missing
-	install -D debian/guest-account.sh debian/lightdm/usr/sbin/guest-account
-	chmod +x debian/lightdm/usr/lib/lightdm/lightdm-greeter-session
-	chmod +x debian/lightdm/usr/lib/lightdm/guest-session-auto.sh
+	install -D debian/guest-account.sh debian/tmp/usr/sbin/guest-account
+	chmod +x debian/tmp/usr/lib/lightdm/lightdm-greeter-session
+	chmod +x debian/tmp/usr/lib/lightdm/guest-session-auto.sh
 
 override_dh_installinit:
 	dh_installinit --no-start