[SCM] qapt packaging branch, master, updated. debian/1.3.0-1-2-ga59e281

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit a59e28186ccb2f752bb8f8d5ba827696f376b0b1
Author: Pino Toscano <pino at debian.org>
Date:   Wed Apr 18 17:31:31 2012 +0200

    add patch upstream_directly-include-declaration-of-MD5Summation.patch (#669098)
    
    Backport the upstream commit 4053dc46969b56084fb72c24ae062187134cd39a to fix the build with libapt-pkg 0.9;
    thanks to David Kalnischkies
---
 debian/changelog                                   |    5 +++
 debian/patches/series                              |    1 +
 ...ectly-include-declaration-of-MD5Summation.patch |   29 ++++++++++++++++++++
 3 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eb50b98..b417a6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 qapt (1.3.0-2) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Backport the upstream commit 4053dc46969b56084fb72c24ae062187134cd39a
+    (patch upstream_directly-include-declaration-of-MD5Summation.patch) to fix
+    the build with libapt-pkg 0.9; thanks to David Kalnischkies for the patch!
+    (Closes: #669098)
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Wed, 18 Apr 2012 17:24:27 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..26e3884
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_directly-include-declaration-of-MD5Summation.patch
diff --git a/debian/patches/upstream_directly-include-declaration-of-MD5Summation.patch b/debian/patches/upstream_directly-include-declaration-of-MD5Summation.patch
new file mode 100644
index 0000000..81b1c9b
--- /dev/null
+++ b/debian/patches/upstream_directly-include-declaration-of-MD5Summation.patch
@@ -0,0 +1,29 @@
+From 4053dc46969b56084fb72c24ae062187134cd39a Mon Sep 17 00:00:00 2001
+From: David Kalnischkies <kalnischkies at gmail.com>
+Date: Wed, 18 Apr 2012 17:18:40 +0200
+Subject: [PATCH] directly include declaration of MD5Summation
+
+While working on apt 0.9 I cleaned up the header includes. I thought
+I had guarded these changes with APT_8_CLEANER_HEADERS, but it seems
+I forgot one, which makes qapt FTBFS as it depends on such a transitive
+include. As it is a good idea to avoid these transitive includes anyway
+lets do the include in qapt instead of readding it to apt.
+---
+ src/debfile.cpp |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/debfile.cpp b/src/debfile.cpp
+index c315f53..2f93afd 100644
+--- a/src/debfile.cpp
++++ b/src/debfile.cpp
+@@ -28,6 +28,7 @@
+ #include <apt-pkg/debfile.h>
+ #include <apt-pkg/fileutl.h>
+ #include <apt-pkg/tagfile.h>
++#include <apt-pkg/md5.h>
+ 
+ #include <QDebug>
+ 
+-- 
+1.7.9.5
+

-- 
qapt packaging