Author: corsac
Date: 2011-09-29 10:03:27 +0000 (Thu, 29 Sep 2011)
New Revision: 6074
Added:
goodies/trunk/lightdm/debian/patches/06_move-lightdm-set-defaults-to-pkglibexecdir.patch
Modified:
goodies/trunk/lightdm/debian/changelog
goodies/trunk/lightdm/debian/control
goodies/trunk/lightdm/debian/lightdm-gtk-greeter.postinst
goodies/trunk/lightdm/debian/lightdm-gtk-greeter.prerm
goodies/trunk/lightdm/debian/lightdm-qt-greeter.postinst
goodies/trunk/lightdm/debian/lightdm-qt-greeter.prerm
goodies/trunk/lightdm/debian/lightdm.install
goodies/trunk/lightdm/debian/patches/series
goodies/trunk/lightdm/debian/rules
Log:
- 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.
Modified: goodies/trunk/lightdm/debian/changelog
===================================================================
--- goodies/trunk/lightdm/debian/changelog 2011-09-29 09:37:55 UTC (rev 6073)
+++ goodies/trunk/lightdm/debian/changelog 2011-09-29 10:03:27 UTC (rev 6074)
@@ -3,8 +3,15 @@
* 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 at debian.org> Thu, 29 Sep 2011 10:52:54 +0200
Modified: goodies/trunk/lightdm/debian/control
===================================================================
--- goodies/trunk/lightdm/debian/control 2011-09-29 09:37:55 UTC (rev 6073)
+++ goodies/trunk/lightdm/debian/control 2011-09-29 10:03:27 UTC (rev 6074)
@@ -8,7 +8,8 @@
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
Modified: goodies/trunk/lightdm/debian/lightdm-gtk-greeter.postinst
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-gtk-greeter.postinst 2011-09-29 09:37:55 UTC (rev 6073)
+++ goodies/trunk/lightdm/debian/lightdm-gtk-greeter.postinst 2011-09-29 10:03:27 UTC (rev 6074)
@@ -13,7 +13,7 @@
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}"
Modified: goodies/trunk/lightdm/debian/lightdm-gtk-greeter.prerm
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-gtk-greeter.prerm 2011-09-29 09:37:55 UTC (rev 6073)
+++ goodies/trunk/lightdm/debian/lightdm-gtk-greeter.prerm 2011-09-29 10:03:27 UTC (rev 6074)
@@ -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
Modified: goodies/trunk/lightdm/debian/lightdm-qt-greeter.postinst
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-qt-greeter.postinst 2011-09-29 09:37:55 UTC (rev 6073)
+++ goodies/trunk/lightdm/debian/lightdm-qt-greeter.postinst 2011-09-29 10:03:27 UTC (rev 6074)
@@ -13,7 +13,7 @@
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}"
Modified: goodies/trunk/lightdm/debian/lightdm-qt-greeter.prerm
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-qt-greeter.prerm 2011-09-29 09:37:55 UTC (rev 6073)
+++ goodies/trunk/lightdm/debian/lightdm-qt-greeter.prerm 2011-09-29 10:03:27 UTC (rev 6074)
@@ -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
Modified: goodies/trunk/lightdm/debian/lightdm.install
===================================================================
--- goodies/trunk/lightdm/debian/lightdm.install 2011-09-29 09:37:55 UTC (rev 6073)
+++ goodies/trunk/lightdm/debian/lightdm.install 2011-09-29 10:03:27 UTC (rev 6074)
@@ -8,4 +8,4 @@
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
Added: goodies/trunk/lightdm/debian/patches/06_move-lightdm-set-defaults-to-pkglibexecdir.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/06_move-lightdm-set-defaults-to-pkglibexecdir.patch (rev 0)
+++ goodies/trunk/lightdm/debian/patches/06_move-lightdm-set-defaults-to-pkglibexecdir.patch 2011-09-29 10:03:27 UTC (rev 6074)
@@ -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 = \
Modified: goodies/trunk/lightdm/debian/patches/series
===================================================================
--- goodies/trunk/lightdm/debian/patches/series 2011-09-29 09:37:55 UTC (rev 6073)
+++ goodies/trunk/lightdm/debian/patches/series 2011-09-29 10:03:27 UTC (rev 6074)
@@ -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
Modified: goodies/trunk/lightdm/debian/rules
===================================================================
--- goodies/trunk/lightdm/debian/rules 2011-09-29 09:37:55 UTC (rev 6073)
+++ goodies/trunk/lightdm/debian/rules 2011-09-29 10:03:27 UTC (rev 6074)
@@ -17,6 +17,6 @@
dh_install --fail-missing
%:
- dh $@
+ dh $@ --with autoreconf
override_dh_auto_test: