[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=ae86834

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

    Adapt kdmrc_defaults.diff to avoid messing with UseSesReg.
---
 debian/changelog                   |    2 ++
 debian/patches/kdmrc_defaults.diff |    9 ---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index afa4c25..3adcf9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ kde-workspace (4:4.8.4-5) UNRELEASED; urgency=low
   * sessreg was merged in kdm:
     - Drop the use-sessreg option in kdm.options and it's man page, as it is
       no longer needed.
+    - Do not set UseSessReg to false in debian/patches/kdmrc_defaults.diff.
+      The bug it solved has dissapeared during the merge.
 
   [ Pino Toscano ]
   * Backport upstream commit 89161c40e064958aa192b2202670316671d7e377 to fix
diff --git a/debian/patches/kdmrc_defaults.diff b/debian/patches/kdmrc_defaults.diff
index 1839fd4..ce0e891 100644
--- a/debian/patches/kdmrc_defaults.diff
+++ b/debian/patches/kdmrc_defaults.diff
@@ -45,15 +45,6 @@
  Update: upd_sessionsdirs
  Comment:
   The directories containing session type definitions in .desktop format,
-@@ -2006,7 +2006,7 @@ Description:
- 
- Key: UseSessReg
- Type: bool
--Default: true
-+Default: false
- User: core
- Instance: #*/!
- Comment:
 @@ -2097,9 +2097,9 @@ Description:
  
  Key: GreetString

-- 
KDE Base Workspace module packaging