[SCM] qapt packaging branch, experimental, updated. debian/1.3.0-2-11-g8da4f30

[José Manuel Santamaría Lema]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/qapt.git;a=commitdiff;h=059592a

The following commit has been merged in the experimental branch:
commit 059592a6f472f39ae761b9d1862ae3d20bcd4db5
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Mon Sep 10 21:15:43 2012 +0200

    Add freeze_with_apt-listbugs_and_apt-listchanges.diff.
---
 debian/changelog                                   |    1 +
 debian/control                                     |    1 +
 ...eeze_with_apt-listbugs_and_apt-listchanges.diff |   27 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 4 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 423e650..eadb11a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qapt (1.4.0-0r1) UNRELEASED; urgency=low
   * New upstream release.
   * Remove upstream_directly-include-declaration-of-MD5Summation.patch, applied
     upstream.
+  * Add freeze_with_apt-listbugs_and_apt-listchanges.diff.
 
  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Fri, 24 Aug 2012 16:39:17 +0200
 
diff --git a/debian/control b/debian/control
index 32c469c..5d4827a 100644
--- a/debian/control
+++ b/debian/control
@@ -46,6 +46,7 @@ Description: Development headers for the QApt library
 Package: libqapt-runtime
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: apt-listchanges (<< 2.85.12~)
 Description: Runtime components for the QApt library
  LibQApt is a Qt wrapper around the libapt-pkg library as well as an APT
  implementation using libapt-pkg. The aim is to provide a sane API for
diff --git a/debian/patches/freeze_with_apt-listbugs_and_apt-listchanges.diff b/debian/patches/freeze_with_apt-listbugs_and_apt-listchanges.diff
new file mode 100644
index 0000000..28930c3
--- /dev/null
+++ b/debian/patches/freeze_with_apt-listbugs_and_apt-listchanges.diff
@@ -0,0 +1,27 @@
+From 69eb9e6fe2b6357522b742568305b5801f60cde3 Mon Sep 17 00:00:00 2001
+From: Jonathan Thomas <echidnaman at kubuntu.org>
+Date: Sat, 8 Sep 2012 13:00:04 -0400
+Subject: [PATCH] Prevent freezing with apt-listchanges and apt-listbugs
+
+---
+ src/worker/workerinstallprogress.cpp |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/worker/workerinstallprogress.cpp b/src/worker/workerinstallprogress.cpp
+index 26a320c..fbe9844 100644
+--- a/src/worker/workerinstallprogress.cpp
++++ b/src/worker/workerinstallprogress.cpp
+@@ -49,8 +49,8 @@ WorkerInstallProgress::WorkerInstallProgress(QAptWorker* parent)
+ {
+     setenv("DEBIAN_FRONTEND", "passthrough", 1);
+     setenv("DEBCONF_PIPE", "/tmp/qapt-sock", 1);
+-    // TODO: apt-listchanges
+-    setenv("APT_LISTCHANGES_FRONTEND", "none", 1);
++    setenv("APT_LISTBUGS_FRONTEND", "none", 1);
++    setenv("APT_LISTCHANGES_FRONTEND", "debconf", 1);
+ }
+ 
+ WorkerInstallProgress::~WorkerInstallProgress()
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..88f2636
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+freeze_with_apt-listbugs_and_apt-listchanges.diff

-- 
qapt packaging