[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:41 UTC 2014 

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

The following commit has been merged in the master branch:
commit ee7eae63db8c43c449c3dc4b2178998c32a2d813
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date:   Tue May 28 13:33:28 2013 +0000

    merge
---
 debian/changelog      |  60 +++++++++++++++++++++++++++
 debian/control        |  33 ++++++++++++---
 debian/copyright      | 111 +++++++++++++++++++++++---------------------------
 debian/patches/series |   0
 debian/rules          |   6 +++
 debian/watch          |   2 +
 6 files changed, 147 insertions(+), 65 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6e6a9a7..dcd06d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+kgpg (4:4.10.3-0ubuntu1) saucy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 23 May 2013 11:04:40 +0000
+
+kgpg (4:4.10.2-2) experimental; urgency=low
+
+  * Reorder build-deps hoping to cheat the aptitude resolver.
+
+ -- Sune Vuorela <sune at debian.org>  Thu, 11 Apr 2013 08:38:27 +0000
+
+kgpg (4:4.10.2-1) experimental; urgency=low
+
+  * New upstream release.
+  * Bump build-deps.
+  * Update uploaders.
+  * Remove patches taken from upstream.
+
+ -- Sune Vuorela <sune at debian.org>  Sun, 07 Apr 2013 23:52:43 +0000
+
 kgpg (4:4.10.2-0ubuntu1) raring; urgency=low
 
   * New upstream bugfix release
@@ -92,6 +113,44 @@ kgpg (4:4.8.80-0ubuntu1) quantal; urgency=low
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 06 Jun 2012 16:37:53 +0100
 
+kgpg (4:4.8.4-4) unstable; urgency=low
+
+  * Team upload.
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Depend on gnupg or gnupg2 (Closes: #686632).
+
+ -- Pino Toscano <pino at debian.org>  Thu, 29 Nov 2012 20:34:53 +0100
+
+kgpg (4:4.8.4-3) unstable; urgency=low
+
+  * Team upload.
+  * Backport upstream commit a3b0cb755ff08721a3b9e2c25d4aaf655fb40804 to fix
+    a crash when setting a new default key; patch
+    upstream_fix-NULL-deref-when-new-setting-default-key.patch.
+  * Backport upstream commit 2d252cf08c51866a6acebe705db11b29941691bf to fix
+    the comparison of keys; patch
+    upstream_fix-key-comparison-returning-wrong-values.patch. (Closes: #679635)
+
+ -- Pino Toscano <pino at debian.org>  Sat, 30 Jun 2012 14:26:02 +0200
+
+kgpg (4:4.8.4-2) unstable; urgency=low
+
+  * Team upload
+
+  [ Eshat Cakar ]
+  * Add Breaks/Replaces with previous kdeutils-dbg packages. (Closes: #678492)
+
+ -- Sune Vuorela <sune at debian.org>  Fri, 22 Jun 2012 22:01:54 +0200
+
+kgpg (4:4.8.4-1) unstable; urgency=low
+
+  * Initial release.
+  * Bump Standards-Version to 3.9.3, no further changes.
+  * 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
@@ -139,3 +198,4 @@ 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 --git a/debian/control b/debian/control
index d99ba17..8ead483 100644
--- a/debian/control
+++ b/debian/control
@@ -2,23 +2,44 @@ Source: kgpg
 Section: kde
 Priority: optional
 Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
-XSBC-Original-Maintainer: Jonathan Riddell <jriddell at ubuntu.com>
-Build-Depends: 
+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),
- kdelibs5-dev (>= 4:4.10.2), kdepimlibs5-dev (>= 4:4.10.2)
-Standards-Version: 3.9.2
+ kdepimlibs5-dev (>= 4:4.10.2), nepomuk-core-dev (>= 4:4.10.2)
+Standards-Version: 3.9.3
 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
 
 Package: kgpg
 Section: utils
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: gnupg | gnupg2, ${shlibs:Depends}, ${misc: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
  cryptography to short pieces of text, and can also quickly apply cryptography
  to the contents of the clipboard.
  .
- This package is part of the KDE SC utilities module.
+ This package is part of the KDE Utilities module.
+
+
+Package: kgpg-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: ${misc:Depends}, kgpg (= ${binary:Version})
+Replaces: kdeutils-dbg (<< 4:4.8)
+Breaks: kdeutils-dbg (<< 4:4.8)
+Description: debugging symbols for kgpg
+ This package contains debugging files used to investigate problems with
+ binaries included in kgpg.
+ .
+ This package is part of the KDE Utilities module.
diff --git a/debian/copyright b/debian/copyright
index 838c0d0..316ac47 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,60 +1,53 @@
-This package was made by Jonathan Riddell <jriddell at ubuntu.com> on
-Fri, 16 Dec 2011 14:56:55 +0000.
-
-It was downloaded from ftp://ftp.kde.org
-
-Upstream Author:
- Jean-Baptiste Mardelle
- Jimmy Gilles
- Rolf Eike Beer
-
-Copyright:
- 2003 Jean-Baptiste Mardelle
- 2006-2007 Jimmy Gilles  <jimmygilles at gmail.com>
- 2002 Jean-Baptiste Mardelle <bj at altern.org>
- 2007-2008  Rolf Eike Beer <kde at opensource.sf-tec.de>
- 2007 Lukas Kropatschek <lukas.krop at gmail.com>
-
-License:
-
-GPLv2+3+KDEev
-
-  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) version 3 or any later version
-  accepted by the membership of KDE e.V. (or its successor approved
-  by the membership of KDE e.V.), which shall act as a proxy
-  defined in Section 14 of version 3 of the license.
+Upstream-Name: kgpg
+Source: ftp://ftp.kde.org
+
+Files: *
+Copyright: 2006-2012, Rolf Eike Beer <kde at opensource.sf-tec.de>
+	   2002, Jean-Baptiste Mardelle <bj at altern.org>
+	   2006-2007, Jimmy Gilles <jimmygilles at gmail.com>
+	   2011, Luis Ángel Fernández Fernández <laffdez at gmail.com>
+	   2011, Philip Greggory Lee <rocketman768 at gmail.com>
+	   2003, Waldo Bastian <bastian at kde.org>
+	   2007, Lukas Kropatschek <lukas.krop at gmail.com>
+License: Mix of GPL v2+ and GPLv2 or GPLv3 or later editions as approved by KDE eV
+
+Files: debian/*
+Copyright: 2012, Eshat Cakar <info at eshat.de>
+License: GPL-2+
+
+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. 
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+License: GPLv2 or GPLv3 or later editions as approved by KDE eV
+ 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) version 3 or any later version
+ accepted by the membership of KDE e.V. (or its successor approved
+ by the membership of KDE e.V.), which shall act as a proxy
+ defined in Section 14 of version 3 of the license.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
- 
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Several files are GNU GPL 2 or later.
-
-The full text of the GNU General Public License version 2 is available on
-Debian systems in /usr/share/common-licenses/GPL-2.
-
-
-The documentation docbook files in this package, placed under docs/, are under
-the GNU Free Documentation License:
-
-    | Permission is granted to copy, distribute and/or modify this
-    | document under the terms of the GNU Free Documentation License,
-    | Version 1.1 or any later version published by the Free Software
-    | Foundation; with no Invariant Sections, with no Front-Cover Texts,
-    | and with no Back-Cover Texts.
-
-  The full text of the GNU Free Documentation License is available on
-  Debian systems in /usr/share/common-licenses/GFDL-1.2
-
-
-The Debian packaging is (C) 2007-2009, Debian Qt/KDE Maintainers
-<debian-qt-kde at lists.debian.org> and copyright 2011 Canonical Ltd and
-is licensed under the GNU GPL version 2 or later, see
-`/usr/share/common-licenses/GPL'.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e69de29
diff --git a/debian/rules b/debian/rules
index 6a77e53..243941d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,9 @@
 #!/usr/bin/make -f
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+
+override_dh_strip:
+	$(overridden_command) --dbg-package=kgpg-dbg
+
+override_dh_auto_install:
+	dh_auto_install --destdir=debian/kgpg
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..ec85dac
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.kde.org/pub/kde/stable/([\d\.]*)/src/kgpg-([\d\.]*).tar.xz

-- 
kgpg packaging

More information about the pkg-kde-commits mailing list