[Pkg-xfce-commits] r5183 - in desktop/trunk/xfce4-session/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Thu Mar 31 09:35:37 UTC 2011
Author: corsac
Date: 2011-03-31 09:35:35 +0000 (Thu, 31 Mar 2011)
New Revision: 5183
Added:
desktop/trunk/xfce4-session/debian/xfce4-session.install
Removed:
desktop/trunk/xfce4-session/debian/patches/03_gk-start-with-path.patch
desktop/trunk/xfce4-session/debian/patches/04_gk-dont-check-running-use-start.patch
Modified:
desktop/trunk/xfce4-session/debian/changelog
desktop/trunk/xfce4-session/debian/control
desktop/trunk/xfce4-session/debian/copyright
desktop/trunk/xfce4-session/debian/patches/02_fix-fortune-path.patch
desktop/trunk/xfce4-session/debian/patches/series
desktop/trunk/xfce4-session/debian/rules
desktop/trunk/xfce4-session/debian/xfce4-session.lintian-overrides
Log:
merge 4.8 branch from experimental
Modified: desktop/trunk/xfce4-session/debian/changelog
===================================================================
--- desktop/trunk/xfce4-session/debian/changelog 2011-03-31 08:57:51 UTC (rev 5182)
+++ desktop/trunk/xfce4-session/debian/changelog 2011-03-31 09:35:35 UTC (rev 5183)
@@ -1,20 +1,51 @@
-xfce4-session (4.6.2-4) UNRELEASED; urgency=low
+xfce4-session (4.8.1-1) experimental; urgency=low
+ [ Yves-Alexis Perez ]
+ * New upstream release.
* debian/patches:
- - 05_force-xfsettings-start added, try to force xfsettingsd start to
- workaround a gdm3 issue where gnome-settings-daemon is still running
- after login, preventing xfsettingsd start (to revert when #614682 is
- fixed).
+ - 02_fix-fortune-path refreshed.
+ - 04_gk-dont-check-running-use-start refreshed.
+ * debian/control:
+ - refresh build-deps for Xfce 4.7.
+ - add build-dep on hardening-includes.
+ - drop fortunes-mod from depends, xfce4-session uses internal
+ implementation. Move it to Suggests so people can still use it for real
+ fortunes.
+ - add a -dbg package with debugging symbols.
+ * debian/rules:
+ - don't pass libexecdir, useless now
+ - update xfsm-shutdown-helper path in chrpath call.
+ - update splash-engine path.
+ - pick {C,LD}FLAGS from dpkg-buildflags.
+ - add hardening flags to {C,LD}FLAGS.
+ - strip debugging symbols to the -dbg package.
+ - ignore libxfsm-logout plugin in dh_makeshlibs, it's a plugin, not a
+ library.
+ * debian/xfce4-session.lintian-overrides:
+ - drop xfsm-shutdown-helper and balou theme overrides, useless now.
+ * debian/copyright updated for new upstream release.
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 22 Feb 2011 22:49:39 +0100
-
-xfce4-session (4.6.2-3) unstable; urgency=low
-
+ [ Lionel Le Folgoc ]
* debian/control:
- - add consolekit to Recommends for system
- shutdown/reboot/suspend/hibernate.
+ - add myself to Uploaders
+ - change hal recommends to upower and consolekit.
+ * debian/patches/05_reuse-existing-ck-session.patch: do not open a new
+ consolekit session if one is already present (Xfce #6685)
+ * Bugs fixed by 4.7.x/4.8.x series:
+ - Cannot edit an item in Autostarted applications dialog lp: #245171
+ - Does not use the ConsoleKit interface to shutdown or reboot lp: #496423
+ - Fails to request necessary permissions from policykit to perform
+ shutdown/restart when multiple users are logged in lp: #251337
+ * debian/patches:
+ - 03_gk-start-with-path.patch: dropped, included upstream
+ - 04_gk-dont-check-running-use-start.patch: ditto
+ - 05_reuse-existing-ck-session.patch: dropped too.
+ * Re-enable building of the panel plugin:
+ - debian/control: build-depends on xfce4-panel-dev >= 4.7.0
+ - debian/rules: add it to chrpath and override dh_shlibdeps to move its
+ deps as recommends.
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 13 Nov 2010 14:09:51 +0100
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 15 Feb 2011 00:18:12 +0100
xfce4-session (4.6.2-2) unstable; urgency=low
Modified: desktop/trunk/xfce4-session/debian/control
===================================================================
--- desktop/trunk/xfce4-session/debian/control 2011-03-31 08:57:51 UTC (rev 5182)
+++ desktop/trunk/xfce4-session/debian/control 2011-03-31 09:35:35 UTC (rev 5183)
@@ -2,12 +2,13 @@
Section: xfce
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
+ 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,
- fortune-mod, libdbus-1-dev, libdbus-glib-1-dev,
- libxfce4util-dev (>= 4.6.0), libxfcegui4-dev (>= 4.6.0), libwnck-dev,
- x11-xserver-utils, libxfconf-0-dev (>= 4.6.0), libglade2-dev,
- intltool (>= 0.31)
+ 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
Standards-Version: 3.9.1
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-session/
@@ -16,12 +17,21 @@
Package: xfce4-session
Section: xfce
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, fortune-mod, xfce4-settings, xfconf
-Recommends: xfwm4, xfce4-utils, xfdesktop4, xfce4-panel, hal, consolekit, dbus-x11, x11-xserver-utils
-Suggests: sudo
+Depends: ${shlibs:Depends}, ${misc:Depends}, xfce4-settings, xfconf
+Recommends: xfwm4, xfce4-utils, xfdesktop4, ${shlibs:Recommends}, consolekit, upower,
+ dbus-x11, x11-xserver-utils
+Suggests: sudo, fortunes-mod
Provides: x-session-manager
Description: Xfce4 Session Manager
xfce4-session is an X11-compliant "session manager" designed for use with
the Xfce4 Desktop Environment. On log out, the session manager saves the
state of all your running applications. When you log back in, the session
manager restores the same applications with the same window positions.
+
+Package: xfce4-session-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: ${shlibs:Depends}, ${misc:Depends}, xfce4-session (= ${binary:Version})
+Description: Xfce4 Session Manager (debug symbols)
+ This package ships debugging symbols for the Xfce session manager.
Modified: desktop/trunk/xfce4-session/debian/copyright
===================================================================
--- desktop/trunk/xfce4-session/debian/copyright 2011-03-31 08:57:51 UTC (rev 5182)
+++ desktop/trunk/xfce4-session/debian/copyright 2011-03-31 09:35:35 UTC (rev 5183)
@@ -12,24 +12,160 @@
Brian Tarricone <kelnos at xfce.org>
Jani Monoses <jani at ubuntu.com>
-Copyright holders:
-
- xfce4-session: © 2003-2006 Benedikt Meurer <benny at xfce.org>
- xfce4-session/xfsm-legacy.c: © 2000 Matthias Ettrich <ettrich at kde.org>
- xfce4-session/xfsm-manager.c: © 2000 Matthias Ettrich <ettrich at kde.org>
-
+Files: engines/balou/balou-theme.c
+ engines/balou/balou-theme.h
+ engines/balou/balou.c
+ engines/balou/balou.h
+ engines/balou/config.c
+ engines/balou/engine.c
+ engines/mice/generate.c
+ engines/mice/mice.c
+ engines/simple/simple.c
+ libxfsm/xfsm-splash-engine.h
+ libxfsm/xfsm-splash-rc.c
+ libxfsm/xfsm-splash-rc.h
+ libxfsm/xfsm-util.h
+ settings/module.c
+ settings/module.h
+ settings/xfae-dialog.c
+ settings/xfae-dialog.h
+ settings/xfae-model.c
+ settings/xfae-model.h
+ xfce4-session/ice-layer.h
+ xfce4-session/shutdown.c
+ xfce4-session/shutdown.h
+ xfce4-session/sm-layer.h
+ xfce4-session/xfsm-chooser.c
+ xfce4-session/xfsm-chooser.h
+ xfce4-session/xfsm-client.h
xfce4-session/xfsm-compat-gnome.c
xfce4-session/xfsm-compat-gnome.h
- parts of libxfsm/xfsm-util.c, xfce4-session/xfsm-dns.c,
- xfce4-session/xfsm-legacy.c and xfce4-session/xfsm-manager.c are taken from
- gnome-session, which is: © 1998,99,2000 Free Software Foundation, Inc.
+ xfce4-session/xfsm-compat-kde.c
+ xfce4-session/xfsm-compat-kde.h
+ xfce4-session/xfsm-dns.c
+ xfce4-session/xfsm-dns.h
+ xfce4-session/xfsm-fadeout.c
+ xfce4-session/xfsm-fadeout.h
+ xfce4-session/xfsm-global.h
+ xfce4-session/xfsm-legacy.h
+ xfce4-session/xfsm-properties.h
+ xfce4-session/xfsm-splash-screen.c
+ xfce4-session/xfsm-splash-screen.h
+ xfce4-tips/main.c
+ xfsm-shutdown-helper/main.c
+Copyright: 2003-2004, Benedikt Meurer <benny at xfce.org>
+ 2003-2006, Benedikt Meurer <benny at xfce.org>
+ 2003-2007, Benedikt Meurer <benny at xfce.org>
+ 2004, Benedikt Meurer <benny at xfce.org>
+ 2004-2005, Benedikt Meurer <benny at xfce.org>
+ 2004-2006, Benedikt Meurer <benny at xfce.org>
+ 2005, Benedikt Meurer <benny at xfce.org>
+License: GPL
+Files: engines/mice/preview.h
+ engines/mice/slide.h
+ engines/simple/fallback.h
+ engines/simple/preview.h
+ panel-plugin/xfsm-logout-plugin-ui.h
+ settings/nopreview.h
+ settings/xfce4-session-marshal.c
+ settings/xfce4-session-marshal.h
+ settings/xfce4-session-settings_ui.h
+ settings/xfsm-client-dbus-client.h
+ settings/xfsm-manager-dbus-client.h
+ xfce4-session/chooser-icon.h
+ xfce4-session/xfsm-client-dbus.h
+ xfce4-session/xfsm-manager-dbus.h
+ xfce4-session/xfsm-marshal.c
+ xfce4-session/xfsm-marshal.h
+Comment: Autogenerated
+
+Files: xfce4-session/ice-layer.c
+ xfce4-session/main.c
+ xfce4-session/xfsm-client.c
+ xfce4-session/xfsm-global.c
+ xfce4-session/xfsm-manager.h
+ xfce4-session/xfsm-properties.c
+ xfce4-session/xfsm-startup.c
+ xfce4-session/xfsm-startup.h
+Copyright: 2003-2004, Benedikt Meurer <benny at xfce.org>
+ 2003-2006, Benedikt Meurer <benny at xfce.org>
+ 2008, Brian Tarricone <bjt23 at cornell.edu>
+License: GPL
+
+Files: settings/main.c
+ settings/session-editor.c
+ settings/startup-settings.c
+ settings/xfce4-session-settings-common.h
+ xfce4-session/xfsm-error.c
+ xfce4-session/xfsm-error.h
+Copyright: 2008, Brian Tarricone <bjt23 at cornell.edu>
+License: GPL-2
+
+Files: settings/splash-settings.c
+ settings/xfae-window.c
+ settings/xfae-window.h
+Copyright: 2003-2006, Benedikt Meurer <benny at xfce.org>
+ 2005, Benedikt Meurer <benny at xfce.org>
+ 2008, Jannis Pohlmann <jannis at xfce.org>
+License: GPL
+
+Files: xfce4-session/xfsm-shutdown-helper.c
+ xfce4-session/xfsm-shutdown-helper.h
+Copyright: 2003-2006, Benedikt Meurer <benny at xfce.org>
+ 2010, Ali Abdallah <aliov at xfce.org>
+License: GPL
+
+Files: xfce4-session/sm-layer.c
+Copyright: 2003-2004, Benedikt Meurer <benny at xfce.org>
+License: GPL
+
+Files: xfce4-session-logout/main.c
+Copyright: 2004, Benedikt Meurer <benny at xfce.org>
+ 2004,2008, Brian Tarricone <kelnos at xfce.org>
+License: GPL
+
+Files: libxfsm/xfsm-util.c
+Copyright: 2003-2004, Benedikt Meurer <benny at xfce.org>
+ 2004, Jasper Huijsmans <jasper at xfce.org>
+License: GPL
+
+Files: panel-plugin/xfsm-logout-plugin.c
+Copyright: 2000, Matthias Ettrich <ettrich at kde.org>
+ 2009, Brian Tarricone <brian at tarricone.org>
+License: GPL
+
+Files: xfce4-session/xfsm-manager.c
+Copyright: 2003-2006, Benedikt Meurer <benny at xfce.org>
+ 2008, Brian Tarricone <bjt23 at cornell.edu>
+ 2010, Jannis Pohlmann <jannis at xfce.org>
+License: GPL-2+
+
+Files: ltmain.sh
+Copyright: 1996-2001, 2003-2007, 2008 Free Software Foundation, Inc
+License: GPL-2+
+
+Files: engines/balou/gnome-uri.h
+Copyright: 1997-2000, Free Software Foundation
+License: LGPL-2+
+
+Files: engines/balou/gnome-uri.c
+Copyright: 1997, Paolo Molaro
+ 1998, Miguel de Icaza
+License: LGPL-2+
+
+Files: xfce4-session/xfsm-legacy.c
+Copyright: 2000, Matthias Ettrich <ettrich at kde.org>
+ 2004, Benedikt Meurer <benny at xfce.org>
+License: MIT/X11 (BSD like) GPL
+
License:
You are free to distribute this software under the terms of
-the GNU General Public License version 2 or later.
-On Debian systems, the complete text of the GNU General Public
-License can be found in the file `/usr/share/common-licenses/GPL'.
+the GNU General Public License version 2 or later. On Debian systems, the
+complete text of the GNU General Public License can be found in the file
+`/usr/share/common-licenses/GPL'. The complete text of the version 2 can be
+found in the file `/usr/share/common-licenses/GPL-2'
Documentation is under GNU Free Documentation License v1.1 or later, without
any invariant sections, using the following statement:
@@ -39,6 +175,3 @@
any later version published by the Free Software Foundation; with no
Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
Texts.
-
-On Debian systems, the complete text of the GNU Lesser General Public
-License can be found in the file `/usr/share/common-licenses/LGPL'.
Modified: desktop/trunk/xfce4-session/debian/patches/02_fix-fortune-path.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/02_fix-fortune-path.patch 2011-03-31 08:57:51 UTC (rev 5182)
+++ desktop/trunk/xfce4-session/debian/patches/02_fix-fortune-path.patch 2011-03-31 09:35:35 UTC (rev 5183)
@@ -1,18 +1,13 @@
diff --git a/xfce4-tips/main.c b/xfce4-tips/main.c
-index 0961879..4f88935 100644
+index 355d6bd..c22fbd7 100644
--- a/xfce4-tips/main.c
+++ b/xfce4-tips/main.c
-@@ -115,11 +115,11 @@ next_cb(GtkWidget *btn, GtkTextBuffer *textbuf)
+@@ -274,7 +274,7 @@ main (int argc, char **argv)
+ channel = xfconf_channel_get ("xfce4-tips");
- switch (option) {
- case OPTION_TIPS:
-- strcpy(buffer, "fortune " TIPSDIR "/tips");
-+ strcpy(buffer, "/usr/games/fortune " TIPSDIR "/tips");
- break;
+ /* test for fortune */
+- fortune_cmd = g_find_program_in_path ("fortune");
++ fortune_cmd = g_find_program_in_path ("/usr/games/fortune");
- case OPTION_FORTUNES:
-- strcpy(buffer, "fortune");
-+ strcpy(buffer, "/usr/games/fortune");
- break;
- }
+ read_tips_from_file ();
Deleted: desktop/trunk/xfce4-session/debian/patches/03_gk-start-with-path.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/03_gk-start-with-path.patch 2011-03-31 08:57:51 UTC (rev 5182)
+++ desktop/trunk/xfce4-session/debian/patches/03_gk-start-with-path.patch 2011-03-31 09:35:35 UTC (rev 5183)
@@ -1,12 +0,0 @@
---- a/xfce4-session/xfsm-compat-gnome.c
-+++ b/xfce4-session/xfsm-compat-gnome.c
-@@ -128,7 +128,8 @@
- error = NULL;
- argv[0] = GNOME_KEYRING_DAEMON;
- argv[1] = NULL;
-- g_spawn_sync (NULL, argv, NULL, G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
-+ g_spawn_sync (NULL, argv, NULL,
-+ G_SPAWN_SEARCH_PATH | G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
- child_setup, NULL,
- &sout, NULL, &status, &error);
-
Deleted: desktop/trunk/xfce4-session/debian/patches/04_gk-dont-check-running-use-start.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/04_gk-dont-check-running-use-start.patch 2011-03-31 08:57:51 UTC (rev 5182)
+++ desktop/trunk/xfce4-session/debian/patches/04_gk-dont-check-running-use-start.patch 2011-03-31 09:35:35 UTC (rev 5183)
@@ -1,79 +0,0 @@
-Index: xfce4-session-4.6.2/xfce4-session/xfsm-compat-gnome.c
-===================================================================
---- xfce4-session-4.6.2.orig/xfce4-session/xfsm-compat-gnome.c 2010-05-31 14:36:01.988123134 +0200
-+++ xfce4-session-4.6.2/xfce4-session/xfsm-compat-gnome.c 2010-05-31 14:37:08.787058601 +0200
-@@ -100,34 +100,23 @@
- static void
- gnome_keyring_daemon_startup (void)
- {
-- const char *old_keyring;
--
- GError *error = NULL;
- gchar *sout;
- gchar **lines;
-+ gsize lineno;
- gint status;
- long pid;
- gchar *pid_str;
- gchar *end;
-- char *argv[2];
--
-- /* If there is already a working keyring, don't start a new daemon */
-- old_keyring = g_getenv ("GNOME_KEYRING_SOCKET");
-- if (old_keyring != NULL && access (old_keyring, R_OK | W_OK) == 0)
-- {
--#ifdef HAVE_GNOME_KEYRING
-- gnome_keyring_daemon_prepare_environment_sync ();
--#endif
-- return;
-- }
--
-+ char *argv[3];
-
- /* Pipe to slave keyring lifetime to */
- pipe (keyring_lifetime_pipe);
-
- error = NULL;
- argv[0] = GNOME_KEYRING_DAEMON;
-- argv[1] = NULL;
-+ argv[1] = "--start";
-+ argv[2] = NULL;
- g_spawn_sync (NULL, argv, NULL,
- G_SPAWN_SEARCH_PATH | G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
- child_setup, NULL,
-@@ -147,20 +136,22 @@
- {
- if (WIFEXITED (status) && WEXITSTATUS (status) == 0 && sout != NULL)
- {
-- lines = g_strsplit (sout, "\n", 3);
-+ lines = g_strsplit (sout, "\n", 0);
-
-- if (lines[0] != NULL && lines[1] != NULL
-- && g_str_has_prefix (lines[1], "GNOME_KEYRING_PID="))
-- {
-- pid_str = lines[1] + strlen ("GNOME_KEYRING_PID=");
-- pid = strtol (pid_str, &end, 10);
--
-- if (end != pid_str)
-- {
-- gnome_keyring_daemon_pid = pid;
-- xfce_putenv (lines[0]);
-- }
-- }
-+ for (lineno = 0; lines[lineno] != NULL; lineno++)
-+ {
-+ xfce_putenv (lines[lineno]);
-+
-+ if (g_str_has_prefix (lines[lineno], "GNOME_KEYRING_PID="))
-+ {
-+ pid_str = lines[lineno] + strlen ("GNOME_KEYRING_PID=");
-+ pid = strtol (pid_str, &end, 10);
-+ if (end != pid_str)
-+ {
-+ gnome_keyring_daemon_pid = pid;
-+ }
-+ }
-+ }
-
- g_strfreev (lines);
-
Modified: desktop/trunk/xfce4-session/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/series 2011-03-31 08:57:51 UTC (rev 5182)
+++ desktop/trunk/xfce4-session/debian/patches/series 2011-03-31 09:35:35 UTC (rev 5183)
@@ -1,5 +1,2 @@
01_correct_shadows.patch
02_fix-fortune-path.patch
-03_gk-start-with-path.patch
-04_gk-dont-check-running-use-start.patch
-05_force-xfsettingsd-start.patch
Modified: desktop/trunk/xfce4-session/debian/rules
===================================================================
--- desktop/trunk/xfce4-session/debian/rules 2011-03-31 08:57:51 UTC (rev 5182)
+++ desktop/trunk/xfce4-session/debian/rules 2011-03-31 09:35:35 UTC (rev 5183)
@@ -1,17 +1,17 @@
#!/usr/bin/make -f
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
+include /usr/share/hardening-includes/hardening.make
+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:
- dh_auto_configure -- --libexecdir=/usr/sbin
+ dh_auto_configure
find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
override_dh_auto_clean:
@@ -19,16 +19,29 @@
dh_auto_clean
override_dh_install:
- rm -f debian/xfce4-session/usr/lib/xfce4/splash/engines/*.la
- rm -f debian/xfce4-session/usr/lib/*.la
-
- chrpath -d -k debian/xfce4-session/usr/bin/* \
- debian/xfce4-session/usr/sbin/xfsm-shutdown-helper \
- debian/xfce4-session/usr/lib/xfce4/splash/engines/*so
+ 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
- cat debian/debian-tips >> debian/xfce4-session/usr/share/xfce4/tips/tips
- strfile debian/xfce4-session/usr/share/xfce4/tips/tips \
- debian/xfce4-session/usr/share/xfce4/tips/tips.dat
+ 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
+
+ cat debian/debian-tips >> debian/tmp/usr/share/xfce4/tips/tips
+ strfile debian/tmp/usr/share/xfce4/tips/tips \
+ debian/tmp/usr/share/xfce4/tips/tips.dat
+ 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
+
+override_dh_makeshlibs:
+ 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
+
%:
dh $@
Copied: desktop/trunk/xfce4-session/debian/xfce4-session.install (from rev 5182, desktop/branches/experimental/xfce4-session/debian/xfce4-session.install)
===================================================================
--- desktop/trunk/xfce4-session/debian/xfce4-session.install (rev 0)
+++ desktop/trunk/xfce4-session/debian/xfce4-session.install 2011-03-31 09:35:35 UTC (rev 5183)
@@ -0,0 +1,2 @@
+usr
+etc
Modified: desktop/trunk/xfce4-session/debian/xfce4-session.lintian-overrides
===================================================================
--- desktop/trunk/xfce4-session/debian/xfce4-session.lintian-overrides 2011-03-31 08:57:51 UTC (rev 5182)
+++ desktop/trunk/xfce4-session/debian/xfce4-session.lintian-overrides 2011-03-31 09:35:35 UTC (rev 5183)
@@ -1,6 +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: package-name-doesnt-match-sonames libxfsm-4.6-0
-# These are all private
-xfce4-session: binary-without-manpage usr/sbin/balou-export-theme
-xfce4-session: binary-without-manpage usr/sbin/balou-install-theme
-xfce4-session: binary-without-manpage usr/sbin/xfsm-shutdown-helper
More information about the Pkg-xfce-commits
mailing list