This is an automated email from the git hooks/post-receive script. arand-guest pushed a commit to branch master in repository redeclipse.
commit 123fa45e1f7ddba1459c6baf4de15d997193729e Author: Martin Erik Werner <martinerikwer...@gmail.com> Date: Thu Apr 23 12:42:21 2015 +0200 Add the patch which was supposed to be added in the last commit --- ...tall-Move-guidelines.txt-to-common-target.patch | 78 ++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/debian/patches/system-install-Move-guidelines.txt-to-common-target.patch b/debian/patches/system-install-Move-guidelines.txt-to-common-target.patch new file mode 100644 index 0000000..91a1c8c --- /dev/null +++ b/debian/patches/system-install-Move-guidelines.txt-to-common-target.patch @@ -0,0 +1,78 @@ +From 96ea04d527d40dd67f8894a9e86e7ffbec22adab Mon Sep 17 00:00:00 2001 +From: Martin Erik Werner <martinerikwer...@gmail.com> +Date: Wed, 22 Apr 2015 15:52:25 +0200 +Subject: [PATCH] system-install: Move guidelines.txt to common target + +According to Debian policy +https://www.debian.org/doc/debian-policy/ch-docs.html#fr115 + + Packages must not require the existence of any files in /usr/share/doc/ + in order to function. Any files that are referenced by programs but are + also useful as stand alone documentation should be installed under + /usr/share/package/ with symbolic links from /usr/share/doc/package. + +Currently we kind-of violate this, and since Debian/Ubuntu is a main +packageing target, let's not: + +Move the installation of guidelines.txt into the system-install-common +target where guidelines.txt is now installed into +$(datadir)/$(appname)/doc and two symlinks point towards this location. +This allows keeping guidelines.txt available for both client (to display +in GUI) and server (to be read by admin in plaintext), whilst not +duplicating the file. +--- + src/system-install.mk | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/src/system-install.mk b/src/system-install.mk +index 27fc5c1..d9ec838 100644 +--- a/src/system-install.mk ++++ b/src/system-install.mk +@@ -93,9 +93,16 @@ system-install-server: server + system-install-common: + $(MKDIR) $(libexecdir)/$(appname) + $(MKDIR) $(datadir)/$(appname) ++ $(MKDIR) $(datadir)/$(appname)/doc ++ $(MKDIR) $(docdir)/$(appname) + cp -r ../config $(datadir)/$(appname)/config + ln -s $(patsubst $(DESTDIR)%,%,$(datadir))/$(appname)/config \ + $(libexecdir)/$(appname)/config ++ install -m644 ../doc/guidelines.txt $(datadir)/$(appname)/doc ++ ln -s $(patsubst $(DESTDIR)%,%,$(datadir))/$(appname)/doc \ ++ $(libexecdir)/$(appname)/doc ++ ln -s $(patsubst $(DESTDIR)%,%,$(datadir))/$(appname)/doc/guidelines.txt \ ++ $(docdir)/$(appname)/guidelines.txt + + system-install-data: + $(MKDIR) $(datadir)/$(appname) +@@ -122,9 +129,6 @@ system-install-docs: $(MANPAGES) + ../doc/man/$(appsrcname)-server.6.am | \ + 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) +@@ -174,6 +178,9 @@ system-install: system-install-client system-install-server system-install-commo + system-uninstall-common: + rm -rf $(datadir)/$(appname)/config + @rm -fv $(libexecdir)/$(appname)/config ++ rm -rf $(datadir)/$(appname)/doc ++ @rm -fv $(libexecdir)/$(appname)/doc ++ @rm -fv $(docdir)/$(appname)/guidelines.txt + + system-uninstall-client: + @rm -fv $(libexecdir)/$(appname)/$(appname) +@@ -189,7 +196,6 @@ system-uninstall-data: + + system-uninstall-docs: + @rm -rfv $(docdir)/$(appname)/examples +- @rm -fv $(docdir)/$(appname)/guidelines.txt + @rm -fv $(mandir)/man6/$(appname).6.gz + @rm -fv $(mandir)/man6/$(appname)-server.6.gz + +-- +2.1.4 + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/redeclipse.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits