[SCM] KDE PIM Libraries module packaging branch, master, updated. debian/4.8.4-2-16-g5b78dc7

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 19576b2f1e3d71555e12550c0454625b2d78fc55
Merge: 708254b1f00e8b44525869ec51fc990e08373a85 9e90610c70d5b3c34a6cf48e5fbf0b587102ae20
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Jun 28 15:05:21 2013 +0200

    Merge branch 'wheezy'
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

 debian/changelog                                   |   12 ++++++++
 debian/patches/series                              |    1 +
 ...m_b92782580756b3858f0381a5200b79688ab0b0a2.diff |   29 ++++++++++++++++++++
 3 files changed, 42 insertions(+)

diff --cc debian/changelog
index 5596e7f,03b65a0..8427b97
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,15 +1,25 @@@
 +kdepimlibs (4:4.8.5-0r0) UNRELEASED; urgency=low
 +
 +  [ Lisandro Damián Nicanor Pérez meyer ]
 +  * New upstream release.
 +  * Add myself to Uploaders.
 +  * Confirm symbols files with 4:4.8.4's build logs.
 +  * Remove crash_when_marking_folder_read.diff, already applied upstream.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 29 Sep 2012 16:51:09 -0300
 +
+ kdepimlibs (4:4.8.4-2) unstable; urgency=low
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Team upload.
+ 
+   [ Pino Toscano ]
+   * Backport upstream commit f142cc25b5620c2d1037cc6cd270b1cf301b5380
+     (adapted to the 4.8 codebase) to stop reading when reaching the end of
+     streams; patch upstream_b92782580756b3858f0381a5200b79688ab0b0a2.diff.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Sun, 16 Dec 2012 12:19:24 -0300
+ 
  kdepimlibs (4:4.8.4-1) unstable; urgency=low
  
    * New upstream release.
diff --cc debian/patches/series
index 333e353,a17eb0d..205a619
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,3 +1,2 @@@
 -crash_when_marking_folder_read.diff
+ upstream_b92782580756b3858f0381a5200b79688ab0b0a2.diff
  03_hide_akonadi_progressbar.diff

-- 
KDE PIM Libraries module packaging