[Pkg-xfce-commits] [Git][xfce-team/desktop/xfce4-session][debian/master] 7 commits: Use default-logind | logind virtual packages (Closes: #925338)

[Yves-Alexis Perez]

Yves-Alexis Perez pushed to branch debian/master at xfce / desktop / xfce4-session


Commits:
a29a5b9e by Mark Hindley at 2020-07-30T17:26:14+01:00
Use default-logind | logind virtual packages (Closes: #925338)

- - - - -
a8d13447 by Mark Hindley at 2020-07-30T17:27:36+01:00
Remove obsolete systemd-shim recommendation.

- - - - -
e14c14db by Mark Hindley at 2020-08-11T12:21:10+01:00
Use default-dbus-session-bus | dbus-session-bus virtual packages (Closes: #836062).

- - - - -
b2840157 by Mark Hindley at 2020-08-11T12:21:10+01:00
Depend rather than Recommend x11-xserver-utils (Closes:  #902137).

- - - - -
6bb72e1d by Mark Hindley at 2020-08-11T12:21:10+01:00
Don't clean built sources when maintainer mode is disabled (Closes: #902362).

- - - - -
3022fbe4 by Mark Hindley at 2020-08-11T12:21:10+01:00
Changelog for Merge Request.

- - - - -
d0e4dde1 by Yves-Alexis Perez at 2020-08-18T10:57:07+00:00
Merge branch 'merge_request' into 'debian/master'

Merge request: fix #902362, #902137, #836062 and #925338

See merge request xfce-team/desktop/xfce4-session!2
- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/0003-Do-not-clean-built-sources-when-maintainer-mode-is-disabled.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+xfce4-session (4.14.2-2) UNRELEASED; urgency=medium
+
+  * Use default-logind | logind virtual packages (Closes: #925338).
+  * Use default-dbus-session-bus | dbus-session-bus virtual packages
+    (Closes: #836062).
+  * Depend rather than Recommend x11-xserver-utils (Closes:  #902137).
+  * Don't clean upstream generated source files (Closes: #902362).
+  * Remove obsolete systemd-shim recommendation.
+
+ -- Mark Hindley <mark at hindley.org.uk>  Wed, 05 Aug 2020 13:41:25 +0100
+
 xfce4-session (4.14.2-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -27,13 +27,12 @@ Architecture: any
 Breaks: xfce4-utils
 Replaces: xfce4-utils
 Pre-Depends: ${misc:Pre-Depends}
-Depends: xfce4-settings (>= 4.10.0), xfconf, ${misc:Depends}, ${shlibs:Depends}
-Recommends: dbus-x11,
-            libpam-systemd [linux-any],
+Depends: xfce4-settings (>= 4.10.0), xfconf, x11-xserver-utils, ${misc:Depends}, ${shlibs:Depends}
+Recommends: default-dbus-session-bus | dbus-session-bus,
+            default-logind [linux-any] | logind [linux-any],
             light-locker,
-            systemd-sysv [linux-any] | systemd-shim,
+            systemd-sysv [linux-any],
             upower,
-            x11-xserver-utils,
             xfdesktop4,
             xfwm4
 Suggests: fortunes-mod, sudo


=====================================
debian/patches/0003-Do-not-clean-built-sources-when-maintainer-mode-is-disabled.patch
=====================================
@@ -0,0 +1,21 @@
+From f9fadb6f9df8194e0829a47aa696198a89f6b50e Mon Sep 17 00:00:00 2001
+From: Mark Hindley <mark at hindley.org.uk>
+Date: Thu, 30 Jul 2020 21:30:10 +0100
+Subject: [PATCH] Don't clean built sources when maintainer mode is disabled
+ (Closes: #902362).
+
+---
+ xfce4-session/Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletion(-)
+
+--- a/xfce4-session/Makefile.am
++++ b/xfce4-session/Makefile.am
+@@ -153,7 +153,7 @@
+ 	org.xfce.session.policy.in2
+ 
+ DISTCLEANFILES =							\
+-	$(xfce4_session_built_sources)			\
++	$(BUILT_SOURCES)					\
+ 	org.xfce.session.policy					\
+ 	org.xfce.session.policy.in
+ 


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 0001-Update-locker-list-in-xflock4.patch
 0002-use-xscreensaver-through-the-wrapper-it-ships.patch
+0003-Do-not-clean-built-sources-when-maintainer-mode-is-disabled.patch



View it on GitLab: https://salsa.debian.org/xfce-team/desktop/xfce4-session/-/compare/1003c95971a3b847bed8db21f4ff46095beec62f...d0e4dde197a11adc95fe9db3127c7d60e57633d3

-- 
View it on GitLab: https://salsa.debian.org/xfce-team/desktop/xfce4-session/-/compare/1003c95971a3b847bed8db21f4ff46095beec62f...d0e4dde197a11adc95fe9db3127c7d60e57633d3
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-xfce-commits/attachments/20200818/51973d72/attachment-0001.html>