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 f55c3f4e16f7b8a4d5a1b3390872634491774e43
Author: Simon McVittie <s...@debian.org>
Date:   Fri Sep 30 11:36:18 2016 +0100

    Substitute ${assets}, ${bindir} into desktop.in files like 
game-data-packager does, in preparation for folding these binary packages into 
src:game-data-packager
---
 Makefile                                           | 23 +++++++++++++++++++++-
 debian/changelog                                   |  8 ++++++++
 debian/etqw.install                                |  2 +-
 debian/quake.install                               | 10 ++++------
 debian/quake2.install                              |  2 +-
 debian/quake3.install                              |  2 +-
 debian/quake4.install                              |  2 +-
 debian/rules                                       |  6 +++++-
 etqw.desktop => runtime/etqw.desktop.in            |  2 +-
 .../quake-armagon.desktop.in                       |  4 ++--
 .../quake-dissolution.desktop.in                   |  4 ++--
 .../quake-dopa.desktop.in                          |  4 ++--
 quake.desktop => runtime/quake.desktop.in          |  2 +-
 .../quake2-groundzero.desktop.in                   |  4 ++--
 .../quake2-reckoning.desktop.in                    |  4 ++--
 quake2.desktop => runtime/quake2.desktop.in        |  2 +-
 .../quake3-team-arena.desktop.in                   |  4 ++--
 quake3.desktop => runtime/quake3.desktop.in        |  2 +-
 quake4.desktop => runtime/quake4.desktop.in        |  2 +-
 19 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/Makefile b/Makefile
index 8be009a..81bdb4c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 # Makefile - used for building icon
 
+bindir ?= /usr/bin
+assets ?= /usr/share
 distro ?= $(shell lsb_release -si)
 
 layer_sizes = 16 22 32 48 256
@@ -19,7 +21,12 @@ text = \
        build/README.quake4-bin \
        $(NULL)
 
