[game-data-packager] 11/12: quake: move control.in, copyright files to locations used by Python code

[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 05cab0aaf2799e77084662234f891d3c9fe213c8
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Jan 13 22:24:08 2015 +0000

    quake: move control.in, copyright files to locations used by Python code
---
 .../quake-armagon-music.control.in                                  | 0
 .../quake-dissolution-music.control.in                              | 0
 quake/quake-music.control => data/quake-music.control.in            | 0
 {quake => data}/quake-music.copyright                               | 0
 quake.mk                                                            | 6 +++---
 supported/quake                                                     | 2 +-
 6 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/quake/quake-armagon-music.control b/data/quake-armagon-music.control.in
similarity index 100%
rename from quake/quake-armagon-music.control
rename to data/quake-armagon-music.control.in
diff --git a/quake/quake-dissolution-music.control b/data/quake-dissolution-music.control.in
similarity index 100%
rename from quake/quake-dissolution-music.control
rename to data/quake-dissolution-music.control.in
diff --git a/quake/quake-music.control b/data/quake-music.control.in
similarity index 100%
rename from quake/quake-music.control
rename to data/quake-music.control.in
diff --git a/quake/quake-music.copyright b/data/quake-music.copyright
similarity index 100%
rename from quake/quake-music.copyright
rename to data/quake-music.copyright
diff --git a/quake.mk b/quake.mk
index 391f0c7..22b81eb 100644
--- a/quake.mk
+++ b/quake.mk
@@ -11,18 +11,18 @@ ifeq ($(filter-out quake-music quake-%-music,$(PACKAGE)),)
 all: do-$(PACKAGE)
 
 do-${PACKAGE}: do-common
-	install -m644 quake/quake-music.copyright ${outdir}/quake/${PACKAGE}.copyright
+	install -m644 data/quake-music.copyright ${outdir}/${PACKAGE}.copyright
 	( \
 		md5sum ${outdir}/changelog.gz | \
 			sed 's# .*#  usr/share/doc/${PACKAGE}/changelog.gz#'; \
-		md5sum ${outdir}/quake/${PACKAGE}.copyright | \
+		md5sum ${outdir}/${PACKAGE}.copyright | \
 			sed 's# .*#  usr/share/doc/${PACKAGE}/copyright#'; \
 	) > ${outdir}/quake/${PACKAGE}.md5sums
 	chmod 0644 ${outdir}/quake/${PACKAGE}.md5sums
 
 do-common:
 	install -d ${outdir}/quake
-	m4 -DVERSION=${VERSION} < quake/${PACKAGE}.control > ${outdir}/quake/${PACKAGE}.control
+	m4 -DVERSION=${VERSION} < data/${PACKAGE}.control.in > ${outdir}/quake/${PACKAGE}.control
 	chmod 0644 ${outdir}/quake/${PACKAGE}.control
 
 clean:
diff --git a/supported/quake b/supported/quake
index 72172bd..5f8ce35 100644
--- a/supported/quake
+++ b/supported/quake
@@ -474,7 +474,7 @@ music_method () {
 
     copyin "$DATADIR/changelog.gz" \
         "$DESTDIR/usr/share/doc/${deb}/changelog.gz"
-    copyin "$DATADIR/quake/${deb}.copyright" \
+    copyin "$DATADIR/${deb}.copyright" \
         "$DESTDIR/usr/share/doc/${deb}/copyright"
 
     copyin "$DATADIR/quake/${deb}.control" \

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