Merge lp:~didrocks/lightdm/packaging-cleanup into lp:~mir-team/lightdm/unity

[Didier Roche-Tolomelli]

Misc packaging cleanup

Misc packaging cleanup.
Don't multiarch lightdm for now as there is a lot of complexity like for
lightdm-set-defaults which should be in a separate (non multiarched) package.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1636
http://jenkins.qa.ubuntu.com/job/mir-team-lightdm-unity-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-lightdm-unity-saucy-amd64-ci/12

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-team-lightdm-unity-ci/31/rebuild

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

Looks good - one thing I notice we should probably do is not depend on unity-system-compositor once we do daily landing into main (yet). Since this packaging is going to the testing PPA we should keep it on for now until we at least update the documentation to require people to explicitly install it.

review: Approve

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2013-06-27 07:23:28 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True
 
=== modified file 'data/lightdm-set-defaults.1'
--- data/lightdm-set-defaults.1	2012-11-06 21:34:21 +0000
+++ data/lightdm-set-defaults.1	2013-06-27 07:23:28 +0000
@@ -49,7 +49,6 @@
 .TP
 .B /etc/lightdm/lightdm.conf
 Configuration
-.TP
 
 .sp
 .LP
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-06-21 02:47:57 +0000
+++ debian/changelog	2013-06-27 07:23:28 +0000
@@ -1,3 +1,10 @@
+lightdm (1.7.4-0ubuntu1) UNRELEASED; urgency=low
+
+  * Clean packaging and prepare it for daily release
+  * Automatic snapshot from revision 1629 (bootstrap)
+
+ -- Didier Roche <[e-mail]>  Thu, 27 Jun 2013 08:51:29 +0200
+
 lightdm (1.7.3-0ubuntu1) saucy; urgency=low
 
   * New upstream release:
 
=== modified file 'debian/control'
--- debian/control	2013-06-21 03:23:11 +0000
+++ debian/control	2013-06-27 07:23:28 +0000
@@ -24,7 +24,7 @@
                gtk-doc-tools,
                yelp-tools,
                dbus,
-               python-gi
+               python-gi,
 Homepage: https://launchpad.net/lightdm
 
 Package: lightdm
@@ -38,7 +38,7 @@
          libglib2.0-bin,
          dbus,
          plymouth (>= 0.8.8-0ubuntu6.1),
-         unity-system-compositor
+         unity-system-compositor,
 Recommends: xserver-xorg,
             unity-greeter | lightdm-greeter | lightdm-kde-greeter
 Conflicts: liblightdm-gobject-0-0,
@@ -54,9 +54,9 @@
 Package: liblightdm-gobject-1-0
 Architecture: any
 Depends: ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
 Recommends: lightdm,
-            accountsservice
+            accountsservice,
 Description: LightDM GObject client library
  A GObject based library for LightDM clients to use to interface with LightDM.
 
@@ -64,14 +64,14 @@
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
-         liblightdm-gobject-1-0 (= ${binary:Version})
+         liblightdm-gobject-1-0 (= ${binary:Version}),
 Description: Typelib file for liblightdm-1
  A GObject based library for LightDM clients to use to interface with LightDM.
 
 Package: liblightdm-qt-3-0
 Architecture: any
 Depends: ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
 Recommends: lightdm         
 Conflicts: liblightdm-qt-1-0 (>= 1.1.1)
 Replaces: liblightdm-qt-1-0 (>= 1.1.1)
@@ -81,8 +81,8 @@
 Package: liblightdm-qt5-3-0
 Architecture: any
 Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Recommends: lightdm         
+         ${shlibs:Depends},
+Recommends: lightdm,
 Description: LightDM Qt 5 client library
  A Qt 5 based library for LightDM clients to use to interface with LightDM.
 
@@ -93,7 +93,7 @@
          liblightdm-gobject-1-0 (= ${binary:Version}),
          libglib2.0-dev,
          libdbus-glib-1-dev,
-         libxklavier-dev
+         libxklavier-dev,
 Description: LightDM GObject client library (development files)
  A GObject based library for LightDM clients to use to interface with LightDM.
  .
@@ -105,7 +105,7 @@
 Architecture: any
 Depends: ${misc:Depends},
          liblightdm-qt-3-0 (= ${binary:Version}),
-         libqt4-dev
+         libqt4-dev,
 Breaks: liblightdm-qt-1-dev (>= 1.1.1), liblightdm-qt-3-dev
 Replaces: liblightdm-qt-1-dev (>= 1.1.1), liblightdm-qt-3-dev
 Description: LightDM Qt client library (development files)
@@ -119,7 +119,7 @@
 Architecture: any
 Depends: ${misc:Depends},
          liblightdm-qt5-3-0 (= ${binary:Version}),
-         libqt4-dev
+         libqt4-dev,
 Description: LightDM Qt 5 client library (development files)
  A Qt 5 based library for LightDM clients to use to interface with LightDM.
  .
@@ -129,7 +129,7 @@
 Package: liblightdm-gobject-1-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends},
 Description: LightDM client library (documentation)
  A GObject based library for LightDM clients to use to interface with LightDM.
  .
 
=== modified file 'debian/rules'
--- debian/rules	2013-06-20 04:48:53 +0000
+++ debian/rules	2013-06-27 07:23:28 +0000
@@ -3,7 +3,7 @@
 LDFLAGS+=-Wl,--as-needed
 
 %:
-	dh $@ --with quilt,autoreconf,translations
+	dh $@ --with quilt,autoreconf,translations --parallel
 
 override_dh_autoreconf:
 	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
@@ -17,13 +17,9 @@
 override_dh_auto_test:
 
 override_dh_install:
-	#Remove .la and .a files.
-	find debian/tmp/usr/lib/ -name *.a |xargs rm
-	find debian/tmp/usr/lib -name *.la |xargs rm
-	#Remove conf files from upstream
-	#find debian/tmp/etc/ -name *.conf |xargs rm
-	#find debian/tmp/etc/init -name *.conf |xargs rm
-	dh_install --list-missing
+	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
 	mv debian/lightdm/usr/lib/lightdm/lightdm/lightdm-set-defaults debian/lightdm/usr/lib/lightdm
 	chmod +x debian/lightdm/usr/lib/lightdm/lightdm-greeter-session
 
 
=== removed file 'debian/tests/control'
--- debian/tests/control	2013-04-30 19:12:50 +0000
+++ debian/tests/control	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#Tests: upstream-tests
-#Depends: @, python-gi, xauth
-#Restrictions: build-needed needs-root