[SCM] qxgedit/master: Patch applied upstream - removed.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Wed Jun 28 17:27:08 UTC 2017


The following commit has been merged in the master branch:
commit 141a9f547304e6dabddb5dc09c2c1344b5e96520
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Jun 28 15:46:32 2017 +0200

    Patch applied upstream - removed.

diff --git a/debian/patches/0004-qxgedit.patch b/debian/patches/0004-qxgedit.patch
deleted file mode 100644
index 3f90a7b..0000000
--- a/debian/patches/0004-qxgedit.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: 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 {
diff --git a/debian/patches/series b/debian/patches/series
index bc14ba9..fe90ca5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0002-fix_multiarch_dir.patch
-0004-qxgedit.patch

-- 
qxgedit packaging



More information about the pkg-multimedia-commits mailing list