[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=00d9010

The following commit has been merged in the master branch:
commit 00d90107505c521a90ad29f4c43146f509898ca8
Author: Jonathan Riddell <jriddell at canonical.com>
Date:   Tue Jan 24 16:06:14 2012 +0000

    Add kubuntu_01_first_start.diff from branch fix
    http://bugs.kde.org/291923
---
 debian/changelog                           |  7 +++++++
 debian/patches/kubuntu_01_first_start.diff | 18 ++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index adfc17d..0ec67e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kgpg (4:4.8.0-0ubuntu1~ppa2) precise; urgency=low
+
+  * Add kubuntu_01_first_start.diff from branch fix
+    http://bugs.kde.org/291923
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 24 Jan 2012 16:02:47 +0000
+
 kgpg (4:4.8.0-0ubuntu1~ppa1) precise; urgency=low
 
   * New upstream release
diff --git a/debian/patches/kubuntu_01_first_start.diff b/debian/patches/kubuntu_01_first_start.diff
new file mode 100644
index 0000000..fba485a
--- /dev/null
+++ b/debian/patches/kubuntu_01_first_start.diff
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 0000000..c43809b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kubuntu_01_first_start.diff

-- 
kgpg packaging