[heroes] 16/18: Load heroesrc directly from /etc, drop /usr/share/games/heroes/etc.

[Stephen Kitt]

This is an automated email from the git hooks/post-receive script.

skitt pushed a commit to annotated tag debian/0.21-11
in repository heroes.

commit f52767a3d6075d9607c8dcc3f5e0d86d9123460a
Author: Stephen Kitt <steve at sk2.org>
Date:   Sat Jan 23 20:15:16 2016 +0100

    Load heroesrc directly from /etc, drop /usr/share/games/heroes/etc.
---
 debian/changelog              |  1 +
 debian/patches/heroesrc.patch | 14 ++++++++++++++
 debian/patches/series         |  1 +
 debian/rules                  |  4 +---
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c0c258e..5fcd3a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ heroes (0.21-11) UNRELEASED; urgency=medium
   * Standards-Version 3.9.6, no further change required.
   * Spell "suppress" correctly (thanks lintian!).
   * Build with mikmod.
+  * Load heroesrc directly from /etc, drop /usr/share/games/heroes/etc.
 
  -- Stephen Kitt <skitt at debian.org>  Wed, 20 Jan 2016 14:16:25 +0100
 
diff --git a/debian/patches/heroesrc.patch b/debian/patches/heroesrc.patch
new file mode 100644
index 0000000..29b2eae
--- /dev/null
+++ b/debian/patches/heroesrc.patch
@@ -0,0 +1,14 @@
+Description: Load heroesrc from /etc
+Author: Stephen Kitt <skitt at debian.org>
+
+--- a/src/rsc_files_hash.c
++++ b/src/rsc_files_hash.c
+@@ -139,7 +139,7 @@
+     {"",0,0,0,false},
+     {"user-conf",		"$(user-dir)/heroesrc",			0,0,true},
+     {"score-file",		"$(user-dir)/scores",			0,0,true},
+-    {"system-conf",		"$(data-dir)/etc/heroesrc",		0,0,true},
++    {"system-conf",		"/etc/heroesrc",			0,0,true},
+     {"menu-pictures-img",	"$(data-dir)/pics/fontem2.pcx",		0,0,true},
+     {"",0,0,0,false}, {"",0,0,0,false}, {"",0,0,0,false},
+     {"editor-preview-prefix",  "$(data-dir)/pics/editp",		0,0,true},
diff --git a/debian/patches/series b/debian/patches/series
index 1182e23..e24f73f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ po-sv.patch
 skip-interactive-tests.patch
 swab.patch
 spelling-fixes.patch
+heroesrc.patch
diff --git a/debian/rules b/debian/rules
index ea5ea7f..98569aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,9 +24,7 @@ override_dh_install:
 	dh_install
 	chown root:games debian/heroes/usr/games/heroes
 	chmod g+s debian/heroes/usr/games/heroes
-	rm -f debian/heroes/usr/share/games/heroes/etc/heroesrc
-	mkdir -p debian/heroes/usr/share/games/heroes/etc
-	ln -sf /etc/heroesrc debian/heroes/usr/share/games/heroes/etc/heroesrc
+	rm -rf debian/heroes/usr/share/games/heroes/etc
 
 override_dh_auto_test:
 	srcdir=$(CURDIR)/tests VERBOSE=1 dh_auto_test

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/heroes.git