* debian/rules:

  - drop all hardening rules now done by dh in compat mode 9.
  - update gdmflexiserver path for multi-arch paths.
* debian/compat bumped to 9.
* debian/control:
  - added build-deb on dpkg-dev (>= 1.16.1) for hardening support.
  - dropped hardening-includes from build-depends, now superseeded
  - update debhelper build-dep to 8.9.4 for compat mode v9.
* debian/liblightdm-gobject-1-0.install,
  debian/liblightdm-gobject-dev.install, debian/liblightdm-qt-1-0.install,
  debian/liblightdm-qt-dev.install, debian/lightdm.install:
  - update to use multi-arch folders.
* debian/lightdm.install:
  - in v9 compat mode, libexecdir doesn't have the package name added so
    update in consequence
* debian/*.{postinst,prerm}:
  - update path to lightdm-set-defaults.

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

diff --git a/debian/changelog b/debian/changelog
index 09e8e9663dc58468f2d2fff8563ef003fe6ba79f..4177e389c86bd147cf7f5400c37b3d1286d12d04 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,23 @@ lightdm (1.0.0-1) UNRELEASED; urgency=low
   * New upstream release.
   * debian/patches:
     - all patches refreshed
+  * debian/rules:
+    - drop all hardening rules now done by dh in compat mode 9.
+    - update gdmflexiserver path for multi-arch paths.
+  * debian/compat bumped to 9.
+  * debian/control:
+    - added build-deb on dpkg-dev (>= 1.16.1) for hardening support.
+    - dropped hardening-includes from build-depends, now superseeded
+    - update debhelper build-dep to 8.9.4 for compat mode v9.
+  * debian/liblightdm-gobject-1-0.install,
+    debian/liblightdm-gobject-dev.install, debian/liblightdm-qt-1-0.install,
+    debian/liblightdm-qt-dev.install, debian/lightdm.install:
+    - update to use multi-arch folders.
+  * debian/lightdm.install:
+    - in v9 compat mode, libexecdir doesn't have the package name added so
+      update in consequence
+  * debian/*.{postinst,prerm}:
+    - update path to lightdm-set-defaults.
 
  -- Yves-Alexis Perez <corsac@debian.org>  Wed, 28 Sep 2011 12:19:56 +0200
 

diff --git a/debian/compat b/debian/compat
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9

diff --git a/debian/control b/debian/control
index 522274844fc8e514cbe6880b6bfae8a7894b7481..13b2692a81943cf15487cd7918859d1a09fa7687 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,10 @@ Maintainer: Debian Xfce Maintainers <pkg-xfce-devel@lists.alioth.debian.org>
 Uploaders: Evgeni Golov <evgeni@debian.org>, 
  Yves-Alexis Perez <corsac@debian.org>, Emanuele Rocca <ema@debian.org>, 
  Simon Huggins <huggie@earth.li>          
-Build-Depends: debhelper (>= 7.0.50~), intltool, pkg-config, libglib2.0-dev, 
+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,
- hardening-includes, valac, gobject-introspection
+ valac, gobject-introspection, dpkg-dev (>= 1.16.1)
 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/liblightdm-gobject-1-0.install b/debian/liblightdm-gobject-1-0.install
index c428e11a7ad20f008dddcfd442eadc4cc156ee03..3e8a05325707c80b2ca62c2f616aa1d778598be5 100644 (file)
--- 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-dev.install b/debian/liblightdm-gobject-dev.install
index 2de4ceeb1cc33e2e6a981db3bcc57a4e3aa87f58..7d05f9b2b029b1fb7ab0ba0dcff0dfd582b0f04f 100644 (file)
--- a/debian/liblightdm-gobject-dev.install
+++ b/debian/liblightdm-gobject-dev.install
@@ -1,5 +1,5 @@
 usr/include/lightdm-gobject*
-usr/lib/pkgconfig/liblightdm-gobject-*.pc
-usr/lib/liblightdm-gobject-*.a
-usr/lib/liblightdm-gobject-*.so
+usr/lib/*/pkgconfig/liblightdm-gobject-*.pc
+usr/lib/*/liblightdm-gobject-*.a
+usr/lib/*/liblightdm-gobject-*.so
 usr/share/gtk-doc

