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

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 31 15:00:52 UTC 2014


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

The following commit has been merged in the master branch:
commit 5b191c7d505418c34f1e56d6df0ed33a2ba9a808
Author: Rohan Garg <rohangarg at kubuntu.org>
Date:   Mon Jun 16 16:51:23 2014 +0200

    * Merge with Debian, no remaining changes
---
 debian/changelog            | 68 +++++++++++++++++++++++++++++++++++++++++++++
 debian/compat               |  2 +-
 debian/control              | 31 +++++++++++----------
 debian/copyright            |  3 +-
 debian/source/local-options |  1 +
 5 files changed, 88 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 56330e0..b2709a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+kgpg (4:4.13.1-1ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge with Debian, no remaining changes
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Mon, 16 Jun 2014 16:44:43 +0200
+
+kgpg (4:4.13.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 26 May 2014 14:09:56 +0200
+
 kgpg (4:4.13.0-0ubuntu2) UNRELEASED; urgency=medium
 
   * Build against boost1.55.
@@ -28,12 +40,32 @@ kgpg (4:4.12.90-0ubuntu1) trusty; urgency=medium
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 19 Mar 2014 10:57:54 +0000
 
+kgpg (4:4.12.4-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 28 Apr 2014 12:23:46 +0200
+
+kgpg (4:4.12.3-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Tue, 04 Mar 2014 00:05:26 +0100
+
 kgpg (4:4.12.3-0ubuntu1) trusty; urgency=medium
 
   * New upstream bugfix release
 
  -- Rohan Garg <rohangarg at kubuntu.org>  Tue, 04 Mar 2014 20:49:01 +0100
 
+kgpg (4:4.12.2-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Update build dependencies.
+  * Bump kde-sc-dev-latest build dependency.
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 10 Feb 2014 11:31:29 +0100
+
 kgpg (4:4.12.2-0ubuntu1) trusty; urgency=medium
 
   * New upstream bugfix release
@@ -71,6 +103,26 @@ kgpg (4:4.11.80-0ubuntu1) trusty; urgency=low
 
  -- Rohan Garg <rohangarg at kubuntu.org>  Sat, 23 Nov 2013 17:41:06 +0100
 
+kgpg (4:4.11.5-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.5, no changes needed.
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 03 Feb 2014 12:34:32 +0100
+
+kgpg (4:4.11.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update build dependencies.
+
+ -- Maximiliano Curia <maxy at debian.org>  Sun, 10 Nov 2013 00:27:28 +0100
+
+kgpg (4:4.11.2-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Wed, 09 Oct 2013 11:59:20 +0200
+
 kgpg (4:4.11.2-0ubuntu1) saucy; urgency=low
 
   * New upstream bugfix release
@@ -117,6 +169,22 @@ kgpg (4:4.10.80-0ubuntu1) saucy; urgency=low
 
  -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 21 Jun 2013 01:18:14 +0100
 
+kgpg (4:4.10.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 12 Jul 2013 09:22:15 +0200
+
+kgpg (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.
+  * Add myself to uploaders.
+  * Update vcs fields.
+
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 14 Jun 2013 19:46:12 +0200
+
 kgpg (4:4.10.4-0ubuntu1) saucy-proposed; urgency=low
 
   * New upstream bugfix release
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index a9ca349..082c405 100644
--- a/debian/control
+++ b/debian/control
@@ -4,25 +4,29 @@ Priority: optional
 Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>,
- Sune Vuorela <sune at debian.org>,
- Modestas Vainius <modax at debian.org>,
- George Kiagiadakis <kiagiadakis.george at gmail.com>,
- Eshat Cakar <info at eshat.de>
-Build-Depends: kde-sc-dev-latest (>= 4:4.10.2),
- cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
- kdepimlibs5-dev (>= 4:4.13.0), nepomuk-core-dev (>= 4:4.13.0),
- libboost1.55-dev
-Standards-Version: 3.9.3
+           Sune Vuorela <sune at debian.org>,
+           Modestas Vainius <modax at debian.org>,
+           George Kiagiadakis <kiagiadakis.george at gmail.com>,
+           Eshat Cakar <info at eshat.de>,
+           Maximiliano Curia <maxy at debian.org>
+Build-Depends: cmake,
+               debhelper (>= 9),
+               kde-sc-dev-latest (>= 4:4.12),
+               kdepimlibs5-dev (>= 4:4.11),
+               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-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kgpg.git
-X-Debian-Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kgpg.git
+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
 
 Package: kgpg
 Section: utils
 Architecture: any
-Depends: gnupg | gnupg2, ${shlibs:Depends}, ${misc:Depends}
+Depends: gnupg | gnupg2, ${misc:Depends}, ${shlibs:Depends}
 Description: graphical front end for GNU Privacy Guard
  Kgpg manages cryptographic keys for the GNU Privacy Guard, and can encrypt,
  decrypt, sign, and verify files.  It features a simple editor for applying
@@ -31,12 +35,11 @@ Description: graphical front end for GNU Privacy Guard
  .
  This package is part of the KDE Utilities module.
 
-
 Package: kgpg-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: ${misc:Depends}, kgpg (= ${binary:Version})
+Depends: kgpg (= ${binary:Version}), ${misc:Depends}
 Replaces: kdeutils-dbg (<< 4:4.8)
 Breaks: kdeutils-dbg (<< 4:4.8)
 Description: debugging symbols for kgpg
diff --git a/debian/copyright b/debian/copyright
index 316ac47..006b1c5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,7 +19,7 @@ License: GPL-2+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version. 
+ (at your option) any later version.
  .
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -50,4 +50,3 @@ License: GPLv2 or GPLv3 or later editions as approved by KDE eV
  .
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..2ee6f0f
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+abort-on-upstream-changes

-- 
kgpg packaging



More information about the pkg-kde-commits mailing list