- use autoreconf dh addon

* debian/control:
  - add build-dep on dh-autoreconf and gtk-doc-tools
* debian/patches:
  - 06_move-lightdm-set-defaults-to-pkglibexecdir added, move
    lightdm-set-defaults to pkglibexecdir instead of libexecdir.
* debian/lightdm-{gtk,qt}-greeter.{postinst,prerm}:
  - update lightdm-set-defaults path to re-add lightdm folder.

git-svn-id: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/lightdm@6074 0c9b3bff-18ee-0310-b944-d1aa2700132f

diff --git a/debian/changelog b/debian/changelog
index 1df0a3b8103e8b4ab59a3ed1e8d946808ad1e0b9..4955f32e3ff8bb4c7802cc25a6f4ae03bdd0d9fd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,15 @@ lightdm (1.0.0-2) UNRELEASED; urgency=low
   * debian/rules:
     - correctly enable pie and bindnow.
     - use a variable for multi-arch path instead of *.
-  * debian/lightdm-{gtk,qt}-greeter.postinst:
+    - use autoreconf dh addon
+  * debian/control:
+    - add build-dep on dh-autoreconf and gtk-doc-tools
+  * debian/patches:
+    - 06_move-lightdm-set-defaults-to-pkglibexecdir added, move
+      lightdm-set-defaults to pkglibexecdir instead of libexecdir.
+  * debian/lightdm-{gtk,qt}-greeter.{postinst,prerm}:
     - use variable for multi-arch path instead of *.
+    - update lightdm-set-defaults path to re-add lightdm folder.
 
  -- Yves-Alexis Perez <corsac@debian.org>  Thu, 29 Sep 2011 10:52:54 +0200
 

diff --git a/debian/control b/debian/control
index d41ea2213b4799e78343dfd1bca286da36259763..d2dc1f8644726319fb6c37088203845a9cfcb9ab 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Uploaders: Evgeni Golov <evgeni@debian.org>,
 Build-Depends: debhelper (>= 8.9.4), intltool, pkg-config, libglib2.0-dev, 
  libdbus-glib-1-dev, libxcb1-dev, libxdmcp-dev, libpam-dev, libxklavier-dev, 
  libgtk-3-dev, libck-connector-dev, gnome-doc-utils, libqt4-dev,
- valac, gobject-introspection, dpkg-dev (>= 1.16.1)
+ valac, gobject-introspection, dpkg-dev (>= 1.16.1), dh-autoreconf,
+ gtk-doc-tools
 Standards-Version: 3.9.2
 Homepage: https://launchpad.net/lightdm
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/lightdm

diff --git a/debian/lightdm-gtk-greeter.postinst b/debian/lightdm-gtk-greeter.postinst
index d20aad5a6f69a40fe9d4001885ca1af0d82f3de1..e91553d96a503653bdf5b0dde29837d20a22afbf 100644 (file)
--- a/debian/lightdm-gtk-greeter.postinst
+++ b/debian/lightdm-gtk-greeter.postinst
@@ -13,7 +13,7 @@ fi
 
 if [ -n "${GREETER}" ];
 then
-  LIGHTDM_SET_DEFAULTS=/usr/lib/$(DEB_HOST_MULTIARCH)/lightdm-set-defaults
+  LIGHTDM_SET_DEFAULTS=/usr/lib/$(DEB_HOST_MULTIARCH)/lightdm/lightdm-set-defaults
   if [ -x "${LIGHTDM_SET_DEFAULTS}" ];
   then
     "${LIGHTDM_SET_DEFAULTS}" --greeter "${GREETER}"

diff --git a/debian/lightdm-gtk-greeter.prerm b/debian/lightdm-gtk-greeter.prerm
index 291f6e4556ea1e916e3f9be9e3df5b5c70f315e4..4df4d7db682e71e761601a440ef27726b712bdbc 100644 (file)
--- a/debian/lightdm-gtk-greeter.prerm
+++ b/debian/lightdm-gtk-greeter.prerm
@@ -9,7 +9,8 @@
 set -e
 
 THIS_PACKAGE="lightdm-gtk-greeter"
