[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.8.4-4-12-gcd68a93

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit cd68a9371e24c910db6a2b50001b6c57099fd10a
Merge: 3f51d94b4ab35033f8c1357daf3f7ef6b6d02242 bf1426c3595153db95c30d91a0ee65a4f99dbe72
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Oct 24 17:19:03 2012 -0300

    Merge branch 'wheezy'
    
    Conflicts:
    	debian/changelog

 debian/changelog |   22 ++++++++++++++++------
 debian/control   |    3 ++-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --cc debian/changelog
index bd25019,0fbb538..637c47d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,24 +1,33 @@@
 -kde-workspace (4:4.8.4-5) UNRELEASED; urgency=low
 +kde-workspace (4:4.8.5-0r0) UNRELEASED; urgency=low
  
 +  * New upstream release.
-   * The package (re)building switches to XZ compression. (Closes: #688761)
- 
-   [ Pino Toscano ]
-   * Add breaks/replaces in kde-window-manager against kdebase-workspace-data
-     << 4.7.2. (Closes: #684972)
 +
 +  [ Lisandro Damián Nicanor Pérez Meyer ]
-   * Confirm symbols from buildds' logs.
 +  * Remove patches already applied upstream.
 +    - process_table_unclickable.diff.
 +    - new_beams_custom_plots.diff.
 +    - upstream_make-sure-scripts-are-executed-sorted.patch.
 +    - upstream_centralize-interaction-notification-handling.patch.
 +  * Refresh relax_kdelibs_dependency.diff.
+   * Remove "New upstream release" from the previous changelog entry
+     (Closes: ##691302). Thanks Filipus Klutiero.
  
 - -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 24 Oct 2012 17:06:28 -0300
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 15 Aug 2012 11:34:25 +0200
  
+ kde-workspace (4:4.8.4-4) unstable; urgency=low
+ 
+   * The package (re)building switches to XZ compression. (Closes: #688761)
+ 
+   [ Pino Toscano ]
+   * Add breaks/replaces in kde-window-manager against kdebase-workspace-data
+     << 4.7.2. (Closes: #684972)
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Confirm symbols from buildds' logs.
+   * Add myself to Uploaders.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Sun, 21 Oct 2012 11:07:11 -0300
+ 
  kde-workspace (4:4.8.4-3) unstable; urgency=low
  
    * Team upload.

-- 
KDE Base Workspace module packaging