[SCM] rtmidi/master: Refreshed patches

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Thu Oct 5 22:05:16 UTC 2017


The following commit has been merged in the master branch:
commit c5d70fb6e8ae7ebaaa28edadf352005a9b76a53e
Author: IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>
Date:   Fri Oct 6 00:04:54 2017 +0200

    Refreshed patches

diff --git a/debian/patches/0004-not-install-doc-images.patch b/debian/patches/0004-not-install-doc-images.patch
index 765245a..9346612 100644
--- a/debian/patches/0004-not-install-doc-images.patch
+++ b/debian/patches/0004-not-install-doc-images.patch
@@ -2,11 +2,9 @@ Description: Not install doc images
 Author: Jaromír Mikeš <mira.mikes at seznam.cz>
 Forwarded: no
 
-Index: rtmidi/configure.ac
-===================================================================
 --- rtmidi.orig/configure.ac
 +++ rtmidi/configure.ac
-@@ -103,8 +103,8 @@ AM_CONDITIONAL( MAKE_DOC, [test "x${DOXY
+@@ -102,8 +102,8 @@
  AC_CONFIG_LINKS( [doc/doxygen/footer.html:doc/doxygen/footer.html] )
  AC_CONFIG_LINKS( [doc/doxygen/header.html:doc/doxygen/header.html] )
  AC_CONFIG_LINKS( [doc/doxygen/tutorial.txt:doc/doxygen/tutorial.txt] )
diff --git a/debian/patches/0005-fix_pkg-config.patch b/debian/patches/0005-fix_pkg-config.patch
index db3230e..e385336 100644
--- a/debian/patches/0005-fix_pkg-config.patch
+++ b/debian/patches/0005-fix_pkg-config.patch
@@ -2,11 +2,9 @@ Description: Fix pkg-config-bad-directive
 Author: Jaromír Mikeš <mira.mikes at seznam.cz>
 Forwarded: no
 
-Index: rtmidi/rtmidi.pc.in
-===================================================================
 --- rtmidi.orig/rtmidi.pc.in
 +++ rtmidi/rtmidi.pc.in
-@@ -9,4 +9,4 @@ Version: @PACKAGE_VERSION@
+@@ -9,4 +9,4 @@
  Requires: @req@ 
  Libs: -L${libdir} -lrtmidi
  Libs.private: -lpthread
diff --git a/debian/patches/0006-hardening.patch b/debian/patches/0006-hardening.patch
index 52331e0..1397ddd 100644
--- a/debian/patches/0006-hardening.patch
+++ b/debian/patches/0006-hardening.patch
@@ -2,11 +2,9 @@ Description: Pass CXXFLAGS
 Author: Jaromír Mikeš <mira.mikes at seznam.cz>
 Forwarded: no
 
-Index: rtmidi/configure.ac
-===================================================================
 --- rtmidi.orig/configure.ac
 +++ rtmidi/configure.ac
-@@ -85,8 +85,8 @@ fi
+@@ -84,8 +84,8 @@
  CPPFLAGS="$CPPFLAGS $cppflag"
  
  # For debugging and optimization ... overwrite default because it has both -g and -O2
diff --git a/debian/patches/0007-cross.patch b/debian/patches/0007-cross.patch
index 932fab6..9b7c30c 100644
--- a/debian/patches/0007-cross.patch
+++ b/debian/patches/0007-cross.patch
@@ -3,11 +3,9 @@ Author: Helmut Grohne <helmut at subdivi.de>
 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=877386
 Forwarded: no
 
-Index: rtmidi-2.1.1~ds0/configure.ac
-===================================================================
---- rtmidi-2.1.1~ds0.orig/configure.ac
-+++ rtmidi-2.1.1~ds0/configure.ac
-@@ -31,11 +31,9 @@
+--- rtmidi.orig/configure.ac
++++ rtmidi/configure.ac
+@@ -30,11 +30,9 @@
  
  # Check version number coherency between RtMidi.h and configure.ac
  AC_MSG_CHECKING([that version numbers are coherent])

-- 
RtMidi packaging



More information about the pkg-multimedia-commits mailing list