This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch quake
in repository game-data-packager.
commit 8228aebe1c7e1a7bf7aa8be0b97f6332121f9ba8
Author: Simon McVittie <s...@debian.org>
Date: Wed Oct 12 22:48:01 2016 +0100
Use an upstream-style "make install"
---
Makefile | 75 +++++++++++++++++++++++++++++++-----
debian/etqw-server.install | 5 ++-
debian/etqw-server.manpages | 1 -
debian/etqw.install | 13 ++++---
debian/etqw.manpages | 1 -
debian/quake-server.install | 3 +-
debian/quake-server.manpages | 1 -
debian/quake.install | 29 +++++---------
debian/quake.manpages | 1 -
debian/quake2-server.install | 3 +-
debian/quake2-server.manpages | 1 -
debian/quake2.install | 16 +++-----
debian/quake2.manpages | 1 -
debian/quake3-server.install | 5 ++-
debian/quake3-server.manpages | 1 -
debian/quake3.install | 14 +++----
debian/quake3.manpages | 1 -
debian/quake4-server.install | 5 ++-
debian/quake4-server.manpages | 1 -
debian/quake4.install | 22 +++++------
debian/quake4.manpages | 1 -
debian/rules | 20 +++++++---
runtime/quake3-team-arena.desktop.in | 2 +-
23 files changed, 130 insertions(+), 92 deletions(-)
diff --git a/Makefile b/Makefile
index f8922c0..07c24fb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,9 @@
# Makefile - used for building icon
bindir ?= /usr/bin
-assets ?= /usr/share
+libdir ?= /usr/lib
+datadir ?= /usr/share
+assets ?= $(datadir)
distro ?= $(shell lsb_release -si)
layer_sizes = 16 22 32 48 256
@@ -41,11 +43,11 @@ obj = \
build/quake2.svg \
build/quake2-reckoning.svg \
build/quake2-groundzero.svg \
- build/quake3.png \
- build/quake3-teamarena.png \
+ build/256/quake3.png \
+ build/256/quake3-team-arena.png \
build/quake4.svg \
build/48/quake3.png \
- build/48/quake3-teamarena.png \
+ build/48/quake3-team-arena.png \
$(patsubst %,build/%/quake.png,$(layer_sizes)) \
$(patsubst %,build/%/quake-armagon.png,$(layer_sizes)) \
$(patsubst %,build/%/quake-dissolution.png,$(layer_sizes)) \
@@ -387,19 +389,19 @@ build/quake2-%.svg: build/tmp/recolour-%.svg Makefile
build/tmp/quake2-$*.svg
rm -f build/tmp/quake2-$*.svg
-build/quake3.png: data/quake3-tango.xcf
- install -d build
+build/256/quake3.png: data/quake3-tango.xcf
+ install -d build/256
xcf2png -o $@ $<
-build/quake3-teamarena.png: data/quake3-teamarena-tango.xcf
- install -d build
+build/256/quake3-team-arena.png: data/quake3-teamarena-tango.xcf
+ install -d build/256
xcf2png -o $@ $<
-build/48/quake3.png: build/quake3.png Makefile
+build/48/quake3.png: build/256/quake3.png Makefile
install -d build/48
convert -resize 48x48 $< $@
-build/48/quake3-teamarena.png: build/quake3-teamarena.png Makefile
+build/48/quake3-team-arena.png: build/256/quake3-team-arena.png Makefile
install -d build/48
convert -resize 48x48 $< $@
@@ -428,3 +430,56 @@ check:
exit $$failed
.PHONY: check
+
+install:
+ install -d
$(DESTDIR)$(bindir)
+ install -m755 build/quake
$(DESTDIR)$(bindir)
+ install -m755 build/quake-server
$(DESTDIR)$(bindir)
+ install -m755 build/quake2
$(DESTDIR)$(bindir)
+ install -m755 build/quake2-server
$(DESTDIR)$(bindir)
+ install -m755 build/quake3
$(DESTDIR)$(bindir)
+ install -m755 build/quake3-server
$(DESTDIR)$(bindir)
+ install -m755 build/quake4
$(DESTDIR)$(bindir)
+ install -m755 build/quake4-dedicated
$(DESTDIR)$(bindir)
+ install -m755 build/etqw
$(DESTDIR)$(bindir)
+ install -m755 build/etqw-dedicated
$(DESTDIR)$(bindir)
+ install -d
$(DESTDIR)$(datadir)/applications
+ install -m644 $(desktop)
$(DESTDIR)$(datadir)/applications
+ install -d
$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps
+ install -m644 build/16/*.png
$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps
+ install -d
$(DESTDIR)$(datadir)/icons/hicolor/22x22/apps
+ install -m644 build/22/*.png
$(DESTDIR)$(datadir)/icons/hicolor/22x22/apps
+ install -d
$(DESTDIR)$(datadir)/icons/hicolor/24x24/apps
+ install -m644 build/24/*.png
$(DESTDIR)$(datadir)/icons/hicolor/24x24/apps
+ install -d
$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps
+ install -m644 build/32/*.png
$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps
+ install -d
$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps
+ install -m644 build/48/*.png
$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps
+ install -d
$(DESTDIR)$(datadir)/icons/hicolor/256x256/apps
+ install -m644 build/256/*.png
$(DESTDIR)$(datadir)/icons/hicolor/256x256/apps
+ install -d
$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps
+ install -m644 build/quake*.svg
$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps
+ install -m644 build/quake-*.svg
$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps
+ install -m644 build/quake2*.svg
$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps
+ install -m644 build/quake4*.svg
$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps
+ install -d
$(DESTDIR)$(datadir)/man/man6
+ install -m644 doc/*.6
$(DESTDIR)$(datadir)/man/man6
+ install -d
$(DESTDIR)$(assets)/quake
+ install -m755 runtime/need-data.sh
$(DESTDIR)$(assets)/quake
+ install -d
$(DESTDIR)$(assets)/quake2
+ install -m755 runtime/need-data.sh
$(DESTDIR)$(assets)/quake2
+ install -d
$(DESTDIR)$(assets)/quake3
+ install -m644 runtime/README.quake3-data
$(DESTDIR)$(assets)/quake3
+ install -m755 runtime/need-data.sh
$(DESTDIR)$(assets)/quake3
+ install -d
$(DESTDIR)$(libdir)/quake4
+ install -m644 build/README.quake4-bin
$(DESTDIR)$(libdir)/quake4
+ install -m644 runtime/README.quake4-data
$(DESTDIR)$(libdir)/quake4
+ install -m755 runtime/confirm-binary-only.sh
$(DESTDIR)$(libdir)/quake4
+ install -m755 runtime/need-data.sh
$(DESTDIR)$(libdir)/quake4
+ install -d
$(DESTDIR)$(libdir)/etqw
+ install -m644 build/README.etqw-bin
$(DESTDIR)$(libdir)/etqw
+ install -m644 runtime/README.etqw-data
$(DESTDIR)$(libdir)/etqw
+ install -m755 runtime/confirm-binary-only.sh
$(DESTDIR)$(libdir)/etqw
+ install -m755 runtime/need-data.sh
$(DESTDIR)$(libdir)/etqw
+
+.PHONY: install
diff --git a/debian/etqw-server.install b/debian/etqw-server.install
index 9cca102..73d0ec5 100644
--- a/debian/etqw-server.install
+++ b/debian/etqw-server.install
@@ -1,2 +1,3 @@
-runtime/README.etqw-data usr/share/doc/etqw-server
-build/etqw-dedicated usr/games
+runtime/README.etqw-data usr/share/doc/etqw-server
+usr/games/etqw-dedicated
+usr/share/man/man6/etqw-dedicated.6
diff --git a/debian/etqw-server.manpages b/debian/etqw-server.manpages
deleted file mode 100644
index b217565..0000000
--- a/debian/etqw-server.manpages
+++ /dev/null
@@ -1 +0,0 @@
-etqw-dedicated.6
diff --git a/debian/etqw.install b/debian/etqw.install
index 5b15c57..0ce45b7 100644
--- a/debian/etqw.install
+++ b/debian/etqw.install
@@ -1,6 +1,7 @@
-runtime/README.etqw-data usr/lib/etqw
-build/README.etqw-bin usr/lib/etqw
-build/etqw usr/games
-build/etqw.desktop usr/share/applications
-runtime/confirm-binary-only.sh usr/lib/etqw
-runtime/need-data.sh usr/lib/etqw
+usr/games/etqw
+usr/lib/etqw/README.etqw-bin
+usr/lib/etqw/README.etqw-data
+usr/lib/etqw/confirm-binary-only.sh
+usr/lib/etqw/need-data.sh
+usr/share/applications/etqw.desktop
+usr/share/man/man6/etqw.6
diff --git a/debian/etqw.manpages b/debian/etqw.manpages
deleted file mode 100644
index 2db1779..0000000
--- a/debian/etqw.manpages
+++ /dev/null
@@ -1 +0,0 @@
-etqw.6
diff --git a/debian/quake-server.install b/debian/quake-server.install
index 909ef36..86ee550 100644
--- a/debian/quake-server.install
+++ b/debian/quake-server.install
@@ -1,3 +1,4 @@
-build/quake-server /usr/games
debian/quake-server@.service lib/systemd/system
debian/server.cfg /etc/quake-server
+usr/games/quake-server
+usr/share/man/man6/quake-server.6
diff --git a/debian/quake-server.manpages b/debian/quake-server.manpages
deleted file mode 100644
index f0e7d9d..0000000
--- a/debian/quake-server.manpages
+++ /dev/null
@@ -1 +0,0 @@
-doc/quake-server.6
diff --git a/debian/quake.install b/debian/quake.install
index 60b24c8..81403c2 100644
--- a/debian/quake.install
+++ b/debian/quake.install
@@ -1,20 +1,9 @@
-build/16/quake-*.png /usr/share/icons/hicolor/16x16/apps
-build/16/quake.png /usr/share/icons/hicolor/16x16/apps
-build/22/quake-*.png /usr/share/icons/hicolor/22x22/apps
-build/22/quake.png /usr/share/icons/hicolor/22x22/apps
-build/24/quake-*.png /usr/share/icons/hicolor/24x24/apps
-build/24/quake.png /usr/share/icons/hicolor/24x24/apps
-build/256/quake-*.png /usr/share/icons/hicolor/256x256/apps
-build/256/quake.png /usr/share/icons/hicolor/256x256/apps
-build/32/quake-*.png /usr/share/icons/hicolor/32x32/apps
-build/32/quake.png /usr/share/icons/hicolor/32x32/apps
-build/48/quake-*.png /usr/share/icons/hicolor/48x48/apps
-build/48/quake.png /usr/share/icons/hicolor/48x48/apps
-build/quake /usr/games
-build/quake-*.svg /usr/share/icons/hicolor/scalable/apps
-build/quake-armagon.desktop /usr/share/applications
-build/quake-dissolution.desktop /usr/share/applications
-build/quake-dopa.desktop /usr/share/applications
-build/quake.desktop /usr/share/applications
-build/quake.svg /usr/share/icons/hicolor/scalable/apps
-runtime/need-data.sh /usr/share/games/quake
+usr/games/quake
+usr/share/applications/quake-*.desktop
+usr/share/applications/quake.desktop
+usr/share/games/quake/need-data.sh
+usr/share/icons/hicolor/*/apps/quake-*.png
+usr/share/icons/hicolor/*/apps/quake-*.svg
+usr/share/icons/hicolor/*/apps/quake.png
+usr/share/icons/hicolor/*/apps/quake.svg
+usr/share/man/man6/quake.6
diff --git a/debian/quake.manpages b/debian/quake.manpages
deleted file mode 100644
index 9149782..0000000
--- a/debian/quake.manpages
+++ /dev/null
@@ -1 +0,0 @@
-doc/quake.6
diff --git a/debian/quake2-server.install b/debian/quake2-server.install
index 7ea70ef..50a1614 100644
--- a/debian/quake2-server.install
+++ b/debian/quake2-server.install
@@ -1,4 +1,5 @@
-build/quake2-server /usr/games
debian/q2/debian_server.cfg /etc/quake2-server
debian/q2/demo/debian_server.cfg /etc/quake2-server/demo
debian/quake2-server@.service lib/systemd/system
+usr/games/quake2-server
+usr/share/man/man6/quake2-server.6
diff --git a/debian/quake2-server.manpages b/debian/quake2-server.manpages
deleted file mode 100644
index 68b3d73..0000000
--- a/debian/quake2-server.manpages
+++ /dev/null
@@ -1 +0,0 @@
-doc/quake2-server.6
diff --git a/debian/quake2.install b/debian/quake2.install
index 22e0007..14bd882 100644
--- a/debian/quake2.install
+++ b/debian/quake2.install
@@ -1,10 +1,6 @@
-build/16/quake2*.png usr/share/icons/hicolor/16x16/apps
-build/22/quake2*.png usr/share/icons/hicolor/22x22/apps
-build/24/quake2*.png usr/share/icons/hicolor/24x24/apps
-build/256/quake2*.png usr/share/icons/hicolor/256x256/apps
-build/32/quake2*.png usr/share/icons/hicolor/32x32/apps
-build/48/quake2*.png usr/share/icons/hicolor/48x48/apps
-build/quake2 usr/games
-build/quake2*.desktop usr/share/applications
-build/quake2*.svg usr/share/icons/hicolor/scalable/apps
-runtime/need-data.sh usr/share/games/quake2
+usr/games/quake2
+usr/share/applications/quake2*.desktop
+usr/share/games/quake2/need-data.sh
+usr/share/icons/hicolor/*/apps/quake2*.png
+usr/share/icons/hicolor/*/apps/quake2*.svg
+usr/share/man/man6/quake2.6
diff --git a/debian/quake2.manpages b/debian/quake2.manpages
deleted file mode 100644
index 27b4eb8..0000000
--- a/debian/quake2.manpages
+++ /dev/null
@@ -1 +0,0 @@
-doc/quake2.6
diff --git a/debian/quake3-server.install b/debian/quake3-server.install
index 6d0a7c2..03702e7 100644
--- a/debian/quake3-server.install
+++ b/debian/quake3-server.install
@@ -1,4 +1,5 @@
-runtime/README.quake3-data usr/share/doc/quake3-server
-build/quake3-server usr/games
debian/q3/server.cfg etc/quake3-server
debian/quake3-server@.service lib/systemd/system
+runtime/README.quake3-data usr/share/doc/quake3-server
+usr/games/quake3-server
+usr/share/man/man6/quake3-server.6
diff --git a/debian/quake3-server.manpages b/debian/quake3-server.manpages
deleted file mode 100644
index 4151fd6..0000000
--- a/debian/quake3-server.manpages
+++ /dev/null
@@ -1 +0,0 @@
-doc/quake3-server.6
diff --git a/debian/quake3.install b/debian/quake3.install
index dca91fd..db6c1cb 100644
--- a/debian/quake3.install
+++ b/debian/quake3.install
@@ -1,8 +1,6 @@
-runtime/README.quake3-data usr/share/games/quake3
-build/48/quake3-teamarena.png usr/share/icons/hicolor/48x48/apps
-build/48/quake3.png usr/share/icons/hicolor/48x48/apps
-build/quake3 usr/games
-build/quake3*.desktop usr/share/applications
-build/quake3-teamarena.png usr/share/icons/hicolor/256x256/apps
-build/quake3.png usr/share/icons/hicolor/256x256/apps
-runtime/need-data.sh usr/share/games/quake3
+usr/share/games/quake3/README.quake3-data
+usr/games/quake3
+usr/share/applications/quake3*.desktop
+usr/share/games/quake3/need-data.sh
+usr/share/icons/hicolor/*/apps/quake3*.png
+usr/share/man/man6/quake3.6
diff --git a/debian/quake3.manpages b/debian/quake3.manpages
deleted file mode 100644
index 19fdbab..0000000
--- a/debian/quake3.manpages
+++ /dev/null
@@ -1 +0,0 @@
-doc/quake3.6
diff --git a/debian/quake4-server.install b/debian/quake4-server.install
index 400a09c..b1b5bec 100644
--- a/debian/quake4-server.install
+++ b/debian/quake4-server.install
@@ -1,4 +1,5 @@
-runtime/README.quake4-data usr/share/doc/quake4-server
-build/quake4-dedicated usr/games
debian/apparmor.d/usr.lib.quake4.q4ded.x86 etc/apparmor.d
debian/q4/server.cfg etc/quake4-server
+runtime/README.quake4-data usr/share/doc/quake3-server
+usr/games/quake4-dedicated
+usr/share/man/man6/quake4-dedicated.6
diff --git a/debian/quake4-server.manpages b/debian/quake4-server.manpages
deleted file mode 100644
index bc5646d..0000000
--- a/debian/quake4-server.manpages
+++ /dev/null
@@ -1 +0,0 @@
-doc/quake4-dedicated.6
diff --git a/debian/quake4.install b/debian/quake4.install
index 4a5ee27..f06c4e3 100644
--- a/debian/quake4.install
+++ b/debian/quake4.install
@@ -1,14 +1,10 @@
-runtime/README.quake4-data usr/lib/quake4
-build/16/quake4*.png usr/share/icons/hicolor/16x16/apps
-build/22/quake4*.png usr/share/icons/hicolor/22x22/apps
-build/24/quake4*.png usr/share/icons/hicolor/24x24/apps
-build/256/quake4*.png usr/share/icons/hicolor/256x256/apps
-build/32/quake4*.png usr/share/icons/hicolor/32x32/apps
-build/48/quake4*.png usr/share/icons/hicolor/48x48/apps
-build/README.quake4-bin usr/lib/quake4
-build/quake4 usr/games
-build/quake4*.svg usr/share/icons/hicolor/scalable/apps
-build/quake4.desktop usr/share/applications
-runtime/confirm-binary-only.sh usr/lib/quake4
debian/apparmor.d/usr.lib.quake4.quake4.x86 etc/apparmor.d
-runtime/need-data.sh usr/lib/quake4
+usr/games/quake4
+usr/lib/quake4/README.quake4-bin
+usr/lib/quake4/README.quake4-data
+usr/lib/quake4/confirm-binary-only.sh
+usr/lib/quake4/need-data.sh
+usr/share/applications/quake4.desktop
+usr/share/icons/hicolor/*/apps/quake4*.png
+usr/share/icons/hicolor/*/apps/quake4*.svg
+usr/share/man/man6/quake4.6
diff --git a/debian/quake4.manpages b/debian/quake4.manpages
deleted file mode 100644
index bd921e0..0000000
--- a/debian/quake4.manpages
+++ /dev/null
@@ -1 +0,0 @@
-doc/quake4.6
diff --git a/debian/rules b/debian/rules
index 7ef7209..3cbed82 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,25 @@
#!/usr/bin/make -f
+options := \
+ distro=$(shell dpkg-vendor --query Vendor) \
+ assets=/usr/share/games \
+ bindir=/usr/games \
+ $(NULL)
+
%:
dh $@ --parallel --with=systemd
override_dh_auto_build:
- dh_auto_build -- \
- distro=$(shell dpkg-vendor --query Vendor) \
- assets=/usr/share/games \
- bindir=/usr/games \
- $(NULL)
+ dh_auto_build -- $(options)
+
+override_dh_auto_install:
+ dh_auto_install -- $(options)
+
+override_dh_install-indep:
+ dh_install -i --fail-missing
override_dh_install-arch:
- dh_install -a
+ dh_install -a --fail-missing
dh_apparmor -pquake4 --profile-name=usr.lib.quake4.quake4.x86
dh_apparmor -pquake4-server --profile-name=usr.lib.quake4.q4ded.x86
diff --git a/runtime/quake3-team-arena.desktop.in
b/runtime/quake3-team-arena.desktop.in
index e4a67a2..d131b78 100644
--- a/runtime/quake3-team-arena.desktop.in
+++ b/runtime/quake3-team-arena.desktop.in
@@ -3,7 +3,7 @@ Version=1.0
Name=Quake 3 Team Arena
TryExec=${assets}/quake3-team-arena-data/quake3-team-arena
Exec=${assets}/quake3-team-arena-data/quake3-team-arena --quiet
-Icon=quake3-teamarena
+Icon=quake3-team-arena
Comment=Expansion pack for Quake III Arena
Terminal=false
Type=Application
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/game-data-packager.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
