[SCM] kamoso packaging branch, 2.0, updated. e33d78a25e89a1c01fdb1fdb9a075ab5d2b8129e
Pino Toscano
pino at alioth.debian.org
Fri Jul 19 13:24:54 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kamoso.git;a=commitdiff;h=c0fb2d6
The following commit has been merged in the 2.0 branch:
commit c0fb2d6c4a3be4d8f127dec0bf700203c77dc46a
Author: Pino Toscano <pino at debian.org>
Date: Fri Jul 19 15:08:51 2013 +0200
include a needed header
backport upstream commit d3c5946f9f48f5d7a5249995424228fc51c84b67
---
debian/changelog | 2 ++
debian/patches/series | 1 +
debian/patches/upstream_add-include.patch | 24 ++++++++++++++++++++++++
3 files changed, 27 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 5b3f401..b262ec1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ kamoso (2.0.2-2) UNRELEASED; urgency=low
[ Pino Toscano ]
* Fix the Vcs-* headers.
+ * Backport upstream commit d3c5946f9f48f5d7a5249995424228fc51c84b67 to
+ include a needed header; patch upstream_add-include.patch.
-- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Fri, 19 Jul 2013 15:01:06 +0200
diff --git a/debian/patches/series b/debian/patches/series
index 79e0bee..f173ebb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
about_dialog.diff
proper_version_kaboutdata.diff
dont_build_plugin_tester.diff
+upstream_add-include.patch
diff --git a/debian/patches/upstream_add-include.patch b/debian/patches/upstream_add-include.patch
new file mode 100644
index 0000000..95d0230
--- /dev/null
+++ b/debian/patches/upstream_add-include.patch
@@ -0,0 +1,24 @@
+From d3c5946f9f48f5d7a5249995424228fc51c84b67 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol at kde.org>
+Date: Wed, 8 Feb 2012 00:39:31 +0100
+Subject: [PATCH] add include
+
+---
+ src/plugins/youtube/kipiplugin_youtube.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/plugins/youtube/kipiplugin_youtube.cpp b/src/plugins/youtube/kipiplugin_youtube.cpp
+index 07fe1c4..7ebabf8 100644
+--- a/src/plugins/youtube/kipiplugin_youtube.cpp
++++ b/src/plugins/youtube/kipiplugin_youtube.cpp
+@@ -36,6 +36,7 @@
+ #include <kwallet.h>
+ #include <KDebug>
+ #include <libkipi/interface.h>
++#include <libkipi/imagecollection.h>
+
+ using KWallet::Wallet;
+
+--
+1.7.10.4
+
--
kamoso packaging
More information about the pkg-kde-commits
mailing list