[SCM] qxgedit/master: Patch forwarded.

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

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

    Patch forwarded.

diff --git a/debian/patches/0004-qxgedit.patch b/debian/patches/0004-qxgedit.patch
index c93997b..3f90a7b 100644
--- a/debian/patches/0004-qxgedit.patch
+++ b/debian/patches/0004-qxgedit.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: qxgedit/src/qxgeditMainForm.cpp
-===================================================================
---- qxgedit.orig/src/qxgeditMainForm.cpp
-+++ qxgedit/src/qxgeditMainForm.cpp
-@@ -1841,7 +1841,6 @@ void qxgeditMainForm::helpAbout (void)
- 	sText += "<b>" QXGEDIT_TITLE " - " + tr(QXGEDIT_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";
- #ifdef CONFIG_DEBUG
- 	sText += "<small><font color=\"red\">";
- 	sText += tr("Debugging option enabled.");
-Index: qxgedit/src/qxgeditOptions.cpp
-===================================================================
---- qxgedit.orig/src/qxgeditOptions.cpp
-+++ qxgedit/src/qxgeditOptions.cpp
-@@ -215,10 +215,9 @@ bool qxgeditOptions::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(QXGEDIT_TITLE)
--				.arg(CONFIG_BUILD_VERSION)
--				.arg(CONFIG_BUILD_DATE);
-+				.arg(CONFIG_BUILD_VERSION);
- 			return false;
- 		}
- 		else {
+Index: qxgedit/src/qxgeditMainForm.cpp
+===================================================================
+--- qxgedit.orig/src/qxgeditMainForm.cpp
++++ qxgedit/src/qxgeditMainForm.cpp
+@@ -1841,7 +1841,6 @@ void qxgeditMainForm::helpAbout (void)
+ 	sText += "<b>" QXGEDIT_TITLE " - " + tr(QXGEDIT_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";
+ #ifdef CONFIG_DEBUG
+ 	sText += "<small><font color=\"red\">";
+ 	sText += tr("Debugging option enabled.");
+Index: qxgedit/src/qxgeditOptions.cpp
+===================================================================
+--- qxgedit.orig/src/qxgeditOptions.cpp
++++ qxgedit/src/qxgeditOptions.cpp
+@@ -215,10 +215,9 @@ bool qxgeditOptions::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(QXGEDIT_TITLE)
+-				.arg(CONFIG_BUILD_VERSION)
+-				.arg(CONFIG_BUILD_DATE);
++				.arg(CONFIG_BUILD_VERSION);
+ 			return false;
+ 		}
+ 		else {

-- 
qxgedit packaging