+desktop = \
+       $(patsubst runtime/%.in,build/%,$(wildcard runtime/*.desktop.in)) \
+       $(NULL)
+
 obj = \
+       $(desktop) \
        $(text) \
        build/24/quake.png \
        build/24/quake-armagon.png \
@@ -396,6 +403,13 @@ build/48/quake3-teamarena.png: build/quake3-teamarena.png 
Makefile
        install -d build/48
        convert -resize 48x48 $< $@
 
+$(desktop): build/%: runtime/%.in
+       install -d build
+       sed \
+               -e 's#[$$]{assets}#${assets}#g' \
+               -e 's#[$$]{bindir}#${bindir}#g' \
+               < $< > $@
+
 check:
        set -e; \
        failed=0; \
@@ -404,6 +418,13 @@ check:
                        echo "^ probably a missing substitution?"; \
                        failed=1; \
                fi; \
-       done; exit $$failed
+       done; \
+       for x in $(desktop); do \
+               if grep -E "[$$][{a-z]" $$x; then \
+                       echo "^ probably a missing substitution?"; \
+                       failed=1; \
+               fi; \
+       done; \
+       exit $$failed
 
 .PHONY: check
diff --git a/debian/changelog b/debian/changelog
index f61cad6..3b8d887 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+quake (19) UNRELEASED; urgency=medium
+
+  * Substitute ${assets}, ${bindir} into desktop.in files like
+    game-data-packager does, in preparation for folding these binary
+    packages into src:game-data-packager
+
+ -- Simon McVittie <s...@debian.org>  Fri, 30 Sep 2016 11:35:44 +0100
+
 quake (18) unstable; urgency=medium
 
   * quake4 AppArmor: allow additional video device enumeration
diff --git a/debian/etqw.install b/debian/etqw.install
index efa4a0e..3af5277 100644
--- a/debian/etqw.install
+++ b/debian/etqw.install
@@ -1,6 +1,6 @@
 README.etqw-data                        usr/lib/etqw
 build/README.etqw-bin                   usr/lib/etqw
 build/etqw                              usr/games
+build/etqw.desktop                      usr/share/applications
 confirm-binary-only.sh                  usr/lib/etqw
-etqw.desktop                            usr/share/applications
 need-data.sh                            usr/lib/etqw
diff --git a/debian/quake.install b/debian/quake.install
index 5d0a2e0..ecaac3d 100644
--- a/debian/quake.install
+++ b/debian/quake.install
@@ -5,8 +5,6 @@ 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/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
@@ -14,9 +12,9 @@ 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
 need-data.sh         /usr/share/games/quake
-quake-armagon.desktop /usr/share/applications
-quake-dissolution.desktop /usr/share/applications
-quake-dopa.desktop   /usr/share/applications
-quake.desktop        /usr/share/applications
diff --git a/debian/quake2.install b/debian/quake2.install
index 2861ec1..4fd38c0 100644
--- a/debian/quake2.install
+++ b/debian/quake2.install
@@ -5,6 +5,6 @@ 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
 need-data.sh                            usr/share/games/quake2
-quake2*.desktop                         usr/share/applications
diff --git a/debian/quake3.install b/debian/quake3.install
index 33f0b1e..96d9e57 100644
--- a/debian/quake3.install
+++ b/debian/quake3.install
@@ -2,7 +2,7 @@ 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
 need-data.sh                            usr/share/games/quake3
-quake3*.desktop                         usr/share/applications
diff --git a/debian/quake4.install b/debian/quake4.install
index f999b73..ff99574 100644
--- a/debian/quake4.install
+++ b/debian/quake4.install
@@ -8,7 +8,7 @@ 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
 confirm-binary-only.sh                  usr/lib/quake4
 debian/apparmor.d/usr.lib.quake4.quake4.x86 etc/apparmor.d
 need-data.sh                            usr/lib/quake4
-quake4.desktop                          usr/share/applications
diff --git a/debian/rules b/debian/rules
index 6066f55..7ef7209 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,11 @@
        dh $@ --parallel --with=systemd
 
 override_dh_auto_build:
-       dh_auto_build -- distro=$(shell dpkg-vendor --query Vendor)
+       dh_auto_build -- \
+               distro=$(shell dpkg-vendor --query Vendor) \
+               assets=/usr/share/games \
+               bindir=/usr/games \
+               $(NULL)
 
 override_dh_install-arch:
        dh_install -a
diff --git a/etqw.desktop b/runtime/etqw.desktop.in
similarity index 91%
rename from etqw.desktop
rename to runtime/etqw.desktop.in
index 1cbdf83..99f7cc9 100644
--- a/etqw.desktop
+++ b/runtime/etqw.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
 Name=Enemy Territory: Quake Wars
-Exec=/usr/games/etqw
+Exec=${bindir}/etqw
 Icon=etqw
 Terminal=false
 Type=Application
diff --git a/quake-armagon.desktop b/runtime/quake-armagon.desktop.in
similarity index 73%
rename from quake-armagon.desktop
rename to runtime/quake-armagon.desktop.in
index 4e2d7ee..016c5eb 100644
--- a/quake-armagon.desktop
+++ b/runtime/quake-armagon.desktop.in
@@ -4,7 +4,7 @@ Version=1.0
 Name=Quake 1: Scourge of Armagon
 Comment=Mission Pack 1 for the classic first person shooter
 Icon=quake-armagon
-TryExec=/usr/share/games/quake/hipnotic-tryexec.sh
-Exec=/usr/share/games/quake/quake-armagon
+TryExec=${assets}/quake/hipnotic-tryexec.sh
+Exec=${assets}/quake/quake-armagon
 Categories=Game;ActionGame;
 Keywords=first person shooter;fps;3d;deathmatch;hipnotic;mission pack 1;
diff --git a/quake-dissolution.desktop b/runtime/quake-dissolution.desktop.in
similarity index 73%
rename from quake-dissolution.desktop
rename to runtime/quake-dissolution.desktop.in
index fcc3a5d..63c92ac 100644
--- a/quake-dissolution.desktop
+++ b/runtime/quake-dissolution.desktop.in
@@ -4,7 +4,7 @@ Version=1.0
 Name=Quake 1: Dissolution of Eternity
 Comment=Mission Pack 2 for the classic first person shooter
 Icon=quake-dissolution
-TryExec=/usr/share/games/quake/rogue-tryexec.sh
-Exec=/usr/share/games/quake/quake-dissolution
+TryExec=${assets}/quake/rogue-tryexec.sh
+Exec=${assets}/quake/quake-dissolution
 Categories=Game;ActionGame;
 Keywords=first person shooter;fps;3d;deathmatch;rogue;mission pack 2;
diff --git a/quake-dopa.desktop b/runtime/quake-dopa.desktop.in
similarity index 78%
rename from quake-dopa.desktop
rename to runtime/quake-dopa.desktop.in
index 1a89b4c..9eee7ec 100644
--- a/quake-dopa.desktop
+++ b/runtime/quake-dopa.desktop.in
@@ -4,7 +4,7 @@ Version=1.0
 Name=Quake 1 Ep5: Dimensions of the Past
 Comment=Episode 5, released to mark the 20th anniversary of the classic first 
person shooter
 Icon=quake
-TryExec=/usr/share/games/quake/dopa/tryexec
-Exec=/usr/share/games/quake/quake-dopa
+TryExec=${assets}/quake/dopa/tryexec
+Exec=${assets}/quake/quake-dopa
 Categories=Game;ActionGame;
 Keywords=first person shooter;fps;3d;deathmatch;machinegames;machine 
games;episode 5;
diff --git a/quake.desktop b/runtime/quake.desktop.in
similarity index 89%
rename from quake.desktop
rename to runtime/quake.desktop.in
index 2b8a533..84b4b3c 100644
--- a/quake.desktop
+++ b/runtime/quake.desktop.in
@@ -4,6 +4,6 @@ Version=1.0
 Name=Quake
 Comment=Classic first person shooter
 Icon=quake
-Exec=/usr/games/quake
+Exec=${bindir}/quake
 Categories=Game;ActionGame;
 Keywords=first person shooter;fps;3d;deathmatch;quake 1;
diff --git a/quake2-groundzero.desktop b/runtime/quake2-groundzero.desktop.in
similarity index 74%
rename from quake2-groundzero.desktop
rename to runtime/quake2-groundzero.desktop.in
index 2d1b55f..7e75ef5 100644
--- a/quake2-groundzero.desktop
+++ b/runtime/quake2-groundzero.desktop.in
@@ -4,7 +4,7 @@ Version=1.0
 Name=Quake 2 MP2: Ground Zero
 Comment=Mission Pack 2 for the classic first person shooter
 Icon=quake2-groundzero
-TryExec=/usr/share/games/quake2/quake2-groundzero
-Exec=/usr/share/games/quake2/quake2-groundzero
+TryExec=${assets}/quake2/quake2-groundzero
+Exec=${assets}/quake2/quake2-groundzero
 Categories=Game;ActionGame;
 Keywords=first person shooter;fps;3d;deathmatch;rogue entertainment;mission 
pack 2;quake ii;
diff --git a/quake2-reckoning.desktop b/runtime/quake2-reckoning.desktop.in
similarity index 74%
rename from quake2-reckoning.desktop
rename to runtime/quake2-reckoning.desktop.in
index 64b0691..8e9e40f 100644
--- a/quake2-reckoning.desktop
+++ b/runtime/quake2-reckoning.desktop.in
@@ -4,7 +4,7 @@ Version=1.0
 Name=Quake 2 MP1: The Reckoning
 Comment=Mission Pack 1 for the classic first person shooter
 Icon=quake2-reckoning
-TryExec=/usr/share/games/quake2/quake2-reckoning
-Exec=/usr/share/games/quake2/quake2-reckoning
+TryExec=${assets}/quake2/quake2-reckoning
+Exec=${assets}/quake2/quake2-reckoning
 Categories=Game;ActionGame;
 Keywords=first person shooter;fps;3d;deathmatch;xatrix entertainment;mission 
pack 1;quake ii;
diff --git a/quake2.desktop b/runtime/quake2.desktop.in
similarity index 89%
rename from quake2.desktop
rename to runtime/quake2.desktop.in
index c53b11a..7b7238f 100644
--- a/quake2.desktop
+++ b/runtime/quake2.desktop.in
@@ -4,6 +4,6 @@ Version=1.0
 Name=Quake 2
 Comment=Classic first person shooter
 Icon=quake2
-Exec=/usr/games/quake2
+Exec=${bindir}/quake2
 Categories=Game;ActionGame;
 Keywords=first person shooter;fps;3d;deathmatch;quake ii;
diff --git a/quake3-team-arena.desktop b/runtime/quake3-team-arena.desktop.in
similarity index 66%
rename from quake3-team-arena.desktop
rename to runtime/quake3-team-arena.desktop.in
index 08aa17b..e4a67a2 100644
--- a/quake3-team-arena.desktop
+++ b/runtime/quake3-team-arena.desktop.in
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Version=1.0
 Name=Quake 3 Team Arena
-TryExec=/usr/share/games/quake3-team-arena-data/quake3-team-arena
-Exec=/usr/share/games/quake3-team-arena-data/quake3-team-arena --quiet
+TryExec=${assets}/quake3-team-arena-data/quake3-team-arena
+Exec=${assets}/quake3-team-arena-data/quake3-team-arena --quiet
 Icon=quake3-teamarena
 Comment=Expansion pack for Quake III Arena
 Terminal=false
diff --git a/quake3.desktop b/runtime/quake3.desktop.in
similarity index 91%
rename from quake3.desktop
rename to runtime/quake3.desktop.in
index a9327ee..454390b 100644
--- a/quake3.desktop
+++ b/runtime/quake3.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
 Name=Quake 3 Arena
-Exec=/usr/games/quake3
+Exec=${bindir}/quake3
 Icon=quake3
 Comment=Play the original Quake III Arena
 Terminal=false
diff --git a/quake4.desktop b/runtime/quake4.desktop.in
similarity index 86%
rename from quake4.desktop
rename to runtime/quake4.desktop.in
index 9f5080b..65d7432 100644
--- a/quake4.desktop
+++ b/runtime/quake4.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
 Name=Quake 4
-Exec=/usr/games/quake4
+Exec=${bindir}/quake4
 Icon=quake4
 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

Reply via email to