[Pkg-xfce-commits] r6057 - goodies/trunk/lightdm/debian

Yves-Alexis Perez corsac at alioth.debian.org
Wed Sep 28 12:33:31 UTC 2011 

Author: corsac
Date: 2011-09-28 12:33:31 +0000 (Wed, 28 Sep 2011)
New Revision: 6057

Modified:
   goodies/trunk/lightdm/debian/changelog
   goodies/trunk/lightdm/debian/compat
   goodies/trunk/lightdm/debian/control
   goodies/trunk/lightdm/debian/liblightdm-gobject-1-0.install
   goodies/trunk/lightdm/debian/liblightdm-gobject-dev.install
   goodies/trunk/lightdm/debian/liblightdm-qt-1-0.install
   goodies/trunk/lightdm/debian/liblightdm-qt-dev.install
   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/rules
Log:
* 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.

Modified: goodies/trunk/lightdm/debian/changelog
===================================================================
--- goodies/trunk/lightdm/debian/changelog	2011-09-28 11:22:02 UTC (rev 6056)
+++ goodies/trunk/lightdm/debian/changelog	2011-09-28 12:33:31 UTC (rev 6057)
@@ -3,6 +3,23 @@
   * 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 at debian.org>  Wed, 28 Sep 2011 12:19:56 +0200
 

Modified: goodies/trunk/lightdm/debian/compat
===================================================================
--- goodies/trunk/lightdm/debian/compat	2011-09-28 11:22:02 UTC (rev 6056)
+++ goodies/trunk/lightdm/debian/compat	2011-09-28 12:33:31 UTC (rev 6057)
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/lightdm/debian/control
===================================================================
--- goodies/trunk/lightdm/debian/control	2011-09-28 11:22:02 UTC (rev 6056)
+++ goodies/trunk/lightdm/debian/control	2011-09-28 12:33:31 UTC (rev 6057)
@@ -5,10 +5,10 @@
 Uploaders: Evgeni Golov <evgeni at debian.org>, 
  Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>, 
  Simon Huggins <huggie at 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

Modified: goodies/trunk/lightdm/debian/liblightdm-gobject-1-0.install
===================================================================
--- goodies/trunk/lightdm/debian/liblightdm-gobject-1-0.install	2011-09-28 11:22:02 UTC (rev 6056)
+++ goodies/trunk/lightdm/debian/liblightdm-gobject-1-0.install	2011-09-28 12:33:31 UTC (rev 6057)
@@ -1 +1 @@
-usr/lib/liblightdm-gobject-*.so.*
+usr/lib/*/liblightdm-gobject-*.so.*

Modified: goodies/trunk/lightdm/debian/liblightdm-gobject-dev.install
===================================================================
--- goodies/trunk/lightdm/debian/liblightdm-gobject-dev.install	2011-09-28 11:22:02 UTC (rev 6056)
+++ goodies/trunk/lightdm/debian/liblightdm-gobject-dev.install	2011-09-28 12:33:31 UTC (rev 6057)
@@ -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

Modified: goodies/trunk/lightdm/debian/liblightdm-qt-1-0.install
===================================================================
--- goodies/trunk/lightdm/debian/liblightdm-qt-1-0.install	2011-09-28 11:22:02 UTC (rev 6056)
+++ goodies/trunk/lightdm/debian/liblightdm-qt-1-0.install	2011-09-28 12:33:31 UTC (rev 6057)
@@ -1 +1 @@
-usr/lib/liblightdm-qt-*.so.*
+usr/lib/*/liblightdm-qt-*.so.*

Modified: goodies/trunk/lightdm/debian/liblightdm-qt-dev.install
===================================================================
--- goodies/trunk/lightdm/debian/liblightdm-qt-dev.install	2011-09-28 11:22:02 UTC (rev 6056)
+++ goodies/trunk/lightdm/debian/liblightdm-qt-dev.install	2011-09-28 12:33:31 UTC (rev 6057)
@@ -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

Modified: goodies/trunk/lightdm/debian/lightdm-gtk-greeter.postinst
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-gtk-greeter.postinst	2011-09-28 11:22:02 UTC (rev 6056)
+++ goodies/trunk/lightdm/debian/lightdm-gtk-greeter.postinst	2011-09-28 12:33:31 UTC (rev 6057)
@@ -12,7 +12,7 @@
 
 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}"

Modified: goodies/trunk/lightdm/debian/lightdm-gtk-greeter.prerm
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-gtk-greeter.prerm	2011-09-28 11:22:02 UTC (rev 6056)
+++ goodies/trunk/lightdm/debian/lightdm-gtk-greeter.prerm	2011-09-28 12:33:31 UTC (rev 6057)
@@ -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

Modified: goodies/trunk/lightdm/debian/lightdm-qt-greeter.postinst
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-qt-greeter.postinst	2011-09-28 11:22:02 UTC (rev 6056)
+++ goodies/trunk/lightdm/debian/lightdm-qt-greeter.postinst	2011-09-28 12:33:31 UTC (rev 6057)
@@ -12,7 +12,7 @@
 
 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}"

Modified: goodies/trunk/lightdm/debian/lightdm-qt-greeter.prerm
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-qt-greeter.prerm	2011-09-28 11:22:02 UTC (rev 6056)
+++ goodies/trunk/lightdm/debian/lightdm-qt-greeter.prerm	2011-09-28 12:33:31 UTC (rev 6057)
@@ -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

Modified: goodies/trunk/lightdm/debian/lightdm.install
===================================================================
--- goodies/trunk/lightdm/debian/lightdm.install	2011-09-28 11:22:02 UTC (rev 6056)
+++ goodies/trunk/lightdm/debian/lightdm.install	2011-09-28 12:33:31 UTC (rev 6057)
@@ -8,4 +8,4 @@
 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

Modified: goodies/trunk/lightdm/debian/rules
===================================================================
--- goodies/trunk/lightdm/debian/rules	2011-09-28 11:22:02 UTC (rev 6056)
+++ goodies/trunk/lightdm/debian/rules	2011-09-28 12:33:31 UTC (rev 6057)
@@ -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_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
 
 %:

More information about the Pkg-xfce-commits mailing list