[SCM] KDE Base Workspace module packaging branch, wheezy, updated. debian/4.8.4-4-16-g61082dc

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-workspace.git;a=commitdiff;h=5da2e32

The following commit has been merged in the wheezy branch:
commit 5da2e32e168e11ceab305dbaa924997f8207aa01
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Nov 26 16:55:28 2012 -0300

    Drop the usage of use-sessreg.
    
    sessreg was merged upstream so this is ignored now.
---
 debian/changelog           |    3 +++
 debian/local/kdm.options   |    1 -
 debian/local/kdm.options.5 |    7 -------
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 25976ec..afa4c25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ kde-workspace (4:4.8.4-5) UNRELEASED; urgency=low
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Remove "New upstream release" from the previous changelog entry
     (Closes: #691302). Thanks Filipus Klutiero.
+  * sessreg was merged in kdm:
+    - Drop the use-sessreg option in kdm.options and it's man page, as it is
+      no longer needed.
 
   [ Pino Toscano ]
   * Backport upstream commit 89161c40e064958aa192b2202670316671d7e377 to fix
diff --git a/debian/local/kdm.options b/debian/local/kdm.options
index 8bdc699..31c22dd 100644
--- a/debian/local/kdm.options
+++ b/debian/local/kdm.options
@@ -5,4 +5,3 @@
 
 no-ignore-nologin
 no-restart-on-upgrade
-use-sessreg
diff --git a/debian/local/kdm.options.5 b/debian/local/kdm.options.5
index 8626b97..8c591ff 100644
--- a/debian/local/kdm.options.5
+++ b/debian/local/kdm.options.5
@@ -63,12 +63,6 @@ is provided.  If this option is disabled (the Debian default), kdm will be
 not be stopped or started during an install or upgrade; the administrator
 will have to do so by hand (with \(oq/etc/init.d/kdm restart\(cq, or by
 rebooting the system) before the newly installed kdm binary is used.
-.TP
-.B use\-sessreg
-If this option is enabled (the Debian default), the sessreg program will be
-invoked to register X sessions managed by kdm in the utmp and wtmp files.
-Otherwise, it is not, and the utmp and wtmp files will have no record of
-kdm sessions.
 .PP
 Users of older versions of the Debian system should note that the
 \(oqrun\-xconsole\(cq option has been removed.  Shell scripts named
@@ -82,6 +76,5 @@ manual page for more information.
 .SH AUTHOR
 This manpage was written by Branden Robinson for the Debian Project.
 .SH SEE ALSO
-.BR sessreg (1x),
 .BR xmessage (1x),
 .BR kdm (1x)

-- 
KDE Base Workspace module packaging