[redeclipse] 01/23: Start adaption to next (likely 1.5) release

[Martin Werner]

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

arand-guest pushed a commit to branch next
in repository redeclipse.

commit 536585ab92b2014f79dbba210606b121e3799bbe
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Sun Jun 15 18:17:24 2014 +0200

    Start adaption to next (likely 1.5) release
    
    Adapt to version.cfg now being placed in the upstream data/ dir and the
    game/ dir being removed.
---
 debian/patches/series                                   |  1 -
 ...-install-symlink-to-version.cfg-in-server-inst.patch | 17 -----------------
 debian/rules                                            |  5 ++---
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 57aa3f0..98100be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 windowed-by-default.patch
 build-with-system-enet.patch
 desktop-file-don-t-quote-icon-app-name.patch
-system-install-symlink-to-version.cfg-in-server-inst.patch
 don-t-check-for-keymap-when-using-standalone.patch
 gnu-link-rt.patch
diff --git a/debian/patches/system-install-symlink-to-version.cfg-in-server-inst.patch b/debian/patches/system-install-symlink-to-version.cfg-in-server-inst.patch
deleted file mode 100644
index cf45d91..0000000
--- a/debian/patches/system-install-symlink-to-version.cfg-in-server-inst.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: system-install: symlink to version.cfg in server install
- * This fixes broken server installs, backport material.
- Author: Martin Erik Werner "arand" <martinerikwerner at gmail.com>
- Origin: upstream, http://redeclipse.net/svn/5503
- Last-Update: 2013-03-25
-
---- a/src/system-install.mk
-+++ b/src/system-install.mk
-@@ -84,6 +84,8 @@
- 		-i $(gamesbindir)/$(appname)-server
- 	install -m644 ../$(appgamedir)/version.cfg \
- 		$(datadir)/$(appname)/version.cfg
-+	ln -s $(patsubst $(DESTDIR)%,%,$(datadir))/$(appname)/version.cfg \
-+		$(libexecdir)/$(appname)/version.cfg
- 
- system-install-data:
- 	install -d $(datadir)/$(appname)
diff --git a/debian/rules b/debian/rules
index 5c089d9..0ba9767 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,9 +47,8 @@ get-orig-source:
 	rm -rf $(DIR)/src/lib/
 	rm -rf $(DIR)/src/install/win/
 	rm -rf $(DIR)/bin/
-	rm -rf $(DIR)/data
-	find $(DIR)/game/ -not -type d -not -iname 'version.cfg' -delete
-	find $(DIR)/game/ -empty -delete
+	find $(DIR)/data/ -not -type d -not -iname 'version.cfg' -delete
+	find $(DIR)/data/ -empty -delete
 	XZ_OPT="-6" tar --create --xz --owner root --group root --mode a+rX \
 		-f $(TAR) $(DIR)
 	rm -rf $(DIR)

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