[SCM] KDE Network module packaging branch, kde4.10, updated. debian/4.8.4-3-26-g535215c

[Maximiliano Curia]

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

The following commit has been merged in the kde4.10 branch:
commit 5c69e9ef5982be148f770f9e037f85f0f6f6f8be
Merge: 54e41cf20aceee1e2882d41b7b4049e55ef974bd c636c6ae6f5f5960df897cbfa2018d9e6a556f59
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon Jul 1 11:46:00 2013 +0200

    Merge with kdenetwork (4:4.8.4-3) unstable; urgency=low
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/patches/series

 debian/changelog                           |   12 ++++++++++++
 debian/control                             |    1 -
 debian/kppp.NEWS                           |    8 ++++++++
 debian/kppp.README.Debian                  |    9 +++++++++
 debian/kppp.lintian-overrides              |    3 ++-
 debian/patches/add_libpthread_to_krfb.diff |   13 +++++++++++++
 debian/patches/series                      |    1 +
 debian/rules                               |    2 +-
 8 files changed, 46 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 8e51c03,d8dd6d2..b1bf8f8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,34 -1,15 +1,46 @@@
 +kdenetwork (4:4.10.4-2) UNRELEASED; urgency=low
 +
 +  [ Maximiliano Curia ]
 +  * Merge 4:4.8.4-2 from sid.
 +
 +  [ Pino Toscano ]
 +  * Drop patch upstream_r1353735.diff, backported from upstream.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 15 Jun 2013 08:48:17 +0200
 +
 +kdenetwork (4:4.10.4-1) experimental; urgency=low
 +
 +  * New upstream release.
 +  * Bump debhelper build-dep and compat to 9.
 +  * Bump Standards-Version to 3.9.4.
 +  * Update vcs fields.
 +  * Add myself to uploaders.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 14 Jun 2013 20:21:28 +0200
 +
 +kdenetwork (4:4.10.2-1) experimental; urgency=low
 +
 +  * New upstream.
 +  * Update symbols file.
 +  * Update install files.
 +  * Bump build-deps
 +  * Temporarily remove kde-workspace build-dep to get the package built on
 +    autobuilders.
 +
 + -- Sune Vuorela <sune at debian.org>  Fri, 12 Apr 2013 21:32:12 +0000
 +
+ kdenetwork (4:4.8.4-3) unstable; urgency=low
+ 
+   * Remove setiud bit to the kppp binary. (Closes: #709972)
+   * Bump debhelper build-dep and compat to 9.
+   * Update uploaders.
+   * Add myself to uploaders.
+   * Bump Standards-Version to 3.9.4, no changes needed.
+   * New patch: add_libpthread_to_krfb.diff. (Closes: #713770)
+   * Update kppp lintian-overrides.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sun, 30 Jun 2013 18:54:50 +0200
+ 
  kdenetwork (4:4.8.4-2) unstable; urgency=low
  
    * Team upload.
diff --cc debian/control
index f061aaa,4e31e29..73b7b77
--- a/debian/control
+++ b/debian/control
@@@ -6,12 -6,12 +6,11 @@@ Uploaders: Sune Vuorela <sune at debian.or
             Fathi Boudra <fabo at debian.org>,
             Modestas Vainius <modax at debian.org>,
             George Kiagiadakis <kiagiadakis.george at gmail.com>,
-            José Manuel Santamaría Lema <panfaust at gmail.com>,
             Eshat Cakar <info at eshat.de>,
             Maximiliano Curia <maxy at debian.org>
 -Build-Depends: kde-sc-dev-latest (>= 4:4.8.4),
 +Build-Depends: kde-sc-dev-latest (>= 4:4.10.2),
   cmake, debhelper (>= 9), pkg-kde-tools (>= 0.12),
 - kdelibs5-dev (>= 4:4.8), kdepimlibs5-dev (>= 4:4.8), libkonq5-dev (>= 4:4.7),
 - kde-workspace-dev (>= 4:4.8),
 + kdepimlibs5-dev (>= 4:4.10.2), libkonq5-dev (>= 4:4.10.2),
   zlib1g-dev, libjpeg-dev, libxml2-dev, libxslt1-dev, libssl-dev,
   libxdamage-dev, libxss-dev, libslp-dev, libidn11-dev, libxtst-dev,
   libvncserver-dev (>= 0.9.8.1), libqca2-dev (>= 2.0.0),
diff --cc debian/patches/series
index b64f8fb,d041f73..1549db4
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,3 +1,2 @@@
  kdenetwork-4.7.97-fix-for-g++47.patch
 -upstream_r1353735.diff
+ add_libpthread_to_krfb.diff

-- 
KDE Network module packaging