Skip to content
Commits on Source (9)
Show whitespace changes
Inline Side-by-side
debian/control
View file @ 5fea30d4
......@@ -2,10 +2,8 @@ Source: xfce4-session
Section: xfce
Priority: optional
Maintainer: Debian Xfce Maintainers <debian-xfce@lists.debian.org>
Uploaders: Yves-Alexis Perez <corsac@debian.org>,
Lionel Le Folgoc <mrpouit@gmail.com>
Build-Depends: debhelper (>= 10),
dpkg-dev (>= 1.16.1),
Uploaders: Yves-Alexis Perez <corsac@debian.org>
Build-Depends: debhelper-compat (= 10),
intltool (>= 0.31),
libdbus-1-dev,
libdbus-glib-1-dev,
......@@ -15,20 +13,19 @@ Build-Depends: debhelper (>= 10),
libtool,
libwnck-dev,
libx11-dev,
libxfce4ui-2-dev (>= 4.12.0),
libxfce4util-dev (>= 4.12.0),
libxfconf-0-dev (>= 4.12),
libxfce4ui-2-dev,
libxfce4util-dev,
libxfconf-0-dev,
libxml-parser-perl,
libwnck-3-dev,
x11-xserver-utils,
xfce4-dev-tools
Standards-Version: 4.1.1
Homepage: http://www.xfce.org/
Standards-Version: 4.3.0
Homepage: https://www.xfce.org/
Vcs-Git: https://salsa.debian.org/xfce-team/desktop/xfce4-session.git
Vcs-Browser: https://salsa.debian.org/xfce-team/desktop/xfce4-session
Package: xfce4-session
Section: xfce
Architecture: any
Breaks: xfce4-utils
Replaces: xfce4-utils
......
debian/copyright
View file @ 5fea30d4
......@@ -2,7 +2,7 @@ This package was debianized by Oliver M. Bolzer <oliver@debian.org> on
Tue, 9 Dec 2003 09:40:42 +0100.
You can fetch xfce4-session from the official Xfce4 website which is
http://www.xfce.org
https://www.xfce.org
Upstream Author are:
Benedikt Meurer <benny@xfce.org>
......
debian/patches/03_xflock4-update-lockers-list.patch → debian/patches/0001-Update-locker-list-in-xflock4.patch
View file @ 5fea30d4
From: Yves-Alexis Perez <corsac@debian.org>
Date: Thu, 3 Jan 2019 21:12:40 +0100
Subject: Update locker list in xflock4
add light-locker. xfce4-screensaver and mate-screensaver
---
scripts/xflock4 | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/scripts/xflock4 b/scripts/xflock4
index 32770b4..84ad018 100644
--- a/scripts/xflock4
+++ b/scripts/xflock4
@@ -31,7 +31,9 @@ LOCK_CMD=$(xfconf-query -c xfce4-session
@@ -31,7 +31,10 @@ LOCK_CMD=$(xfconf-query -c xfce4-session -p /general/LockCommand)
for lock_cmd in \
"$LOCK_CMD" \
"xscreensaver-command -lock" \
- "gnome-screensaver-command --lock"
+ "light-locker-command --lock" \
+ "xfce4-screensaver-command --lock" \
+ "gnome-screensaver-command --lock" \
+ "mate-screensaver-command --lock"
do
......
debian/patches/04-use-debian-xscreensaver-wrapper.patch → debian/patches/0002-use-xscreensaver-through-the-wrapper-it-ships.patch
View file @ 5fea30d4
Description: xscreensaver ships a wrapper that checks what DM is running,
From: Unit 193 <unit193@ubuntu.com>
Date: Thu, 3 Jan 2019 21:12:03 +0100
Subject: use xscreensaver through the wrapper it ships
xscreensaver ships a wrapper that checks what DM is running,
and conditionally uses either dm-tool or gdmflexiserver.
Author: Unit 193 <unit193@ubuntu.com>
Forwarded: not-needed
Last-Update: 2016-09-21
---
scripts/xscreensaver.desktop.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- xfce4-session-4.12.1.orig/scripts/xscreensaver.desktop.in
+++ xfce4-session-4.12.1/scripts/xscreensaver.desktop.in
diff --git a/scripts/xscreensaver.desktop.in b/scripts/xscreensaver.desktop.in
index b18ba52..66d7dbf 100644
--- a/scripts/xscreensaver.desktop.in
+++ b/scripts/xscreensaver.desktop.in
@@ -4,6 +4,6 @@ Type=Application
_Name=Screensaver
_Comment=Launch screensaver and locker program
......
debian/patches/0003-hardcode-RM_CMD-to-rm.patch 0 → 100644
View file @ 5fea30d4
From: Yves-Alexis Perez <corsac@debian.org>
Date: Thu, 3 Jan 2019 21:14:42 +0100
Subject: hardcode RM_CMD to rm
That fixes some reproducible build failures with usrmerge, when the
build system and the run system are not in the same situation
---
engines/balou/config.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/engines/balou/config.c b/engines/balou/config.c
index 13709cb..8fd24d6 100644
--- a/engines/balou/config.c
+++ b/engines/balou/config.c
@@ -352,7 +352,8 @@ config_install_theme (GtkWidget *item,
gtk_widget_destroy (chooser);
}
-
+#undef RM_CMD
+#define RM_CMD "rm"
#ifdef RM_CMD
static void
config_remove_theme (GtkWidget *item,
debian/patches/series
View file @ 5fea30d4
03_xflock4-update-lockers-list.patch
04-use-debian-xscreensaver-wrapper.patch
0001-Update-locker-list-in-xflock4.patch
0002-use-xscreensaver-through-the-wrapper-it-ships.patch
0003-hardcode-RM_CMD-to-rm.patch
debian/watch
View file @ 5fea30d4
version=3
http://archive.xfce.org/src/xfce/xfce4-session/([\d\.]+)/ \
https://archive.xfce.org/src/xfce/xfce4-session/([\d\.]+)/ \
xfce4-session-([\d\.]+)\.tar\.(?:gz|bz2)
debian/xfce4-session.lintian-overrides
View file @ 5fea30d4
# the lib is private so we won't split it
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
xfce4-session: no-symbols-control-file usr/lib/x86_64-linux-gnu/libxfsm-4.6.so.0.0.0
# we do build using hardening flags, it's a false positive
xfce4-session: hardening-no-fortify-functions usr/lib/*/xfce4/session/splash-engines/libbalou.so
xfce4-session: hardening-no-fortify-functions usr/lib/*/xfce4/session/xfsm-shutdown-helper
# XFCE is a valid category, desktop-file-validate has to be updated (#671600)
xfce4-session: desktop-entry-invalid-category XFCE usr/share/applications/xfce-session-settings.desktop
# xsessions files are not really desktop files, they don't have to follow the
# specs. See also b.fd.o #85938
xfce4-session: desktop-entry-contains-unknown-key usr/share/xsessions/xfce.desktop
xfce4-session: desktop-entry-lacks-keywords-entry usr/share/xsessions/xfce.desktop