[SCM] hydrogen/master: Advertise DEP3 format in patch headers.

js at users.alioth.debian.org js at users.alioth.debian.org
Fri Jul 21 08:24:58 UTC 2017


The following commit has been merged in the master branch:
commit 40a129f86a74b632ceb93dcfb78cd1f4dc31edad
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Jul 20 22:08:38 2017 +0200

    Advertise DEP3 format in patch headers.

diff --git a/debian/patches/1000_portaudio_v2.patch b/debian/patches/1000_portaudio_v2.patch
index 64b5144..ca8d14a 100644
--- a/debian/patches/1000_portaudio_v2.patch
+++ b/debian/patches/1000_portaudio_v2.patch
@@ -2,10 +2,7 @@ Description: ???
 Author: ???
 Forwarded: mauser at smoors.de
 ---
- src/core/src/IO/PortAudioDriver.h    |    3 +++
- src/core/src/IO/portaudio_driver.cpp |   10 ++++++++--
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/core/include/hydrogen/IO/PortAudioDriver.h
 +++ b/src/core/include/hydrogen/IO/PortAudioDriver.h
 @@ -30,6 +30,9 @@
diff --git a/debian/patches/1001_rubberband_path.patch b/debian/patches/1001_rubberband_path.patch
index a8abc67..c6a5beb 100644
--- a/debian/patches/1001_rubberband_path.patch
+++ b/debian/patches/1001_rubberband_path.patch
@@ -3,9 +3,7 @@ Author: Jonas Smedegaard <dr at jones.dk>
 Last-Update: 2011-03-17
 Forwarded: mauser at smoors.de
 ---
- data/hydrogen.default.conf |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/data/hydrogen.default.conf
 +++ b/data/hydrogen.default.conf
 @@ -19,7 +19,7 @@
diff --git a/debian/patches/1005_name_shouldnt_repeat_genericname.patch b/debian/patches/1005_name_shouldnt_repeat_genericname.patch
index 81e58bb..2206e5b 100644
--- a/debian/patches/1005_name_shouldnt_repeat_genericname.patch
+++ b/debian/patches/1005_name_shouldnt_repeat_genericname.patch
@@ -13,9 +13,7 @@ Reviewed-by: Alessio Tregli <alessio at debian.org>
 Last-Update: 2012-01-27
 Forwarded: mauser at smoors.de
 ---
- linux/hydrogen.desktop |   13 +++----------
- 1 file changed, 3 insertions(+), 10 deletions(-)
-
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/linux/hydrogen.desktop
 +++ b/linux/hydrogen.desktop
 @@ -1,11 +1,5 @@
diff --git a/debian/patches/1006_porttime.patch b/debian/patches/1006_porttime.patch
index 4bf470d..fe198e3 100644
--- a/debian/patches/1006_porttime.patch
+++ b/debian/patches/1006_porttime.patch
@@ -2,9 +2,7 @@ Description: Add missing -lporttime to LDFLAGS to avoid FTBFS.
 Author: Alessio Treglia <alessio at debian.org>
 Forwarded: mauser at smoors.de
 ---
- src/core/CMakeLists.txt |    1 +
- 1 file changed, 1 insertion(+)
-
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/core/CMakeLists.txt
 +++ b/src/core/CMakeLists.txt
 @@ -50,6 +50,7 @@
diff --git a/debian/patches/1008-ftbfs-gcc-4.7.diff b/debian/patches/1008-ftbfs-gcc-4.7.diff
index 755e885..2b078ee 100644
--- a/debian/patches/1008-ftbfs-gcc-4.7.diff
+++ b/debian/patches/1008-ftbfs-gcc-4.7.diff
@@ -3,11 +3,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667203
 Author: Matthias Klose <doko at debian.org>
 Forwarded: mauser at smoors.de
 ---
- src/core/src/IO/portmidi_driver.cpp   |    1 +
- src/gui/src/MainForm.cpp              |    1 +
- src/gui/src/SongEditor/SongEditor.cpp |    1 +
- 3 files changed, 3 insertions(+)
-
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/core/src/IO/portmidi_driver.cpp
 +++ b/src/core/src/IO/portmidi_driver.cpp
 @@ -33,6 +33,7 @@
diff --git a/debian/patches/1010-spelling.patch b/debian/patches/1010-spelling.patch
index 682abf8..d1ec2fe 100644
--- a/debian/patches/1010-spelling.patch
+++ b/debian/patches/1010-spelling.patch
@@ -1,7 +1,8 @@
 Description:  Fix some spelling.
 Author: Jaromír Mikeš <mira.mikes at seznam.cz>
 Forwarded: mauser at smoors.de
-
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/core/src/IO/jack_output.cpp
 +++ b/src/core/src/IO/jack_output.cpp
 @@ -152,13 +152,13 @@
diff --git a/debian/patches/1015-man_path.patch b/debian/patches/1015-man_path.patch
index 9002c15..6eb6dc2 100644
--- a/debian/patches/1015-man_path.patch
+++ b/debian/patches/1015-man_path.patch
@@ -1,7 +1,8 @@
 Description:  Fix install path for man pages.
 Author: Jaromír Mikeš <mira.mikes at seznam.cz>
 Forwarded: mauser at smoors.de
-
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -358,7 +358,7 @@
diff --git a/debian/patches/1020-cxx_flags.patch b/debian/patches/1020-cxx_flags.patch
index 7dfca4a..0a7174b 100644
--- a/debian/patches/1020-cxx_flags.patch
+++ b/debian/patches/1020-cxx_flags.patch
@@ -1,7 +1,8 @@
 Description:  Fix CXX Flags.
 Author: Jaromír Mikeš <mira.mikes at seznam.cz>
 Forwarded: mauser at smoors.de
-
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -106,7 +106,7 @@

-- 
hydrogen packaging



More information about the pkg-multimedia-commits mailing list