[trigger-rally] 08/14: Drop 813-config-path.patch. Fixed upstream.
Markus Koschany
apo at moszumanska.debian.org
Mon Dec 19 14:25:41 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository trigger-rally.
commit b5b7ac4111b2159779c3a2c3076fed16aaa17bbd
Author: Markus Koschany <apo at debian.org>
Date: Mon Dec 19 14:29:30 2016 +0100
Drop 813-config-path.patch. Fixed upstream.
---
debian/patches/813-config-path.patch | 24 ------------------------
debian/patches/series | 1 -
2 files changed, 25 deletions(-)
diff --git a/debian/patches/813-config-path.patch b/debian/patches/813-config-path.patch
deleted file mode 100644
index e939431..0000000
--- a/debian/patches/813-config-path.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Add Debian config path
-Origin: upstream, commit 813
---- a/src/Trigger/main.cpp
-+++ b/src/Trigger/main.cpp
-@@ -361,7 +361,18 @@
- std::string cfgfilename = "trigger-rally-" PACKAGE_VERSION ".config";
-
- if (!PHYSFS_exists(cfgfilename.c_str())) {
--
-+#ifdef UNIX
-+ const std::vector<std::string> cfghidingplaces {
-+ "/usr/share/games/trigger-rally/"
-+ };
-+
-+ for (const std::string &cfgpath: cfghidingplaces)
-+ if (PHYSFS_addToSearchPath(cfgpath.c_str(), 1) == 0)
-+ {
-+ PUtil::outLog() << "Failed to add PhysFS search directory \"" <<
-+ cfgpath << "\"\nPhysFS: " << PHYSFS_getLastError() << std::endl;
-+ }
-+#endif
- PUtil::outLog() << "No user config file, copying over defaults" << std::endl;
-
- std::string cfgdefaults = "trigger-rally.config.defs";
diff --git a/debian/patches/series b/debian/patches/series
index 3563862..077a0ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-813-config-path.patch
811-flags.patch
verbose-build.patch
disable-strip.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/trigger-rally.git
More information about the Pkg-games-commits
mailing list