r7765 - in packages/trunk/game-data-packager: ! dirs' list truncated !

Fri Jul 18 00:24:46 UTC 2008

Author: jmtd-guest
Date: 2008-07-18 00:24:46 +0000 (Fri, 18 Jul 2008)
New Revision: 7765

Added:
   packages/trunk/game-data-packager/doom-common/usr/share/doc/doom-wad/copyright.in
Removed:
   packages/trunk/game-data-packager/doom-wad/usr/share/doc/doom-wad/copyright
   packages/trunk/game-data-packager/doom2-wad/usr/share/doc/doom2-wad/copyright
Modified:
   packages/trunk/game-data-packager/doom-common.mk
Log:
generalize copyright

Added: packages/trunk/game-data-packager/doom-common/usr/share/doc/doom-wad/copyright.in
===================================================================

--- packages/trunk/game-data-packager/doom-common/usr/share/doc/doom-wad/copyright.in	                        (rev 0)
+++ packages/trunk/game-data-packager/doom-common/usr/share/doc/doom-wad/copyright.in	2008-07-18 00:24:46 UTC (rev 7765)
@@ -0,0 +1,23 @@
+The PACKAGE package was generated using game-data-packager.
+Copyright (C) 2008 Jon Dowland <jon at alcopop.org>.
+
+The file "/usr/share/games/doom-package/IWAD", if
+present, is a user-supplied file that is not covered by the
+copyright or licence of this package. For example, the
+original Doom data is copyright (c) 1999 by id Software,
+all rights reserved.
+
+The remainder of this package is covered by the following
+Licence:
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+On Debian GNU/Linux systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL-2.

Modified: packages/trunk/game-data-packager/doom-common.mk
===================================================================
--- packages/trunk/game-data-packager/doom-common.mk	2008-07-18 00:14:42 UTC (rev 7764)
+++ packages/trunk/game-data-packager/doom-common.mk	2008-07-18 00:24:46 UTC (rev 7765)
@@ -3,7 +3,7 @@
 
 $(IWAD)DEB=$(IWAD)-wad_$(VERSION)_all.deb
 
-$(IWAD)TARGETS := $(IWAD)-wad/DEBIAN/md5sums $(IWAD)-wad/DEBIAN/control $(IWAD)-wad/usr/share/doc/$(IWAD)-wad/changelog.gz $(IWAD)-wad/usr/share/pixmaps/$(IWAD).xpm $(IWAD)-wad/DEBIAN/postinst $(IWAD)-wad/DEBIAN/prerm $(IWAD)-wad/usr/share/applications/$(IWAD)-wad.desktop $(IWAD)-wad/usr/share/doc/$(IWAD)-wad/README.Debian
+$(IWAD)TARGETS := $(IWAD)-wad/DEBIAN/md5sums $(IWAD)-wad/DEBIAN/control $(IWAD)-wad/usr/share/doc/$(IWAD)-wad/changelog.gz $(IWAD)-wad/usr/share/pixmaps/$(IWAD).xpm $(IWAD)-wad/DEBIAN/postinst $(IWAD)-wad/DEBIAN/prerm $(IWAD)-wad/usr/share/applications/$(IWAD)-wad.desktop $(IWAD)-wad/usr/share/doc/$(IWAD)-wad/README.Debian $(IWAD)-wad/usr/share/doc/$(IWAD)-wad/copyright
 
 $($(IWAD)DEB): $($(IWAD)TARGETS) fixperms 
 	if [ `id -u` -eq 0 ]; then \
@@ -12,6 +12,11 @@
 		fakeroot dpkg-deb -b $(IWAD)-wad $@; \
 	fi
 
+$(IWAD)-wad/usr/share/doc/$(IWAD)-wad/copyright:
+	m4 -DPACKAGE=$(IWAD)-wad -DIWAD=$(IWAD).wad \
+		doom-common/usr/share/doc/doom-wad/copyright.in \
+		> $(IWAD)-wad/usr/share/doc/$(IWAD)-wad/copyright
+
 $(IWAD)-wad/usr/share/doc/$(IWAD)-wad/README.Debian:
 	m4 -DPACKAGE=$(IWAD)-wad -DGAME="$(LONG)" \
 		doom-common/usr/share/doc/doom-wad/README.Debian \

Deleted: packages/trunk/game-data-packager/doom-wad/usr/share/doc/doom-wad/copyright
===================================================================
--- packages/trunk/game-data-packager/doom-wad/usr/share/doc/doom-wad/copyright	2008-07-18 00:14:42 UTC (rev 7764)
+++ packages/trunk/game-data-packager/doom-wad/usr/share/doc/doom-wad/copyright	2008-07-18 00:24:46 UTC (rev 7765)
@@ -1,23 +0,0 @@
-The doom-wad package was generated using doom-package.
-Copyright (C) 2008 Jon Dowland <jon at alcopop.org>.
-
-The file "/usr/share/games/doom-package/doom.wad", if
-present, is a user-supplied file that is not covered by the
-copyright or licence of this package. For example, the
-original Doom data is copyright (c) 1999 by id Software,
-all rights reserved.
-
-The remainder of this package is covered by the following
-Licence:
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL-2.

Deleted: packages/trunk/game-data-packager/doom2-wad/usr/share/doc/doom2-wad/copyright
===================================================================
--- packages/trunk/game-data-packager/doom2-wad/usr/share/doc/doom2-wad/copyright	2008-07-18 00:14:42 UTC (rev 7764)
+++ packages/trunk/game-data-packager/doom2-wad/usr/share/doc/doom2-wad/copyright	2008-07-18 00:24:46 UTC (rev 7765)
@@ -1,23 +0,0 @@
-The doom2-wad package was generated using game-data-packager.
-Copyright (C) 2006 Jon Dowland <jon at alcopop.org>.
-
-The file "/usr/share/games/game-data-packager/doom2.wad", if
-present, is a user-supplied file that is not covered by the
-copyright or licence of this package. For example, the
-original Doom 2 data is copyright (c) 1999 by id Software,
-all rights reserved.
-
-The remainder of this package is covered by the following
-Licence:
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL-2.


