[SCM] qmidinet/master: Patches refreshed/deleted.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 33dda384f18cfa5018c3422768b5424e26de4063
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Jun 27 13:36:28 2017 +0200

    Patches refreshed/deleted.

diff --git a/debian/patches/01-fix_FTBFS.patch b/debian/patches/01-fix_FTBFS.patch
deleted file mode 100644
index d636a81..0000000
--- a/debian/patches/01-fix_FTBFS.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix FTBFS with -Werror=format-security
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: yes
-
-Index: qmidinet/src/qmidinet.cpp
-===================================================================
---- qmidinet.orig/src/qmidinet.cpp
-+++ qmidinet/src/qmidinet.cpp
-@@ -182,7 +182,7 @@ void qmidinetApplication::message (
- 		m_pIcon->message(sTitle, sText);
- 	} else {
- 		const QString sMessage = sTitle + ": " + sText.simplified();
--		qCritical(sMessage.toUtf8().constData());
-+		qCritical( "%s", sMessage.toUtf8().constData());
- 	}
- }
- 
diff --git a/debian/patches/03-fix_hardening.patch b/debian/patches/03-fix_hardening.patch
index a3121e0..54df2c5 100644
--- a/debian/patches/03-fix_hardening.patch
+++ b/debian/patches/03-fix_hardening.patch
@@ -16,7 +16,7 @@ Index: qmidinet/configure.ac
 ===================================================================
 --- qmidinet.orig/configure.ac
 +++ qmidinet/configure.ac
-@@ -133,6 +133,7 @@ AC_ARG_WITH(jack,
+@@ -131,6 +131,7 @@ AC_ARG_WITH(jack,
  
  # Honor user specified flags.
  ac_cflags=$CFLAGS
@@ -24,7 +24,7 @@ Index: qmidinet/configure.ac
  ac_ldflags=$LDFLAGS
  
  
-@@ -365,6 +366,7 @@ if test "x$ac_jack_midi" = "xyes"; then
+@@ -366,6 +367,7 @@ if test "x$ac_jack_midi" = "xyes"; then
  fi
  
  AC_SUBST(ac_cflags)
diff --git a/debian/patches/05-qmidinet.patch b/debian/patches/05-qmidinet.patch
deleted file mode 100644
index d6b9a07..0000000
--- a/debian/patches/05-qmidinet.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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;
- 		}
- 	}
diff --git a/debian/patches/series b/debian/patches/series
index 39049d4..ea938f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-01-fix_FTBFS.patch
 03-fix_hardening.patch
-05-qmidinet.patch

-- 
qmidinet packaging