This is an automated email from the git hooks/post-receive script. arand-guest pushed a commit to branch debdir in repository redeclipse.
commit 83ab9698e1cec2fb7dc270d49f7c94a6e67f8f36 Author: Martin Erik Werner <[email protected]> Date: Fri Apr 3 13:06:33 2015 +0200 Add redeclipse-common package for client/server shared files --- changelog | 2 + control | 9 +++ patches/series | 1 + ...all-Add-common-install-target-for-common-.patch | 87 ++++++++++++++++++++++ redeclipse-common.install | 2 + redeclipse-server.install | 2 - rules | 7 +- 7 files changed, 107 insertions(+), 3 deletions(-) diff --git a/changelog b/changelog index ea05f91..00d7d9f 100644 --- a/changelog +++ b/changelog @@ -7,6 +7,8 @@ redeclipse (1.5.0-1) UNRELEASED; urgency=medium * Add (upstream) patch to fix binary name in install - Add system-install-Fix-binary-name.patch * Bump standards-version to 3.9.6, no changes + * Add redeclipse-common package for client/server shared files + - Add system-install-Add-common-install-target-for-common-.patch -- Martin Erik Werner <[email protected]> Sun, 29 Mar 2015 16:02:22 +0200 diff --git a/control b/control index 6a348fe..3d2f850 100644 --- a/control +++ b/control @@ -59,3 +59,12 @@ Depends: redeclipse-server (= ${binary:Version}), ${misc:Depends} Description: debug symbols for the Red Eclipse dedicated server This package contains the debugging symbols for the dedicated server of the Red Eclipse FPS game. + +Package: redeclipse-common +Section: games +Priority: extra +Architecture: all +Depends: ${misc:Depends} +Description: common config files for the Red Eclipse FPS game + This package contains the common version.cfg file for the server and client of + the Red Eclipse FPS game. diff --git a/patches/series b/patches/series index d0c4877..0da3f58 100644 --- a/patches/series +++ b/patches/series @@ -1,3 +1,4 @@ windowed-by-default.patch build-with-system-enet.patch system-install-Fix-binary-name.patch +system-install-Add-common-install-target-for-common-.patch diff --git a/patches/system-install-Add-common-install-target-for-common-.patch b/patches/system-install-Add-common-install-target-for-common-.patch new file mode 100644 index 0000000..a156397 --- /dev/null +++ b/patches/system-install-Add-common-install-target-for-common-.patch @@ -0,0 +1,87 @@ +From 0e67905e42fae53e7d1f377fe8cd7e6a88f3cbb9 Mon Sep 17 00:00:00 2001 +From: Martin Erik Werner <[email protected]> +Date: Fri, 3 Apr 2015 11:23:59 +0200 +Subject: [PATCH] system-install: Add common install target for common config + +version.cfg is needed by both client and server, in order to cater to +this the simplest solution seems to be to stuff the whole config dir in +a common install target (instead of picking out the version.cfg file +specifically, and mess with exclusion when handling the config dir in +other targets). In distro packaging, this might make a separate package. +--- + src/system-install.mk | 24 +++++++++++++++--------- + 1 file changed, 15 insertions(+), 9 deletions(-) + +diff --git a/src/system-install.mk b/src/system-install.mk +index e6eae10..1f0b1cd 100644 +--- a/src/system-install.mk ++++ b/src/system-install.mk +@@ -55,6 +55,7 @@ icons: $(ICONS) + system-install-client: client + $(MKDIR) $(libexecdir)/$(appname) + $(MKDIR) $(gamesbindir) ++ $(MKDIR) $(datadir)/$(appname) + install -m755 $(appclient) $(libexecdir)/$(appname)/$(appname) + install -m755 install/nix/$(appsrcname).am \ + $(gamesbindir)/$(appname) +@@ -89,14 +90,17 @@ system-install-server: server + g,@APPNAME@,\ + s,@APPNAME@,$(appname),g\n\ + w\n" | ed -s $(gamesbindir)/$(appname)-server +- install -m644 ../config/version.cfg \ +- $(datadir)/$(appname)/version.cfg +- ln -s $(patsubst $(DESTDIR)%,%,$(datadir))/$(appname)/version.cfg \ +- $(libexecdir)/$(appname)/version.cfg ++ ++system-install-common: ++ $(MKDIR) $(libexecdir)/$(appname) ++ $(MKDIR) $(datadir)/$(appname) ++ cp -r ../config $(datadir)/$(appname)/config ++ ln -s $(patsubst $(DESTDIR)%,%,$(datadir))/$(appname)/config \ ++ $(libexecdir)/$(appname)/config + + system-install-data: ++ $(MKDIR) $(datadir)/$(appname) + cp -r ../data $(datadir)/$(appname)/data +- rm -f $(datadir)/$(appname)/data/misc/largeandincharge.png + + system-install-docs: $(MANPAGES) + $(MKDIR) $(mandir)/man6 +@@ -154,12 +158,15 @@ system-install-cube2font-docs: ../doc/man/cube2font.1 + gzip -9 -n -c < ../doc/man/cube2font.1 \ + > $(mandir)/man1/cube2font.1.gz + +-system-install: system-install-client system-install-server system-install-data system-install-docs system-install-menus ++system-install: system-install-client system-install-server system-install-common system-install-data system-install-docs system-install-menus ++ ++system-uninstall-common: ++ rm -rf $(datadir)/$(appname)/config ++ @rm -fv $(libexecdir)/$(appname)/config + + system-uninstall-client: + @rm -fv $(libexecdir)/$(appname)/$(appname) + @rm -fv $(libexecdir)/$(appname)/data +- @rm -fv $(libexecdir)/$(appname)/version.cfg + @rm -fv $(gamesbindir)/$(appname) + + system-uninstall-server: +@@ -168,7 +175,6 @@ system-uninstall-server: + + system-uninstall-data: + rm -rf $(datadir)/$(appname)/data +- rm -fv $(datadir)/$(appname)/version.cfg + + system-uninstall-docs: + @rm -rfv $(docdir)/$(appname)/examples +@@ -185,7 +191,7 @@ system-uninstall-menus: + @rm -fv $(icondir)/128x128/apps/$(appname).png + @rm -fv $(pixmapdir)/$(appname).xpm + +-system-uninstall: system-uninstall-client system-uninstall-server system-uninstall-data system-uninstall-docs system-uninstall-menus ++system-uninstall: system-uninstall-client system-uninstall-server system-uninstall-common system-uninstall-data system-uninstall-docs system-uninstall-menus + -@rmdir -v $(libexecdir)/$(appname) + -@rmdir -v $(datadir)/$(appname) + -@rmdir -v $(docdir)/$(appname) +-- +2.1.4 + diff --git a/redeclipse-common.install b/redeclipse-common.install new file mode 100644 index 0000000..a6749e8 --- /dev/null +++ b/redeclipse-common.install @@ -0,0 +1,2 @@ +usr/share/games/redeclipse/config +usr/lib/games/redeclipse/config diff --git a/redeclipse-server.install b/redeclipse-server.install index 4f6fd16..b5d06a1 100644 --- a/redeclipse-server.install +++ b/redeclipse-server.install @@ -1,5 +1,3 @@ usr/games/redeclipse-server usr/lib/games/redeclipse/redeclipse-server -usr/lib/games/redeclipse/version.cfg usr/share/doc/redeclipse/examples -usr/share/games/redeclipse/version.cfg diff --git a/rules b/rules index c113526..52af240 100755 --- a/rules +++ b/rules @@ -26,7 +26,12 @@ override_dh_auto_install: ICON="" \ prefix=/usr games=/games gamesbin=/games \ system-install-client system-install-server \ - system-install-docs system-install-menus + system-install-common system-install-docs system-install-menus + +override_dh_install: + dh_install -predeclipse + dh_install -predeclipse-server + dh_install -predeclipse-common --exclude=play.cfg override_dh_compress: dh_compress --exclude=.cfg -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/redeclipse.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
