[SCM] KDE Network module packaging branch, master, updated. debian/4.7.4-3-7-ge3b9904

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit e3b9904ee1346d00f9ec34c02626d61062d8c10a
Merge: b1e3c7e83ed7222f240792c2a6d3d1f2d285ff7e 78586495f4836e62c165ab13233dd167d9cef7aa
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jun 10 15:20:19 2012 +0200

    Merge remote-tracking branch 'origin/kde4.8'
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

 debian/changelog                          |   16 +++
 debian/control                            |   15 ++-
 debian/patches/libgadu_pthread_check.diff |   77 -------------
 debian/patches/no_home_set.diff           |   24 ----
 debian/patches/protocols_namespaces.diff  |  168 -----------------------------
 debian/patches/series                     |    4 -
 debian/patches/upstream_r1292762.diff     |   70 ------------
 debian/watch                              |    2 +
 8 files changed, 27 insertions(+), 349 deletions(-)

diff --cc debian/changelog
index 5106620,167ff29..7a1987f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,18 +1,31 @@@
+ kdenetwork (4:4.8.4-0r0) UNRELEASED; urgency=low
+ 
+   * New upstream release.
+ 
+   [ Eshat Cakar ]
+   * Bump kde-sc-dev-latest build dependency to 4:4.8.4.
+   * Add watch file.
+   * Bump various kde build dependencies to 4:4.8.
+   * Remove patches, all applied upstream:
+     - no_home_set.diff
+     - libgadu_pthread_check.diff
+     - protocols_namespaces.diff
++    - upstream_r1292762.diff
+ 
+  -- Eshat Cakar <info at eshat.de>  Sun, 13 May 2012 13:42:09 +0200
+ 
 +kdenetwork (4:4.7.4-3) unstable; urgency=low
 +
 +  * Team upload.
 +
 +  [ Pino Toscano ]
 +  * Backport upstream r1292762 to fix building with GCC 4.7; patch
 +    upstream_r1292762.diff. (Closes: #672044)
 +  * Bump Standards-Version to 3.9.3, no changes required.
 +  * Update the symbols files.
 +
 + -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Fri, 25 May 2012 11:40:49 -0300
 +
  kdenetwork (4:4.7.4-2) unstable; urgency=low
  
    * Team upload. Upload to unstable.

-- 
KDE Network module packaging