[SCM] qapt packaging branch, master, updated. debian/3.0.2-1-12-ge3cd229

Pino Toscano pino at moszumanska.debian.org
Sun Jun 18 08:10:36 UTC 2017


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

The following commit has been merged in the master branch:
commit e3cd22972cf8fc0973ed33248745d2d705f458c5
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jun 18 10:04:38 2017 +0200

    update the patches
    
    - upstream_include-random-for-std-default_random_engine.patch: drop,
      backported from upstream
---
 debian/changelog                                   |  3 +++
 debian/patches/series                              |  1 -
 ...lude-random-for-std-default_random_engine.patch | 25 ----------------------
 3 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4555b29..1c372de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ libqapt (3.0.3-0r1) UNRELEASED; urgency=medium
   * Replace the deprecated kio-dev build dependency with libkf5kio-dev.
   * Remove unused meta/upstream_scm.json file.
   * Remove qapt-dbg in favour of the -dbgsym packages.
+  * Update the patches:
+    - upstream_include-random-for-std-default_random_engine.patch: drop,
+      backported from upstream
 
  -- Debian/Kubuntu KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 15 May 2016 19:30:43 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1e2b5ca..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 25e93de..0000000
--- a/debian/patches/upstream_include-random-for-std-default_random_engine.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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