[SCM] supercollider/master: Add notes about forwarded patches
danstowell-guest at users.alioth.debian.org
danstowell-guest at users.alioth.debian.org
Fri Jun 10 23:22:19 UTC 2016
The following commit has been merged in the master branch:
commit 47e157bc4d1e2533dcb5f3d5a6bfccd31f365c1c
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date: Sat Jun 11 00:21:47 2016 +0100
Add notes about forwarded patches
diff --git a/debian/patches/cmake-fix-systemboost.patch b/debian/patches/cmake-fix-systemboost.patch
index bdb91c9..acc57b2 100644
--- a/debian/patches/cmake-fix-systemboost.patch
+++ b/debian/patches/cmake-fix-systemboost.patch
@@ -1,3 +1,5 @@
+Forwarded: yes
+Description: Upstreamed, patch can be removed from 3.7.1+
Index: supercollider/external_libraries/CMakeLists.txt
===================================================================
--- supercollider.orig/external_libraries/CMakeLists.txt
diff --git a/debian/patches/fix-oscpack-ftbfs.patch b/debian/patches/fix-oscpack-ftbfs.patch
index 9359e9e..ea64c64 100644
--- a/debian/patches/fix-oscpack-ftbfs.patch
+++ b/debian/patches/fix-oscpack-ftbfs.patch
@@ -11,6 +11,7 @@ Description: Fix FTBFS on various arches caused by buggy oscpack build
The other overloads should be enough.
Author: James Cowgill <jcowgill at debian.org>
Bug-Debian: https://bugs.debian.org/824581
+Forwarded: yes
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/external_libraries/oscpack_1_1_0/osc/OscTypes.h
diff --git a/debian/patches/perf-counter-include.patch b/debian/patches/perf-counter-include.patch
index 6943ebd..ca43f61 100644
--- a/debian/patches/perf-counter-include.patch
+++ b/debian/patches/perf-counter-include.patch
@@ -1,5 +1,7 @@
Author: Dan Stowell <danstowell at users.sourceforge.net>
Description: ia64 and alpha include perf bits in other files
+ Upstreamed, patch can be removed from 3.7.1+
+Forwarded: yes
--- a/external_libraries/nova-simd/benchmarks/perf_counter.hpp
+++ b/external_libraries/nova-simd/benchmarks/perf_counter.hpp
@@ -54,6 +54,11 @@
--
supercollider packaging
More information about the pkg-multimedia-commits
mailing list