[vdr-plugin-live] 05/12: Dropped all patches - fixed upstream

Tobias Grimm tiber-guest at moszumanska.debian.org
Wed Dec 27 15:29:49 UTC 2017


This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to branch master
in repository vdr-plugin-live.

commit c46e094f2f914ac9a791c2030b7a4e8eadadd68c
Author: Tobias Grimm <etobi at debian.org>
Date:   Tue Aug 22 21:32:22 2017 +0200

    Dropped all patches - fixed upstream
---
 debian/patches/Makefile-fix.patch | 15 --------------
 debian/patches/gcc6-fixes.patch   | 42 ---------------------------------------
 debian/patches/series             |  2 --
 3 files changed, 59 deletions(-)

diff --git a/debian/patches/Makefile-fix.patch b/debian/patches/Makefile-fix.patch
deleted file mode 100644
index b992a4c..0000000
--- a/debian/patches/Makefile-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: vdr-plugin-live/Makefile
-===================================================================
---- vdr-plugin-live.orig/Makefile	2015-02-13 19:32:53.426214837 +0100
-+++ vdr-plugin-live/Makefile	2015-02-13 21:23:39.462659817 +0100
-@@ -50,8 +50,8 @@
- endif
- 
- ### export all vars for sub-makes, using absolute paths
--LIBDIR := $(shell cd $(LIBDIR) >/dev/null 2>&1 && pwd)
--LOCDIR := $(shell cd $(LOCDIR) >/dev/null 2>&1 && pwd)
-+#LIBDIR := $(shell cd $(LIBDIR) >/dev/null 2>&1 && pwd)
-+#LOCDIR := $(shell cd $(LOCDIR) >/dev/null 2>&1 && pwd)
- export
- unexport PLUGIN
- 
diff --git a/debian/patches/gcc6-fixes.patch b/debian/patches/gcc6-fixes.patch
deleted file mode 100644
index 4291386..0000000
--- a/debian/patches/gcc6-fixes.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/stdext.h
-+++ b/stdext.h
-@@ -3,9 +3,39 @@
- 
- #if __GNUC__ >= 4
- 
-+#if __GNUC__ >= 6
-+
-+#include <memory>
-+#include <functional>
-+
-+namespace std {
-+namespace tr1 {
-+
-+	using std::bind;
-+	using std::shared_ptr;
-+	using std::weak_ptr;
-+
-+	namespace placeholders {
-+		using std::placeholders::_1;
-+		using std::placeholders::_2;
-+		using std::placeholders::_3;
-+		using std::placeholders::_4;
-+		using std::placeholders::_5;
-+		using std::placeholders::_6;
-+		using std::placeholders::_7;
-+		using std::placeholders::_8;
-+		using std::placeholders::_9;
-+	}
-+} // namespace tr1
-+} // namespace std
-+
-+#else
-+
- #	include <tr1/functional>
- #	include <tr1/memory>
- 
-+# endif
-+
- #else
- 
- #	include <boost/version.hpp>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7f01b20..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile-fix.patch
-gcc6-fixes.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-live.git



More information about the pkg-vdr-dvb-changes mailing list