[SCM] Installer for game data files branch, quake, updated. 1f90b116ccca532acc17dd77a8261cff54f9e471

[Jon Dowland]

The following commit has been merged in the quake branch:
commit 773b2df0a8151f8715af39b874979a34b945caf1
Author: Jon Dowland <jmtd at debian.org>
Date:   Thu Apr 7 22:13:35 2011 +0100

    quake: quake-data becomes a virtual package

diff --git a/Makefile b/Makefile
index 875de01..9c4cc49 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ default: $(DIRS)
 	make -f doom-common.mk IWAD=plutonia \
 		LONG="Final Doom: The Plutonia Experiment" VERSION=$(VERSION)
 	make -f quake3.mk LONG="Quake III Arena" VERSION=$(VERSION)
-	make -f quake.mk LONG="Quake" VERSION=$(VERSION) PACKAGE=quake-data
+	make -f quake.mk LONG="Quake" VERSION=$(VERSION) PACKAGE=quake-registered
 	make -f quake.mk LONG="Quake shareware" VERSION=$(VERSION) PACKAGE=quake-shareware
 	make -f rott.mk VERSION=$(VERSION)
 	make -f doom-common.mk IWAD=heretic VERSION=$(VERSION) \
@@ -29,7 +29,7 @@ clean:
 	make -f doom-common.mk IWAD=plutonia \
 		LONG="Final Doom: The Plutonia Experiment" VERSION=$(VERSION) clean
 	make -f quake3.mk LONG="Quake III Arena" VERSION=$(VERSION) clean
-	make -f quake.mk LONG="Quake" VERSION=$(VERSION) clean PACKAGE=quake-data
+	make -f quake.mk LONG="Quake" VERSION=$(VERSION) clean PACKAGE=quake-registered
 	make -f quake.mk LONG="Quake shareware" VERSION=$(VERSION) PACKAGE=quake-shareware clean
 	make -f rott.mk VERSION=$(VERSION) clean
 	make -f doom-common.mk IWAD=heretic VERSION=$(VERSION) \
diff --git a/quake-common/DEBIAN/control.in b/quake-common/DEBIAN/control.in
index 1e898e4..cd01af1 100644
--- a/quake-common/DEBIAN/control.in
+++ b/quake-common/DEBIAN/control.in
@@ -1,4 +1,5 @@
 Package: PACKAGE
+Provides: quake-data
 Version: VERSION
 Section: non-free/games
 Priority: optional
diff --git a/quake.mk b/quake.mk
index d4064a9..a0a8cd4 100644
--- a/quake.mk
+++ b/quake.mk
@@ -37,6 +37,12 @@ $(builddir)/$(PACKAGE)/DEBIAN/control: quake-common/DEBIAN/control.in
 	install -d `dirname $@`
 	m4 -DVERSION=$(VERSION) -DPACKAGE=$(PACKAGE) -DLONG="$(LONG)" \
 	     < quake-common/DEBIAN/control.in > $@
+	if [ "$(PACKAGE)" = "quake-registered" ]; then \
+	  echo Conflicts: quake-shareware >> $@; \
+	  echo Replaces: quake-shareware >> $@; \
+	else \
+	  echo Conflicts: quake-registered >> $@; \
+	fi
 
 fixperms:
 	find $(builddir)/$(PACKAGE) -type f -print0 | xargs -0 chmod 644

-- 
Installer for game data files