[game-data-packager] 12/19: Move Quake II copyright files into data/

[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 3aed62a4156eb56e303f065d14e4b7bc6825b5b1
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Jan 13 10:12:39 2015 +0000

    Move Quake II copyright files into data/
    
    This is where the YAML wil look for them.
---
 {quake2 => data}/quake2-demo-data.copyright | 0
 {quake2 => data}/quake2-full-data.copyright | 0
 {quake2 => data}/quake2-music.copyright     | 0
 {quake2 => data}/quake2-rogue.copyright     | 0
 {quake2 => data}/quake2-xatrix.copyright    | 0
 quake2.mk                                   | 3 +--
 supported/q2rogue                           | 2 +-
 supported/q2xatrix                          | 2 +-
 supported/quake2                            | 2 +-
 9 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/quake2/quake2-demo-data.copyright b/data/quake2-demo-data.copyright
similarity index 100%
rename from quake2/quake2-demo-data.copyright
rename to data/quake2-demo-data.copyright
diff --git a/quake2/quake2-full-data.copyright b/data/quake2-full-data.copyright
similarity index 100%
rename from quake2/quake2-full-data.copyright
rename to data/quake2-full-data.copyright
diff --git a/quake2/quake2-music.copyright b/data/quake2-music.copyright
similarity index 100%
rename from quake2/quake2-music.copyright
rename to data/quake2-music.copyright
diff --git a/quake2/quake2-rogue.copyright b/data/quake2-rogue.copyright
similarity index 100%
rename from quake2/quake2-rogue.copyright
rename to data/quake2-rogue.copyright
diff --git a/quake2/quake2-xatrix.copyright b/data/quake2-xatrix.copyright
similarity index 100%
rename from quake2/quake2-xatrix.copyright
rename to data/quake2-xatrix.copyright
diff --git a/quake2.mk b/quake2.mk
index de8adbb..6cb8ce0 100644
--- a/quake2.mk
+++ b/quake2.mk
@@ -29,13 +29,12 @@ do-quake2-rogue: do-common
 
 do-common:
 	install -d ${outdir}/quake2
-	install -m644 quake2/${PACKAGE}.copyright ${outdir}/quake2/
 	m4 -DVERSION=${VERSION} < quake2/${PACKAGE}.control > ${outdir}/quake2/${PACKAGE}.control
 	chmod 0644 ${outdir}/quake2/${PACKAGE}.control
 	( \
 		md5sum ${outdir}/changelog.gz | \
 			sed 's# .*#  usr/share/doc/${PACKAGE}/changelog.gz#'; \
-		md5sum ${outdir}/quake2/${PACKAGE}.copyright | \
+		md5sum data/${PACKAGE}.copyright | \
 			sed 's# .*#  usr/share/doc/${PACKAGE}/copyright#'; \
 	) > ${outdir}/quake2/${PACKAGE}.md5sums
 	chmod 0644 ${outdir}/quake2/${PACKAGE}.md5sums
diff --git a/supported/q2rogue b/supported/q2rogue
index e19d052..3fb3670 100644
--- a/supported/q2rogue
+++ b/supported/q2rogue
@@ -52,7 +52,7 @@ go() {
   ARCH=`dpkg-architecture -qDEB_BUILD_ARCH`
   echo "Architecture: $ARCH" > "$DESTDIR/DEBIAN/control"
   cat "$DATADIR/quake2/quake2-rogue.control" >> "$DESTDIR/DEBIAN/control"
-  cp -p "$DATADIR/quake2/quake2-rogue.copyright" "$DESTDIR/usr/share/doc/quake2-rogue/copyright"
+  cp -p "$DATADIR/quake2-rogue.copyright" "$DESTDIR/usr/share/doc/quake2-rogue/copyright"
   
   if [ "" = "$OUTDIR" ]; then
       OUTFILE="$WORKDIR/out.deb"
diff --git a/supported/q2xatrix b/supported/q2xatrix
index a8ef870..a87ef06 100644
--- a/supported/q2xatrix
+++ b/supported/q2xatrix
@@ -56,7 +56,7 @@ go() {
   ARCH=`dpkg-architecture -qDEB_BUILD_ARCH`
   echo "Architecture: $ARCH" > "$DESTDIR/DEBIAN/control"
   cat "$DATADIR/quake2/quake2-xatrix.control" >> "$DESTDIR/DEBIAN/control"
-  cp -p "$DATADIR/quake2/quake2-xatrix.copyright" "$DESTDIR/usr/share/doc/quake2-xatrix/copyright"
+  cp -p "$DATADIR/quake2-xatrix.copyright" "$DESTDIR/usr/share/doc/quake2-xatrix/copyright"
   
   if [ "" = "$OUTDIR" ]; then
       OUTFILE="$WORKDIR/out.deb"
diff --git a/supported/quake2 b/supported/quake2
index d7d0d8c..d5b1f94 100644
--- a/supported/quake2
+++ b/supported/quake2
@@ -456,7 +456,7 @@ go () {
 
     copyin "$DATADIR/changelog.gz" \
         "$DESTDIR/usr/share/doc/$deb/changelog.gz"
-    copyin "$DATADIR/quake2/${deb}.copyright" \
+    copyin "$DATADIR/${deb}.copyright" \
         "$DESTDIR/usr/share/doc/${deb}/copyright"
 
     copyin "$DATADIR/quake2/${deb}.control" \

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