[SCM] qapt packaging branch, master, updated. debian/3.0.1-1-9-g5a1f18a
Pino Toscano
pino at moszumanska.debian.org
Sun May 15 14:39:10 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/qapt.git;a=commitdiff;h=cd66362
The following commit has been merged in the master branch:
commit cd663622e0a145b5ac2f23d612286fa8cb422f30
Author: Pino Toscano <pino at debian.org>
Date: Sun May 15 16:33:13 2016 +0200
fix build (#822497)
backport upstream commit a58eab74ee9881d10e0f24a3ed216ed71ba03bf5
---
debian/changelog | 3 +++
debian/patches/series | 1 +
...lude-random-for-std-default_random_engine.patch | 25 ++++++++++++++++++++++
3 files changed, 29 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 7861cce..0fc1bec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ libqapt (3.0.2-0r1) UNRELEASED; urgency=medium
* Update Vcs-* fields.
* Small update to copyright.
* Update symbols file.
+ * Backport upstream commit a58eab74ee9881d10e0f24a3ed216ed71ba03bf5 to fix
+ build; patch upstream_include-random-for-std-default_random_engine.patch.
+ (Closes: #822497)
-- Debian/Kubuntu KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Sun, 15 May 2016 15:28:16 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1e2b5ca
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_include-random-for-std-default_random_engine.patch
diff --git a/debian/patches/upstream_include-random-for-std-default_random_engine.patch b/debian/patches/upstream_include-random-for-std-default_random_engine.patch
new file mode 100644
index 0000000..25e93de
--- /dev/null
+++ b/debian/patches/upstream_include-random-for-std-default_random_engine.patch
@@ -0,0 +1,25 @@
+From a58eab74ee9881d10e0f24a3ed216ed71ba03bf5 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Sun, 15 May 2016 16:26:28 +0200
+Subject: [PATCH] include <random> for std::default_random_engine
+
+apparently it was implicitly pulled by other (apt?) headers
+---
+ src/package.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/package.cpp b/src/package.cpp
+index 1e43a28..0526f9d 100644
+--- a/src/package.cpp
++++ b/src/package.cpp
+@@ -46,6 +46,7 @@
+ #include <apt-pkg/versionmatch.h>
+
+ #include <algorithm>
++#include <random>
+
+ // Own includes
+ #include "backend.h"
+--
+2.8.1
+
--
qapt packaging
More information about the pkg-kde-commits
mailing list