[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=e80f479

The following commit has been merged in the master branch:
commit e80f479dc5eb47fac72981288827868db4bfb291
Author: Jonathan Riddell <jriddell at canonical.com>
Date:   Tue Jan 24 18:50:34 2012 +0000

    New tar, remove kubuntu_01_first_start.diff
---
 debian/changelog                           |  6 ++++++
 debian/patches/kubuntu_01_first_start.diff | 18 ------------------
 debian/patches/series                      |  1 -
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0ec67e4..0449d8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kgpg (4:4.8.0a-0ubuntu1~ppa1) precise; urgency=low
+
+  * New tar, remove kubuntu_01_first_start.diff
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 24 Jan 2012 18:48:15 +0000
+
 kgpg (4:4.8.0-0ubuntu1~ppa2) precise; urgency=low
 
   * Add kubuntu_01_first_start.diff from branch fix
diff --git a/debian/patches/kubuntu_01_first_start.diff b/debian/patches/kubuntu_01_first_start.diff
deleted file mode 100644
index fba485a..0000000
--- a/debian/patches/kubuntu_01_first_start.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -urN kgpg-4.8.0/gpgproc.cpp ../kgpg/gpgproc.cpp
---- kgpg-4.8.0/gpgproc.cpp	2011-11-17 20:58:24.000000000 +0000
-+++ kgpg-4.8.0/gpgproc.cpp	2012-01-24 15:59:46.000000000 +0000
-@@ -86,9 +86,11 @@
- 	m_standardArguments.clear();
- 	m_standardArguments << QLatin1String( "--no-secmem-warning" )
- 			<< QLatin1String( "--no-tty" )
--			<< QLatin1String("--no-greeting")
--			<< QLatin1String("--options")
--			<< gpgConfigFile;
-+			<< QLatin1String("--no-greeting");
-+
-+	if (!gpgConfigFile.isEmpty())
-+		m_standardArguments << QLatin1String("--options")
-+				<< gpgConfigFile;
- 
- 	QStringList debugLevelArguments(QLatin1String("--debug-level"));
- 	debugLevelArguments << QLatin1String("none");
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c43809b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-kubuntu_01_first_start.diff

-- 
kgpg packaging