diff --git a/debian/liblightdm-qt-1-0.install b/debian/liblightdm-qt-1-0.install
index 89d14dd5f3a1cc2dd62d91061f945831e66f5d78..7e9811ffa163f21ab9a5d287b2daeaf4390aff7d 100644 (file)
--- a/debian/liblightdm-qt-1-0.install
+++ b/debian/liblightdm-qt-1-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 cbecf9c40fe33146d53c325f1033d2c63762a930..03455f4dee063c5a6404aba3932399d9a745f577 100644 (file)
--- a/debian/liblightdm-qt-dev.install
+++ b/debian/liblightdm-qt-dev.install
@@ -1,4 +1,4 @@
 usr/include/lightdm-qt*
-usr/lib/pkgconfig/liblightdm-qt-*.pc
-usr/lib/liblightdm-qt-*.a
-usr/lib/liblightdm-qt-*.so
+usr/lib/*/pkgconfig/liblightdm-qt-*.pc
+usr/lib/*/liblightdm-qt-*.a
+usr/lib/*/liblightdm-qt-*.so

diff --git a/debian/lightdm-gtk-greeter.postinst b/debian/lightdm-gtk-greeter.postinst
index 94e6d53fc95ff17058727322433fccefb9ea5822..cebbde1cfcaa3e7b8ffcfe2360af8411fd894f75 100644 (file)
--- a/debian/lightdm-gtk-greeter.postinst
+++ b/debian/lightdm-gtk-greeter.postinst
@@ -12,7 +12,7 @@ fi
 
 if [ -n "${GREETER}" ];
 then
-  LIGHTDM_SET_DEFAULTS=/usr/lib/lightdm/lightdm-set-defaults
+  LIGHTDM_SET_DEFAULTS=/usr/lib/*/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 89b0ba92921dcc560542bbd1c669563984e84bdf..291f6e4556ea1e916e3f9be9e3df5b5c70f315e4 100644 (file)
--- a/debian/lightdm-gtk-greeter.prerm
+++ b/debian/lightdm-gtk-greeter.prerm
@@ -9,7 +9,7 @@
 set -e
 
 THIS_PACKAGE="lightdm-gtk-greeter"
-LIGHTDM_SET_DEFAULTS=/usr/lib/lightdm/lightdm-set-defaults
+LIGHTDM_SET_DEFAULTS=/usr/lib/*/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 94e6d53fc95ff17058727322433fccefb9ea5822..cebbde1cfcaa3e7b8ffcfe2360af8411fd894f75 100644 (file)
--- a/debian/lightdm-qt-greeter.postinst
+++ b/debian/lightdm-qt-greeter.postinst
@@ -12,7 +12,7 @@ fi
 
 if [ -n "${GREETER}" ];
 then
-  LIGHTDM_SET_DEFAULTS=/usr/lib/lightdm/lightdm-set-defaults
+  LIGHTDM_SET_DEFAULTS=/usr/lib/*/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 081873209716e975b0aa90fa01eb8b88093859e8..b03d8f9b4968c16fb87efdf6d26263a36b1741bb 100644 (file)
--- a/debian/lightdm-qt-greeter.prerm
+++ b/debian/lightdm-qt-greeter.prerm
@@ -9,7 +9,7 @@
 set -e
 
 THIS_PACKAGE="lightdm-qt-greeter"
-LIGHTDM_SET_DEFAULTS=/usr/lib/lightdm/lightdm-set-defaults
+LIGHTDM_SET_DEFAULTS=/usr/lib/*/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 9a8147ac741e8b9ce418236cb0b06d153e05e7cb..b1c913b0bb1f29f1854f97c1fa71b9fb85eb9488 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/lightdm-set-defaults
+usr/lib/*/lightdm-set-defaults

diff --git a/debian/rules b/debian/rules
index 35e65c6efa8cb337015f1dbecd49d404e220a3ad..96d88b6f6b24c1158d266b4a48c967a5ac62f5f6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,5 @@
 #!/usr/bin/make -f
 
-include /usr/share/hardening-includes/hardening.make
-
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-#LDFLAGS += -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
-CFLAGS+=$(HARDENING_CFLAGS)
-CXXFLAGS+=$(HARDENING_CFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS)
-
-export CFLAGS CXXFLAGS LDFLAGS
-
 override_dh_auto_configure:
        dh_auto_configure -- --with-greeter-user=lightdm --with-user-session=lightdm-xsession
 
@@ -20,7 +8,7 @@ override_dh_installinit:
 
 override_dh_install:
        find debian/tmp -name '*.la' -delete
-       rm debian/tmp/usr/lib/lightdm/lightdm/gdmflexiserver
+       rm debian/tmp/usr/lib/*/lightdm/gdmflexiserver
        dh_install --fail-missing
 
 %: