[Pkg-xfce-commits] r6401 - desktop/trunk/xfce4-session/debian
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Sun Feb 12 05:05:24 UTC 2012
Author: mrpouit-guest
Date: 2012-02-12 17:05:23 +0000 (Sun, 12 Feb 2012)
New Revision: 6401
Modified:
desktop/trunk/xfce4-session/debian/README.Debian
desktop/trunk/xfce4-session/debian/changelog
desktop/trunk/xfce4-session/debian/compat
desktop/trunk/xfce4-session/debian/control
desktop/trunk/xfce4-session/debian/rules
desktop/trunk/xfce4-session/debian/xfce4-session.lintian-overrides
Log:
* New upstream bugfix release.
* debian/rules:
- use debhelper 9 hardening support.
* Fix paths for multiarch dirs.
* debian/compat bumped to 9.
* debian/control:
- drop hardening-includes build-dep.
- update debhelper build-dep to 9 for hardening support.
- add dpkg-dev 1.16.1 build-dep for hardening support.
- pre-depends on multiarch-support.
Modified: desktop/trunk/xfce4-session/debian/README.Debian
===================================================================
--- desktop/trunk/xfce4-session/debian/README.Debian 2012-02-12 16:28:56 UTC (rev 6400)
+++ desktop/trunk/xfce4-session/debian/README.Debian 2012-02-12 17:05:23 UTC (rev 6401)
@@ -32,6 +32,6 @@
There are two ways to enable user to shutdown the computer from Xfce:
- - use sudo, and allow user to run /usr/lib/xfce4/session/xfsm-shutdown-helper
+ - use sudo, and allow user to run /usr/lib/*/xfce4/session/xfsm-shutdown-helper
- use policykit and a compatible login manager (lightdm and gdm are known to
work, startx too if you use the tips above)
Modified: desktop/trunk/xfce4-session/debian/changelog
===================================================================
--- desktop/trunk/xfce4-session/debian/changelog 2012-02-12 16:28:56 UTC (rev 6400)
+++ desktop/trunk/xfce4-session/debian/changelog 2012-02-12 17:05:23 UTC (rev 6401)
@@ -1,9 +1,19 @@
-xfce4-session (4.8.2-4) UNRELEASED; urgency=low
+xfce4-session (4.8.3-1) UNRELEASED; urgency=low
+ * New upstream bugfix release.
* debian/xfce4-autostart-editor.1, debian/manpages: dropped, the binary
doesn't exist on Xfce 4.6 and later.
+ * debian/rules:
+ - use debhelper 9 hardening support.
+ * Fix paths for multiarch dirs.
+ * debian/compat bumped to 9.
+ * debian/control:
+ - drop hardening-includes build-dep.
+ - update debhelper build-dep to 9 for hardening support.
+ - add dpkg-dev 1.16.1 build-dep for hardening support.
+ - pre-depends on multiarch-support.
- -- Lionel Le Folgoc <mrpouit at gmail.com> Wed, 04 Jan 2012 22:14:54 +0100
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sun, 12 Feb 2012 17:39:57 +0100
xfce4-session (4.8.2-3) unstable; urgency=low
Modified: desktop/trunk/xfce4-session/debian/compat
===================================================================
--- desktop/trunk/xfce4-session/debian/compat 2012-02-12 16:28:56 UTC (rev 6400)
+++ desktop/trunk/xfce4-session/debian/compat 2012-02-12 17:05:23 UTC (rev 6401)
@@ -1 +1 @@
-7
+9
Modified: desktop/trunk/xfce4-session/debian/control
===================================================================
--- desktop/trunk/xfce4-session/debian/control 2012-02-12 16:28:56 UTC (rev 6400)
+++ desktop/trunk/xfce4-session/debian/control 2012-02-12 17:05:23 UTC (rev 6401)
@@ -3,11 +3,11 @@
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), libx11-dev, libxml-parser-perl, chrpath,
+Build-Depends: debhelper (>= 9), libx11-dev, libxml-parser-perl, chrpath,
fortune-mod, libdbus-1-dev, libdbus-glib-1-dev, xfce4-panel-dev (>= 4.8.0),
libxfce4util-dev (>= 4.8.0), libxfce4ui-1-dev (>= 4.8.0), libwnck-dev,
x11-xserver-utils, libxfconf-0-dev (>= 4.8.0), libglade2-dev,
- intltool (>= 0.31), hardening-includes, xfce4-dev-tools, libtool
+ intltool (>= 0.31), dpkg-dev (>= 1.16.1), xfce4-dev-tools, libtool
Standards-Version: 3.9.2
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-session/
@@ -16,6 +16,7 @@
Package: xfce4-session
Section: xfce
Architecture: any
+Pre-Depends: multiarch-support
Depends: ${shlibs:Depends}, ${misc:Depends}, xfce4-settings, xfconf
Recommends: xfwm4, xfce4-utils, xfdesktop4, ${shlibs:Recommends}, consolekit, upower,
dbus-x11, x11-xserver-utils
Modified: desktop/trunk/xfce4-session/debian/rules
===================================================================
--- desktop/trunk/xfce4-session/debian/rules 2012-02-12 16:28:56 UTC (rev 6400)
+++ desktop/trunk/xfce4-session/debian/rules 2012-02-12 17:05:23 UTC (rev 6401)
@@ -1,15 +1,8 @@
#!/usr/bin/make -f
-include /usr/share/hardening-includes/hardening.make
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
-CFLAGS+=$(HARDENING_CFLAGS)
-
-export CFLAGS LDFLAGS
-
-
override_dh_auto_configure:
NOCONFIGURE=1 xdt-autogen
dh_auto_configure
@@ -20,14 +13,14 @@
dh_auto_clean
override_dh_install:
- rm -f debian/tmp/usr/lib/xfce4/session/splash-engines/*.la
- rm -f debian/tmp/usr/lib/*.la
- rm -f debian/tmp/usr/lib/xfce4/panel/plugins/libxfsm-logout-plugin.*a
+ rm -f debian/tmp/usr/lib/*/xfce4/session/splash-engines/*.la
+ rm -f debian/tmp/usr/lib/*/*.la
+ rm -f debian/tmp/usr/lib/*/xfce4/panel/plugins/libxfsm-logout-plugin.*a
chrpath -d -k debian/tmp/usr/bin/* \
- debian/tmp/usr/lib/xfce4/session/xfsm-shutdown-helper \
- debian/tmp/usr/lib/xfce4/session/splash-engines/*so \
- debian/tmp/usr/lib/xfce4/panel/plugins/libxfsm-logout-plugin.so
+ debian/tmp/usr/lib/*/xfce4/session/xfsm-shutdown-helper \
+ debian/tmp/usr/lib/*/xfce4/session/splash-engines/*so \
+ debian/tmp/usr/lib/*/xfce4/panel/plugins/libxfsm-logout-plugin.so
cat debian/debian-tips >> debian/tmp/usr/share/xfce4/tips/tips
strfile debian/tmp/usr/share/xfce4/tips/tips \
@@ -36,11 +29,11 @@
dh_install --fail-missing
override_dh_shlibdeps:
- dh_shlibdeps -X debian/xfce4-session/usr/lib/xfce4/panel/plugins/libxfsm-logout-plugin.so -- \
- -dRecommends debian/xfce4-session/usr/lib/xfce4/panel/plugins/libxfsm-logout-plugin.so -dDepends
+ dh_shlibdeps -X debian/xfce4-session/usr/lib/*/xfce4/panel/plugins/libxfsm-logout-plugin.so -- \
+ -dRecommends debian/xfce4-session/usr/lib/*/xfce4/panel/plugins/libxfsm-logout-plugin.so -dDepends
override_dh_makeshlibs:
- dh_makeshlibs -X debian/xfce4-session/usr/lib/xfce4/panel/plugins/libxfsm-logout-plugin.so
+ dh_makeshlibs -X debian/xfce4-session/usr/lib/*/xfce4/panel/plugins/libxfsm-logout-plugin.so
override_dh_strip:
dh_strip --dbg-package=xfce4-session-dbg
Modified: desktop/trunk/xfce4-session/debian/xfce4-session.lintian-overrides
===================================================================
--- desktop/trunk/xfce4-session/debian/xfce4-session.lintian-overrides 2012-02-12 16:28:56 UTC (rev 6400)
+++ desktop/trunk/xfce4-session/debian/xfce4-session.lintian-overrides 2012-02-12 17:05:23 UTC (rev 6401)
@@ -1,2 +1,2 @@
-xfce4-session: non-dev-pkg-with-shlib-symlink usr/lib/libxfsm-4.6.so.0.0.0 usr/lib/libxfsm-4.6.so
+xfce4-session: non-dev-pkg-with-shlib-symlink usr/lib/*/libxfsm-4.6.so.0.0.0 usr/lib/*/libxfsm-4.6.so
xfce4-session: package-name-doesnt-match-sonames libxfsm-4.6-0
More information about the Pkg-xfce-commits
mailing list