[redeclipse] 01/01: Make sure guidelines.txt is accessible by client for first-connect

[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 40d92a3e75d0c9d6dd4211287fc0b7654f7ce432
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Sat Apr 4 15:43:43 2015 +0200

    Make sure guidelines.txt is accessible by client for first-connect
    
    * Add (upstream) patch to install doc symlink for guidelines
    * Add doc symlink as installed
    * Disable compression of guidelines.txt
    * Move installation of guidelines from .docs to .install, since it's now
      taken care of by upstream install target
---
 debian/changelog                                   |  2 +
 debian/patches/series                              |  1 +
 ...all-Add-doc-link-for-client-finding-guide.patch | 52 ++++++++++++++++++++++
 debian/redeclipse.doc-base                         |  2 +-
 debian/redeclipse.docs                             |  1 -
 debian/redeclipse.install                          |  2 +
 debian/rules                                       |  2 +-
 7 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2996be8..6ede6be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ redeclipse (1.5.1-1) unstable; urgency=low
     - Add appdata-Fill-in-remove-FIXMEs.patch
     - Add appdata-Update-description-screenshots.patch
     - Add system-install-Install-appdata.patch
+  * Make sure guidelines.txt is accessible by client for first-connect
+    - Add system-install-Add-doc-link-for-client-finding-guide.patch
 
  -- Martin Erik Werner <martinerikwerner at gmail.com>  Sun, 29 Mar 2015 16:02:22 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 5644225..076835b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ appdata-Upgrade-via-appstream-util.patch
 appdata-Fill-in-remove-FIXMEs.patch
 appdata-Update-description-screenshots.patch
 system-install-Install-appdata.patch
+system-install-Add-doc-link-for-client-finding-guide.patch
diff --git a/debian/patches/system-install-Add-doc-link-for-client-finding-guide.patch b/debian/patches/system-install-Add-doc-link-for-client-finding-guide.patch
new file mode 100644
index 0000000..1e67670
--- /dev/null
+++ b/debian/patches/system-install-Add-doc-link-for-client-finding-guide.patch
@@ -0,0 +1,52 @@
+From 38ba0f83dd7a27e90c44cb124f8b34e83429c561 Mon Sep 17 00:00:00 2001
+From: Martin Erik Werner <martinerikwerner at gmail.com>
+Date: Sat, 4 Apr 2015 15:30:08 +0200
+Subject: [PATCH] system-install: Add doc link for client finding
+ guidelines.txt
+
+Since the client needs to read guidelines.txt the first time the user
+connects to the master server, it needs to be installed in an accessible
+location for the client, add a symlink for this purpose.
+
+Also re-arrange so that the install target which has the real data also
+takes care of the link, avoiding broken symlinks.
+---
+ src/system-install.mk | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/system-install.mk b/src/system-install.mk
+index eaa3c41..27fc5c1 100644
+--- a/src/system-install.mk
++++ b/src/system-install.mk
+@@ -70,8 +70,6 @@ system-install-client: client
+ 	g, at APPNAME@,\
+ 	s, at APPNAME@,$(appname),g\n\
+ 	w\n" | ed -s $(gamesbindir)/$(appname)
+-	ln -s $(patsubst $(DESTDIR)%,%,$(datadir))/$(appname)/data \
+-		$(libexecdir)/$(appname)/data
+ 
+ system-install-server: server
+ 	$(MKDIR) $(libexecdir)/$(appname)
+@@ -101,7 +99,10 @@ system-install-common:
+ 
+ system-install-data:
+ 	$(MKDIR) $(datadir)/$(appname)
++	$(MKDIR) $(libexecdir)/$(appname)
+ 	cp -r ../data $(datadir)/$(appname)/data
++	ln -s $(patsubst $(DESTDIR)%,%,$(datadir))/$(appname)/data \
++		$(libexecdir)/$(appname)/data
+ 
+ system-install-docs: $(MANPAGES)
+ 	$(MKDIR) $(mandir)/man6
+@@ -122,6 +123,8 @@ system-install-docs: $(MANPAGES)
+ 		gzip -9 -n -c > $(mandir)/man6/$(appname)-server.6.gz
+ 	cp -r ../doc/examples $(docdir)/$(appname)/examples
+ 	cp ../doc/guidelines.txt $(docdir)/$(appname)/guidelines.txt
++	ln -s $(patsubst $(DESTDIR)%,%,$(docdir))/$(appname) \
++		$(libexecdir)/$(appname)/doc
+ 
+ system-install-menus: icons
+ 	$(MKDIR) $(menudir)
+-- 
+2.1.4
+
diff --git a/debian/redeclipse.doc-base b/debian/redeclipse.doc-base
index 23c698f..0a310d6 100644
--- a/debian/redeclipse.doc-base
+++ b/debian/redeclipse.doc-base
@@ -6,4 +6,4 @@ Section: Games/Action
 
 Format: Text
 Files: /usr/share/doc/redeclipse/readme.txt.gz
-       /usr/share/doc/redeclipse/guidelines.txt.gz
+       /usr/share/doc/redeclipse/guidelines.txt
diff --git a/debian/redeclipse.docs b/debian/redeclipse.docs
index fd904e8..b2b2a78 100644
--- a/debian/redeclipse.docs
+++ b/debian/redeclipse.docs
@@ -1,2 +1 @@
 readme.txt
-doc/guidelines.txt
diff --git a/debian/redeclipse.install b/debian/redeclipse.install
index c5e248b..ca70fe7 100644
--- a/debian/redeclipse.install
+++ b/debian/redeclipse.install
@@ -1,5 +1,7 @@
 usr/games/redeclipse
 usr/lib/games/redeclipse/redeclipse
+usr/lib/games/redeclipse/doc
+usr/share/doc/redeclipse/guidelines.txt
 usr/share/appdata
 usr/share/applications
 usr/share/icons
diff --git a/debian/rules b/debian/rules
index fb3ff00..59fe5a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ override_dh_install:
 	dh_install -predeclipse-common --exclude=play.cfg
 
 override_dh_compress:
-	dh_compress --exclude=.cfg
+	dh_compress --exclude=.cfg --exclude=guidelines.txt
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz

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