-LIGHTDM_SET_DEFAULTS=/usr/lib/*/lightdm-set-defaults
+DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+LIGHTDM_SET_DEFAULTS=/usr/lib/$(DEB_HOST_MULTIARCH)/lightdm/lightdm-set-defaults
 
 if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then
   if [ -e /usr/share/debconf/confmodule ]; then

diff --git a/debian/lightdm-qt-greeter.postinst b/debian/lightdm-qt-greeter.postinst
index d20aad5a6f69a40fe9d4001885ca1af0d82f3de1..e91553d96a503653bdf5b0dde29837d20a22afbf 100644 (file)
--- a/debian/lightdm-qt-greeter.postinst
+++ b/debian/lightdm-qt-greeter.postinst
@@ -13,7 +13,7 @@ fi
 
 if [ -n "${GREETER}" ];
 then
-  LIGHTDM_SET_DEFAULTS=/usr/lib/$(DEB_HOST_MULTIARCH)/lightdm-set-defaults
+  LIGHTDM_SET_DEFAULTS=/usr/lib/$(DEB_HOST_MULTIARCH)/lightdm/lightdm-set-defaults
   if [ -x "${LIGHTDM_SET_DEFAULTS}" ];
   then
     "${LIGHTDM_SET_DEFAULTS}" --greeter "${GREETER}"

diff --git a/debian/lightdm-qt-greeter.prerm b/debian/lightdm-qt-greeter.prerm
index b03d8f9b4968c16fb87efdf6d26263a36b1741bb..f8f95cb6e5c2aabd7b37778eff3e475590bc4e87 100644 (file)
--- a/debian/lightdm-qt-greeter.prerm
+++ b/debian/lightdm-qt-greeter.prerm
@@ -9,7 +9,8 @@
 set -e
 
 THIS_PACKAGE="lightdm-qt-greeter"
-LIGHTDM_SET_DEFAULTS=/usr/lib/*/lightdm-set-defaults
+DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+LIGHTDM_SET_DEFAULTS=/usr/lib/$(DEB_HOST_MULTIARCH)/lightdm/lightdm-set-defaults
 
 if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then
   if [ -e /usr/share/debconf/confmodule ]; then

diff --git a/debian/lightdm.install b/debian/lightdm.install
index b1c913b0bb1f29f1854f97c1fa71b9fb85eb9488..2ef31a86cc0bcda038eea1a959f7a07723df5056 100644 (file)
--- a/debian/lightdm.install
+++ b/debian/lightdm.install
@@ -8,4 +8,4 @@ etc/lightdm/users.conf
 etc/lightdm/lightdm.conf
 etc/lightdm/keys.conf
 debian/lightdm-xsession.desktop /usr/share/xsessions
-usr/lib/*/lightdm-set-defaults
+usr/lib/*/lightdm/lightdm-set-defaults

diff --git a/debian/patches/06_move-lightdm-set-defaults-to-pkglibexecdir.patch b/debian/patches/06_move-lightdm-set-defaults-to-pkglibexecdir.patch
new file mode 100644 (file)
index 0000000..2a924c8
--- /dev/null
+++ b/debian/patches/06_move-lightdm-set-defaults-to-pkglibexecdir.patch
@@ -0,0 +1,11 @@
+Index: lightdm-1.0.0/utils/Makefile.am
+===================================================================
+--- lightdm-1.0.0.orig/utils/Makefile.am       2011-08-17 03:25:49.000000000 +0200
++++ lightdm-1.0.0/utils/Makefile.am    2011-09-29 11:44:37.350238126 +0200
+@@ -1,5 +1,5 @@
+ bin_PROGRAMS = dm-tool
+-libexec_PROGRAMS = lightdm-set-defaults
++pkglibexec_PROGRAMS = lightdm-set-defaults
+ dist_pkglibexec_SCRIPTS = gdmflexiserver
+ 
+ dm_tool_SOURCES = \

diff --git a/debian/patches/series b/debian/patches/series
index ca7e224ac6570956d2c306935936f5835f5db079..d437db1f72082561642c90586d47f7d2388515b6 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 03_quit-plymouth.patch
 04_default-gtk-greeter-config.patch
 05_dont-add-pkglibexecdir-path.patch
+06_move-lightdm-set-defaults-to-pkglibexecdir.patch

diff --git a/debian/rules b/debian/rules
index a2b4a71eae4bd2083453d262059985eac110fc14..1c2b9a0f6557b63bef944e117fafaa2abf0aa5aa 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,6 @@ override_dh_install:
        dh_install --fail-missing
 
 %:
-       dh $@
+       dh $@ --with autoreconf
 
 override_dh_auto_test: