[SCM] qsampler/master: Patch applied upstream - removed.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Sun Jul 2 23:41:36 UTC 2017
The following commit has been merged in the master branch:
commit 4380b03a23b907aa09b13cdeb13cf7862b983fde
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Mon Jul 3 00:38:47 2017 +0200
Patch applied upstream - removed.
diff --git a/debian/patches/2001-qsampler.patch b/debian/patches/2001-qsampler.patch
deleted file mode 100644
index fcc0bff..0000000
--- a/debian/patches/2001-qsampler.patch
+++ /dev/null
@@ -1,42 +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: qsampler/src/qsamplerMainForm.cpp
-===================================================================
---- qsampler.orig/src/qsamplerMainForm.cpp
-+++ qsampler/src/qsamplerMainForm.cpp
-@@ -1048,8 +1048,6 @@ bool MainForm::saveSessionFile ( const Q
- ts << "# " << QSAMPLER_TITLE " - " << tr(QSAMPLER_SUBTITLE) << endl;
- ts << "# " << tr("Version")
- << ": " CONFIG_BUILD_VERSION << endl;
-- ts << "# " << tr("Build")
-- << ": " CONFIG_BUILD_DATE << endl;
- ts << "#" << endl;
- ts << "# " << tr("File")
- << ": " << QFileInfo(sFilename).fileName() << endl;
-@@ -1965,7 +1963,6 @@ void MainForm::helpAbout (void)
- sText += "<b>" QSAMPLER_TITLE " - " + tr(QSAMPLER_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: qsampler/src/qsamplerOptions.cpp
-===================================================================
---- qsampler.orig/src/qsamplerOptions.cpp
-+++ qsampler/src/qsamplerOptions.cpp
-@@ -339,10 +339,9 @@ bool Options::parse_args ( const QString
- 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(QSAMPLER_TITLE)
-- .arg(CONFIG_BUILD_VERSION)
-- .arg(CONFIG_BUILD_DATE);
-+ .arg(CONFIG_BUILD_VERSION);
- #ifdef CONFIG_LIBGIG
- out << QString("%1: %2\n")
- .arg(gig::libraryName().c_str())
diff --git a/debian/patches/series b/debian/patches/series
index 2854316..56aa973 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
0001-hardening.patch
-2001-qsampler.patch
--
qsampler packaging
More information about the pkg-multimedia-commits
mailing list