This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch debian/master in repository iortcw.
commit 6e79bd7e26b6afd707a16ec9b9cbfd14f01eaa54 Author: Simon McVittie <[email protected]> Date: Sat Oct 1 17:55:43 2016 +0100 Use upstream's copyfiles (install) target instead of reimplementing it --- debian/changelog | 1 + debian/rtcw-common.install | 2 +- debian/rtcw-server.install | 4 ++-- debian/rtcw.install | 26 ++++++++++---------------- debian/rules | 19 +++++++++++++++---- 5 files changed, 29 insertions(+), 23 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0b6df61..cde9695 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ iortcw (1.42d+dfsg1-5) UNRELEASED; urgency=medium appropriate * Always do a "release" build. Override OPTIMIZE to empty instead of using upstream's "debug" build for noopt. + * Use upstream's copyfiles (install) target instead of reimplementing it -- Simon McVittie <[email protected]> Thu, 22 Sep 2016 09:16:38 +0100 diff --git a/debian/rtcw-common.install b/debian/rtcw-common.install index 502f8df..ed00f8d 100644 --- a/debian/rtcw-common.install +++ b/debian/rtcw-common.install @@ -1,2 +1,2 @@ debian/README.rtcw-data usr/lib/rtcw -debian/build/mp/main/*.so usr/lib/rtcw/main +usr/lib/rtcw/main/*.mp.*.so diff --git a/debian/rtcw-server.install b/debian/rtcw-server.install index 1e84b89..258bf76 100644 --- a/debian/rtcw-server.install +++ b/debian/rtcw-server.install @@ -1,6 +1,6 @@ debian/apparmor.d/usr.lib.rtcw.iowolfded etc/apparmor.d -debian/build/mp/iowolfded usr/lib/rtcw -debian/build/mp/iowolfded.* usr/lib/rtcw debian/[email protected] lib/systemd/system debian/scripts/wolfded usr/games debian/server.cfg etc/rtcw-server +usr/lib/rtcw/iowolfded +usr/lib/rtcw/iowolfded.* diff --git a/debian/rtcw.install b/debian/rtcw.install index c511b51..6b69575 100644 --- a/debian/rtcw.install +++ b/debian/rtcw.install @@ -1,21 +1,15 @@ -# Single player -debian/build/sp/iowolfsp* usr/lib/rtcw -debian/build/sp/iowolfsp.* usr/lib/rtcw -debian/build/sp/main/*.so usr/lib/rtcw/main -debian/build/sp/renderer*.so usr/lib/rtcw -debian/scripts/wolfsp usr/games -debian/wolfsp.desktop usr/share/applications - -# Multiplayer client -debian/build/mp/iowolfmp* usr/lib/rtcw -debian/build/mp/iowolfmp.* usr/lib/rtcw -debian/build/mp/renderer*.so usr/lib/rtcw -debian/scripts/wolfmp usr/games -debian/wolfmp.desktop usr/share/applications - -# Shared between clients debian/*.svg usr/share/icons/hicolor/scalable/apps debian/32/*.png usr/share/icons/hicolor/32x32/apps debian/48/*.png usr/share/icons/hicolor/48x48/apps debian/apparmor.d/usr.lib.rtcw etc/apparmor.d debian/need-data.sh usr/lib/rtcw +debian/scripts/wolfmp usr/games +debian/scripts/wolfsp usr/games +debian/wolfmp.desktop usr/share/applications +debian/wolfsp.desktop usr/share/applications +usr/lib/rtcw/iowolfmp +usr/lib/rtcw/iowolfmp.* +usr/lib/rtcw/iowolfsp +usr/lib/rtcw/iowolfsp.* +usr/lib/rtcw/main/*.sp.*.so +usr/lib/rtcw/renderer*.so diff --git a/debian/rules b/debian/rules index 22a90d0..c04d6f1 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,8 @@ options := \ USE_VOIP=1 \ $(shell debian/q3arch make ${DEB_HOST_GNU_CPU} ${DEB_HOST_GNU_SYSTEM}) \ BUILD_GAME_QVM=0 \ - COPYDIR=/usr/lib/rtcw \ + COPYDIR=$(CURDIR)/debian/tmp/usr/lib/rtcw \ + NO_STRIP=1 \ OPTIMIZE='' \ VERSION=$(DEB_VERSION)/$(DEB_VENDOR) \ CFLAGS='$(filter-out -fPIE -pie,$(CFLAGS)) $(CPPFLAGS)' \ @@ -58,9 +59,19 @@ override_dh_auto_build: $(options) \ $(mp_options) \ release - cd debian/build/sp && ln -s iowolfsp.* iowolfsp - cd debian/build/mp && ln -s iowolfmp.* iowolfmp - cd debian/build/mp && ln -s iowolfded.* iowolfded + +override_dh_auto_install: + make -C SP -- \ + $(options) \ + $(sp_options) \ + copyfiles + cd debian/tmp/usr/lib/rtcw && ln -s iowolfsp.* iowolfsp + make -C MP -- \ + $(options) \ + $(mp_options) \ + copyfiles + cd debian/tmp/usr/lib/rtcw && ln -s iowolfmp.* iowolfmp + cd debian/tmp/usr/lib/rtcw && ln -s iowolfded.* iowolfded sed \ -e 's!@IOQ3BINARY@!iowolfsp!' \ -e 's!@IOQ3SELF@!wolfsp!' \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
