[SCM] qmidinet/master: Patch forwarded.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Sun Nov 20 19:12:57 UTC 2016


The following commit has been merged in the master branch:
commit a9ec9d1c2a42aac80d9687e246811e1a750b0634
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sun Nov 20 20:12:51 2016 +0100

    Patch forwarded.

diff --git a/debian/patches/05-qmidinet.patch b/debian/patches/05-qmidinet.patch
index 3bc5adf..d6b9a07 100644
--- a/debian/patches/05-qmidinet.patch
+++ b/debian/patches/05-qmidinet.patch
@@ -1,32 +1,33 @@
 Author: Reiner Herrmann <reiner at reiner-h.de>
 Description: Strip build date from version info to make build reproducible
+Forwarded: rncbc at rncbc.org
 
-Index: qmidinet/src/qmidinet.cpp
-===================================================================
---- qmidinet.orig/src/qmidinet.cpp
-+++ qmidinet/src/qmidinet.cpp
-@@ -298,7 +298,6 @@ void qmidinetSystemTrayIcon::about (void
- 	sText += "<b>" QMIDINET_TITLE " - " + tr(QMIDINET_SUBTITLE) + "</b><br />\n";
- 	sText += "<br />\n";
- 	sText += tr("Version") + ": <b>" CONFIG_BUILD_VERSION "</b><br />\n";
--	sText += "<small>" + tr("Build") + ": " CONFIG_BUILD_DATE "</small><br />\n";
- #ifndef CONFIG_ALSA_MIDI
- 	sText += "<small><font color=\"red\">";
- 	sText += tr("ALSA MIDI support disabled.");
-Index: qmidinet/src/qmidinetOptions.cpp
-===================================================================
---- qmidinet.orig/src/qmidinetOptions.cpp
-+++ qmidinet/src/qmidinetOptions.cpp
-@@ -234,10 +234,9 @@ bool qmidinetOptions::parse_args ( const
- 		else if (sArg == "-v" || sArg == "--version") {
- 			out << QObject::tr("Qt: %1\n")
- 				.arg(qVersion());
--			out << QObject::tr("%1: %2  (%3)\n")
-+			out << QObject::tr("%1: %2\n")
- 				.arg(QMIDINET_TITLE)
--				.arg(CONFIG_BUILD_VERSION)
--				.arg(CONFIG_BUILD_DATE);
-+				.arg(CONFIG_BUILD_VERSION);
- 			return false;
- 		}
- 	}
+Index: qmidinet/src/qmidinet.cpp
+===================================================================
+--- qmidinet.orig/src/qmidinet.cpp
++++ qmidinet/src/qmidinet.cpp
+@@ -298,7 +298,6 @@ void qmidinetSystemTrayIcon::about (void
+ 	sText += "<b>" QMIDINET_TITLE " - " + tr(QMIDINET_SUBTITLE) + "</b><br />\n";
+ 	sText += "<br />\n";
+ 	sText += tr("Version") + ": <b>" CONFIG_BUILD_VERSION "</b><br />\n";
+-	sText += "<small>" + tr("Build") + ": " CONFIG_BUILD_DATE "</small><br />\n";
+ #ifndef CONFIG_ALSA_MIDI
+ 	sText += "<small><font color=\"red\">";
+ 	sText += tr("ALSA MIDI support disabled.");
+Index: qmidinet/src/qmidinetOptions.cpp
+===================================================================
+--- qmidinet.orig/src/qmidinetOptions.cpp
++++ qmidinet/src/qmidinetOptions.cpp
+@@ -234,10 +234,9 @@ bool qmidinetOptions::parse_args ( const
+ 		else if (sArg == "-v" || sArg == "--version") {
+ 			out << QObject::tr("Qt: %1\n")
+ 				.arg(qVersion());
+-			out << QObject::tr("%1: %2  (%3)\n")
++			out << QObject::tr("%1: %2\n")
+ 				.arg(QMIDINET_TITLE)
+-				.arg(CONFIG_BUILD_VERSION)
+-				.arg(CONFIG_BUILD_DATE);
++				.arg(CONFIG_BUILD_VERSION);
+ 			return false;
+ 		}
+ 	}

-- 
qmidinet packaging



More information about the pkg-multimedia-commits mailing list