[Pkg-xfce-commits] r8820 - in /desktop/trunk/xfce4-session: ./ debian/changelog debian/control debian/patches/03_add-light-locker-to-xflock4.patch debian/patches/series

[Yves-Alexis Perez]

Author: corsac
Date: Wed Mar  4 07:15:58 2015
New Revision: 8820

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=8820
Log:
merge changes from experimental

Added:
    desktop/trunk/xfce4-session/debian/patches/03_add-light-locker-to-xflock4.patch
      - copied unchanged from r8819, desktop/branches/experimental/xfce4-session/debian/patches/03_add-light-locker-to-xflock4.patch
Modified:
    desktop/trunk/xfce4-session/   (props changed)
    desktop/trunk/xfce4-session/debian/changelog
    desktop/trunk/xfce4-session/debian/control
    desktop/trunk/xfce4-session/debian/patches/series

Propchange: desktop/trunk/xfce4-session/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Wed Mar  4 07:15:58 2015
@@ -1 +1 @@
-/desktop/branches/experimental/xfce4-session:6602-7429
+/desktop/branches/experimental/xfce4-session:6602-7429,8047-8819

Modified: desktop/trunk/xfce4-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/debian/changelog?rev=8820&op=diff
==============================================================================
--- desktop/trunk/xfce4-session/debian/changelog	(original)
+++ desktop/trunk/xfce4-session/debian/changelog	Wed Mar  4 07:15:58 2015
@@ -1,3 +1,40 @@
+xfce4-session (4.12.0-1) UNRELEASED; urgency=medium
+
+  [ Mateusz Łukasik ]
+  * Merged changes from unstable.
+
+  [ Yves-Alexis Perez ]
+  * New upstream release.
+   - fix bashism in startxfce4 script.                          closes: #742720
+  * debian/patches:
+    - 02_runtime-logind-support dropped, included upstream.
+  * debian/control:
+    - update standards version to 3.9.6.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 07 Dec 2014 11:22:45 +0100
+
+xfce4-session (4.11.0-1) experimental; urgency=low
+
+  [ Lionel Le Folgoc ]
+  * Check for logind support at runtime:
+    - debian/patches/02_runtime-logind-support.patch: added.
+    - debian/rules:
+      + call xdt-autogen after patching
+      + clean up autogenerated files modified by xdt-autogen.
+    - debian/control:
+      + add build-dep on libpolkit-gobject-1-dev.
+      + add build-dep on xfce4-dev-tools and libtool in order to run xdt-autogen
+        after patching.
+      + don't recommend consolekit anymore.
+  * debian/control: update my email address.
+
+  [ Yves-Alexis Perez ]
+  * New upstream release.
+  * debian/control:
+    - update standards version to 3.9.5.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 28 Feb 2014 21:33:32 +0100
+
 xfce4-session (4.10.1-10) unstable; urgency=medium
 
   * debian/{pre,postrm}: correctly handle all alternatives removal.

Modified: desktop/trunk/xfce4-session/debian/control
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/debian/control?rev=8820&op=diff
==============================================================================
--- desktop/trunk/xfce4-session/debian/control	(original)
+++ desktop/trunk/xfce4-session/debian/control	Wed Mar  4 07:15:58 2015
@@ -5,8 +5,8 @@
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 9), libx11-dev, libxml-parser-perl,
  libdbus-1-dev, libdbus-glib-1-dev, libxfce4util-dev (>= 4.10.0),
- libxfce4ui-1-dev (>= 4.10.0), libwnck-dev, x11-xserver-utils,
- libxfconf-0-dev (>= 4.10.0), libglade2-dev, intltool (>= 0.31),
+ libxfce4ui-1-dev (>= 4.11), libwnck-dev, x11-xserver-utils,
+ libxfconf-0-dev (>= 4.10), libglade2-dev, intltool (>= 0.31),
  dpkg-dev (>= 1.16.1), libpolkit-gobject-1-dev, xfce4-dev-tools, libtool
 Standards-Version: 3.9.6
 Homepage: http://www.xfce.org/

Modified: desktop/trunk/xfce4-session/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/debian/patches/series?rev=8820&op=diff
==============================================================================
--- desktop/trunk/xfce4-session/debian/patches/series	(original)
+++ desktop/trunk/xfce4-session/debian/patches/series	Wed Mar  4 07:15:58 2015
@@ -1,5 +1,2 @@
 01_fix-xrdb-call.patch
-02_add-light-locker-to-xflock4.patch 
-03_runtime-logind-support.patch
-0001-Export-XDG_CURRENT_DESKTOP-Bug-11239.patch
-0001-Add-DesktopNames-to-.desktop-file.patch
+03_add-light-locker-to-xflock4.patch