[SCM] kgpg packaging branch, master, updated. debian/4.13.1-1-115-g49e14fd

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit d2c1f5628c504987cedd3d31fe5adc77fc7c5ab2
Merge: 458b89bd0bc8dde87cc1975663a354e0ce2c8fbf 844ca4042fa52e9805c7798af68e72ae6ea95466
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Jul 31 15:11:00 2014 +0200

    Merge commit '844ca4042fa52e9805c7798af68e72ae6ea95466'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/watch

 debian/changelog      | 289 ++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/control        |   7 +-
 debian/patches/series |   0
 3 files changed, 294 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 6f5d867,dd152c1..026d88b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,25 @@@
 +kgpg (4:4.13.2-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Jul 2014 16:32:14 +0200
 +
+ kgpg (4:4.13.2-0ubuntu1) utopic; urgency=medium
+ 
+   [ Rohan Garg ]
+   * Fix boost builddep
+ 
+   [ Jonathan Riddell ]
+   * new upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Jun 2014 11:57:52 +0100
+ 
+ kgpg (4:4.13.1-1ubuntu1) utopic; urgency=medium
+ 
+   * Merge with Debian, no remaining changes
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Mon, 16 Jun 2014 16:51:34 +0200
+ 
  kgpg (4:4.13.1-1) unstable; urgency=medium
  
    * New upstream release.
@@@ -118,3 -353,52 +359,51 @@@ kgpg (4:4.8.4-1) unstable; urgency=lo
    * Add watch file.
  
   -- Eshat Cakar <info at eshat.de>  Sun, 04 Mar 2012 21:48:27 +0100
+ 
+ kgpg (4:4.8.3-0ubuntu1) quantal; urgency=low
+ 
+   * New upstream release
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Thu, 03 May 2012 20:42:30 +0200
+ 
+ kgpg (4:4.8.2-0ubuntu2) precise-proposed; urgency=low
+ 
+   * Rebuild for .pot generation
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 12 Apr 2012 16:32:05 +0100
+ 
+ kgpg (4:4.8.2-0ubuntu1) precise; urgency=low
+ 
+   * new upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 03 Apr 2012 08:52:03 +0000
+ 
+ kgpg (4:4.8.1-0ubuntu1) precise; urgency=low
+ 
 -  * New upstream release 
++  * New upstream release
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 04 Mar 2012 21:48:27 +0100
+ 
+ kgpg (4:4.8.0a-0ubuntu1) precise; urgency=low
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 20 Jan 2012 12:10:43 +0000
+ 
+ kgpg (4:4.7.97-0ubuntu1) precise; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 05 Jan 2012 12:18:41 +0000
+ 
+ kgpg (4:4.7.95-0ubuntu1) precise; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sat, 24 Dec 2011 23:16:12 +0100
+ 
+ kgpg (4:4.7.90-0ubuntu1) precise; urgency=low
+ 
+   * Initial package
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 16 Dec 2011 14:56:55 +0000
 -
diff --cc debian/control
index 185761e,c322cf1..d768179
--- a/debian/control
+++ b/debian/control
@@@ -1,7 -1,8 +1,8 @@@
  Source: kgpg
  Section: kde
  Priority: optional
- Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 -Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
 -XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
++Maintainer: Debian/Ubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
++X-Ubuntu-Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
  Uploaders: Fathi Boudra <fabo at debian.org>,
             Sune Vuorela <sune at debian.org>,
             Modestas Vainius <modax at debian.org>,
@@@ -11,14 -12,16 +12,16 @@@
  Build-Depends: cmake,
                 debhelper (>= 9),
                 kde-sc-dev-latest (>= 4:4.12),
-                kdepimlibs5-dev (>= 4:4.11),
 -               kdepimlibs5-dev (>= 4:4.13.2),
 -               libboost1.55-dev,
 -               nepomuk-core-dev (>= 4:4.13.2),
++               kdepimlibs5-dev (>= 4:4.13.3-2),
 +               libboost-dev,
 +               nepomuk-core-dev (>= 4:4.11),
                 pkg-kde-tools (>= 0.12)
  Standards-Version: 3.9.5
  Homepage: http://www.kde.org/
 -Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kgpg
 -Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kgpg
 -X-Vcs-Debian-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kgpg.git
 -X-Vcs-Debian-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kgpg.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kgpg.git
 +Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kgpg.git
++X-Ubuntu-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kgpg
++X-Ubuntu-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kgpg
  
  Package: kgpg
  Section: utils

-- 
kgpg packaging