[game-data-packager] 01/01: Symlink individual Quake III Arena PK3s, not their directory

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository game-data-packager.

commit fa20092137ec6842ba21db315ef06282694a2cfa
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Jan 4 22:42:08 2015 +0000

    Symlink individual Quake III Arena PK3s, not their directory
    
    Migrating /usr/share/games/quake3/baseq3 to be a symlink was a nice
    idea, but it can't work, because quake3-server installs files there.
---
 Makefile                          |  4 ----
 data/quake3-data.postinst         |  9 ---------
 data/quake3-data.postrm           |  9 ---------
 data/quake3-data.preinst          |  9 ---------
 data/quake3-data.prerm            |  9 ---------
 data/quake3.yaml                  | 20 ++++++++++++++++++--
 debian/game-data-packager.install |  4 ----
 7 files changed, 18 insertions(+), 46 deletions(-)

diff --git a/Makefile b/Makefile
index 623a98b..68cba87 100644
--- a/Makefile
+++ b/Makefile
@@ -7,10 +7,6 @@ default: $(DIRS)
 	chmod 0644 ./out/changelog.gz
 	install -m644 data/*.yaml out/
 	install -m644 data/*.copyright out/
-	install -m755 data/*.preinst out/
-	install -m755 data/*.postinst out/
-	install -m755 data/*.prerm out/
-	install -m755 data/*.postrm out/
 	set -e; for x in data/*.*.m4; do \
 		o="out/$${x#data/}"; \
 		o="$${o%.m4}"; \
diff --git a/data/quake3-data.postinst b/data/quake3-data.postinst
deleted file mode 100644
index a5bbaf4..0000000
--- a/data/quake3-data.postinst
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-dpkg-maintscript-helper dir_to_symlink \
-	/usr/share/games/quake3/baseq3 \
-	../quake3-data/baseq3 \
-	37 \
-	quake3-data \
-	-- \
-	"$@"
diff --git a/data/quake3-data.postrm b/data/quake3-data.postrm
deleted file mode 100644
index a5bbaf4..0000000
--- a/data/quake3-data.postrm
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-dpkg-maintscript-helper dir_to_symlink \
-	/usr/share/games/quake3/baseq3 \
-	../quake3-data/baseq3 \
-	37 \
-	quake3-data \
-	-- \
-	"$@"
diff --git a/data/quake3-data.preinst b/data/quake3-data.preinst
deleted file mode 100644
index a5bbaf4..0000000
--- a/data/quake3-data.preinst
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-dpkg-maintscript-helper dir_to_symlink \
-	/usr/share/games/quake3/baseq3 \
-	../quake3-data/baseq3 \
-	37 \
-	quake3-data \
-	-- \
-	"$@"
diff --git a/data/quake3-data.prerm b/data/quake3-data.prerm
deleted file mode 100644
index a5bbaf4..0000000
--- a/data/quake3-data.prerm
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-dpkg-maintscript-helper dir_to_symlink \
-	/usr/share/games/quake3/baseq3 \
-	../quake3-data/baseq3 \
-	37 \
-	quake3-data \
-	-- \
-	"$@"
diff --git a/data/quake3.yaml b/data/quake3.yaml
index 4cab2bb..0368ebc 100644
--- a/data/quake3.yaml
+++ b/data/quake3.yaml
@@ -10,8 +10,24 @@ packages:
     # missionpack, so that the engine doesn't think missionpack
     # is installed unless its pak0.pk3 is present.
     symlinks:
-      usr/share/games/quake3/baseq3:
-        usr/share/games/quake3-data/baseq3
+      usr/share/games/quake3/baseq3/pak0.pk3:
+        usr/share/games/quake3-data/baseq3/pak0.pk3
+      usr/share/games/quake3/baseq3/pak1.pk3:
+        usr/share/games/quake3-data/baseq3/pak1.pk3
+      usr/share/games/quake3/baseq3/pak2.pk3:
+        usr/share/games/quake3-data/baseq3/pak2.pk3
+      usr/share/games/quake3/baseq3/pak3.pk3:
+        usr/share/games/quake3-data/baseq3/pak3.pk3
+      usr/share/games/quake3/baseq3/pak4.pk3:
+        usr/share/games/quake3-data/baseq3/pak4.pk3
+      usr/share/games/quake3/baseq3/pak5.pk3:
+        usr/share/games/quake3-data/baseq3/pak5.pk3
+      usr/share/games/quake3/baseq3/pak6.pk3:
+        usr/share/games/quake3-data/baseq3/pak6.pk3
+      usr/share/games/quake3/baseq3/pak7.pk3:
+        usr/share/games/quake3-data/baseq3/pak7.pk3
+      usr/share/games/quake3/baseq3/pak8.pk3:
+        usr/share/games/quake3-data/baseq3/pak8.pk3
     install_to: usr/share/games/quake3-data
     install_files_from_cksums: |
       # Retail
diff --git a/debian/game-data-packager.install b/debian/game-data-packager.install
index afb02fe..e7b21d0 100644
--- a/debian/game-data-packager.install
+++ b/debian/game-data-packager.install
@@ -6,10 +6,6 @@ etc/*-mirrors                 etc/game-data-packager
 out/*.control                 usr/share/games/game-data-packager
 out/*.copyright               usr/share/games/game-data-packager
 out/*.deb                     usr/share/games/game-data-packager
-out/*.preinst                 usr/share/games/game-data-packager
-out/*.postinst                usr/share/games/game-data-packager
-out/*.prerm                   usr/share/games/game-data-packager
-out/*.postrm                  usr/share/games/game-data-packager
 out/changelog.gz              usr/share/games/game-data-packager
 out/*.yaml                    usr/share/games/game-data-packager
 out/quake/*.control           usr/share/games/game-data-packager/quake

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git