r3160 - packages/trunk/prboom/debian

[Jon Dowland]

Author: jmtd-guest
Date: 2007-06-30 18:19:41 +0000 (Sat, 30 Jun 2007)
New Revision: 3160

Modified:
   packages/trunk/prboom/debian/changelog
   packages/trunk/prboom/debian/copyright
   packages/trunk/prboom/debian/fix_upstream.sh
Log:
tidy up the copyright file and clarify the copyright of fix_upstream.sh


Modified: packages/trunk/prboom/debian/changelog
===================================================================
--- packages/trunk/prboom/debian/changelog	2007-06-30 17:51:27 UTC (rev 3159)
+++ packages/trunk/prboom/debian/changelog	2007-06-30 18:19:41 UTC (rev 3160)
@@ -5,8 +5,9 @@
     scripts helps you to convert an upstream tarball into a DFSG
     one.
   * add a description of how the package is maintained to README.Debian
+  * default to windowed-mode rather than fullscreen
 
- -- Jon Dowland <jon at alcopop.org>  Sat, 30 Jun 2007 17:51:48 +0100
+ -- Jon Dowland <jon at alcopop.org>  Sat, 30 Jun 2007 18:56:27 +0100
 
 prboom (2:2.4.6+dfsg-1) unstable; urgency=high
 

Modified: packages/trunk/prboom/debian/copyright
===================================================================
--- packages/trunk/prboom/debian/copyright	2007-06-30 17:51:27 UTC (rev 3159)
+++ packages/trunk/prboom/debian/copyright	2007-06-30 18:19:41 UTC (rev 3160)
@@ -17,28 +17,22 @@
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License with
-the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
-if not, write to
- Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- MA 02110-1301, USA.
-
 On Debian systems, the complete text of the GNU General Public
 License, version 2, can be found in /usr/share/common-licenses/GPL-2.
 
-Upstream Authors:
+Upstream Authors include:
 Colin Robert Phipps <cph at users.sourceforge.net>
 Nicolas Kalkhof <Figgi at users.sourceforge.net>
 Jess Haas <jessh at users.sourceforge.net>
 Florian Schulze <proff_fs at users.sourceforge.net>
 
-prboom was debianized by Arthur Korn <arthur at korn.ch> on
-Mon, 13 Nov 2000 19:22:11 +0100, further maintenance work was done
-by Moritz Muehlenhoff <jmm at inutil.org>. All uploads after 2.2.3
-have been kindly reviewed and sponsored by Emanuele Rocca
-<ema at debian.org>.
+prboom was debianized by Arthur Korn <arthur at korn.ch> on Mon, 13 Nov 2000
+19:22:11 +0100. Maintenance from 2.2.3 to 2.2.6 was by Moritz Muehlenhoff
+<jmm at inutil.org>, with review and sponsorship by Emanuele Rocca
+<ema at debian.org>. Maintenance from 2.4.5 to present by Jon Dowland
+<jon at alcopop.org> and the Debian Games Team.
 
-prboom was downloaded from http://prboom.sourceforge.net/linux.html
+prboom was downloaded from <http://prboom.sourceforge.net/linux.html>
 
 The version of prboom distributed in Debian differs from upstream in the
 following ways:
@@ -52,3 +46,6 @@
       are derived from menu graphics taken from Doom or Doom 2, both
       (c) ID Software and all rights reserved. The list of lumps
       replaced can be found in the file bad_menu_lumps.txt.
+
+An upstream tarball can be modified with these changes using the script
+"fix_upstream.sh" in the ./debian directory in the source package.

Modified: packages/trunk/prboom/debian/fix_upstream.sh
===================================================================
--- packages/trunk/prboom/debian/fix_upstream.sh	2007-06-30 17:51:27 UTC (rev 3159)
+++ packages/trunk/prboom/debian/fix_upstream.sh	2007-06-30 18:19:41 UTC (rev 3160)
@@ -1,4 +1,22 @@
 #!/bin/sh
+
+# fix_upstream.sh: make a prboom upstream tarball DFSG-compliant
+# Copyright (C) 2007 Jon Dowland <jon at alcopop.org>
+
+# 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; either version 2 of the License, or
+# (at your option) any later version.
+
+# 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.
+
+# the GNU General Public Licence can be found in
+# /usr/share/common-licences/GPL-2 on Debian systems.
+
+
 set -u
 set -e