[SCM] qapt packaging branch, experimental, updated. debian/1.4.0-1-8-gc137efa

[José Manuel Santamaría Lema]

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

The following commit has been merged in the experimental branch:
commit 055e5b907202a586b67b13fbb3864a82b38a452e
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Wed Jan 23 14:07:15 2013 +0100

    Drop freeze_with_apt-listbugs_and_apt-listchanges.diff.
---
 debian/changelog                                   |    1 +
 ...eeze_with_apt-listbugs_and_apt-listchanges.diff |   27 --------------------
 debian/patches/series                              |    1 -
 3 files changed, 1 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d68ac31..d83752d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qapt (1.4.1-0r0) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Drop freeze_with_apt-listbugs_and_apt-listchanges.diff, applied upstream.
   * In libqapt-runtime add Breaks/Replaces against libdebconf-kde0 (<< 0.3~)
     because the patch freeze_with_apt-listbugs_and_apt-listchanges.diff in this
     package and apt-listbugs hang debconf-kde because some debconf commands were
diff --git a/debian/patches/freeze_with_apt-listbugs_and_apt-listchanges.diff b/debian/patches/freeze_with_apt-listbugs_and_apt-listchanges.diff
deleted file mode 100644
index 28930c3..0000000
--- a/debian/patches/freeze_with_apt-listbugs_and_apt-listchanges.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index 88f2636..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-freeze_with_apt-listbugs_and_apt-listchanges.diff

-- 
qapt packaging