Author: ceros-guest
Date: 2008-04-21 02:07:02 +0000 (Mon, 21 Apr 2008)
New Revision: 6684

Modified:
   packages/trunk/warsow-data/debian/changelog
   packages/trunk/warsow-data/debian/copyright
   packages/trunk/warsow-data/debian/warsow-data-get-orig-source
   packages/trunk/warsow-data/debian/watch
Log:
Preparing new warsow-data package.

Modified: packages/trunk/warsow-data/debian/changelog
===================================================================
--- packages/trunk/warsow-data/debian/changelog 2008-04-20 22:19:26 UTC (rev 
6683)
+++ packages/trunk/warsow-data/debian/changelog 2008-04-21 02:07:02 UTC (rev 
6684)
@@ -1,6 +1,8 @@
-warsow-data (0.32-2~unreleased0) unstable; urgency=low
+warsow-data (0.42-1) unstable; urgency=low
 
   [ Andres Mejia ]
+  * New upstream release.
+    Game data is distributable. Closes: #441435
   * Renamed warsow-data-tarball.sh to warsow-data-get-orig-source.
     + Modified it to make it more maintainable.
   * Edited README.Debian.
@@ -18,6 +20,7 @@
   * Add watchfile.
   * Don't install screenshots directory. warsow automatically will fallback to
     $HOME/.warsow/basewsw/screenshots for screenshots.
+  * Updated copyright file with new license for game data.
 
  -- Andres Mejia <[EMAIL PROTECTED]>  Tue, 15 Jan 2008 17:50:03 -0500
 

Modified: packages/trunk/warsow-data/debian/copyright
===================================================================
--- packages/trunk/warsow-data/debian/copyright 2008-04-20 22:19:26 UTC (rev 
6683)
+++ packages/trunk/warsow-data/debian/copyright 2008-04-21 02:07:02 UTC (rev 
6684)
@@ -2,7 +2,7 @@
 Sat, 24 Jun 2006 22:50:33 +0200
 
 It was downloaded from http://www.warsow.net/
-The upstream source for this package is the warsow linux binary tarball.
+The upstream source for this package is the warsow unified zip file.
 All binaries and shared libraries were deleted before packing the orig tarball.
 
 The actual maintainer is the Debian Games Team:
@@ -20,20 +20,54 @@
 Copyright (c) 2005 Andreas Schneider
 Copyright (C) 2006 Warsow Team
 
+The game data are covered under the Warsow Content License
 
-Warsow's non-dfsg license (copied from docs/license.txt)
-========================================================
+Warsow Content License
 
-Warsow license information:
+    Assets that are property of Chasseur de bots, use the following Warsow
+    Content License.
 
-The game engine is based on the QFusion engine and licensed under the GNU
-General Public license. A copy of the GPL license should come with this
-package, in file named gnu.txt, if not look at
-http://www.gnu.org/licenses/gpl.txt
+    TERMS AND CONDITIONS FOR USAGE, COPYING, DISTRIBUTION AND MODIFICATION
 
-Game data files are copyrighted by their respective authors. You may only
-redistribute the game data in unmodified form unless you have written
-permission from the copyright owner.
+    1. This License applies to any material or other work which contains a
+    notice placed by the copyright holder saying it may be distributed under 
the
+    terms of this Warsow Content License.
 
-You can find the GPL license text on a Debian system under
-/usr/share/common-licenses/GPL.
+    2. Terms defined in this Article, and parenthetically elsewhere, shall
+    throughout this License have the meanings here and there provided. Defined
+    terms may be used in the singular or plural. Definitions:
+
+        * The "Material", below, refers to any such material or work, and a
+        "work based on the Material" means either the Material or any 
Derivative
+        Work under copyright law.
+
+        * "Derivative Work" shall mean a work containing the Material or a
+        portion of it, such as a revision, modification, enhancement,
+        adaptation, translation (including compilation or recompilation by
+        computer), abridgement, condensation, expansion, or any other form in
+        which such preexisting works may be recast, transformed, or adapted, 
and
+        that, if prepared without authorization of the owner of the copyright 
in
+        such preexisting work, would constitute a copyright infringement.
+
+        * Each licensee is addressed as "you".
+
+    3. You may not copy, modify, publish, transmit, sell, participate in the
+    transfer or sale or reproduce, create Derivative Works from, distribute,
+    perform, display or in any way exploit any of the Material released under
+    this License unless expressly permitted by the Chasseur de bots team.
+
+    4. You may freely distribute the Warsow archive/installer unmodified on any
+    media. You may re-compress using different archival formats suitable for
+    your OS (i.e. zip/tgz/rpm/deb/dmg), any changes beyond that require 
explicit
+    permission of the Chasseur de bots association.
+
+    5. THERE IS NO WARRANTY FOR THE MATERIAL PROVIDED, TO THE EXTENT PERMITTED
+    BY APPLICABLE LAW. THE MATERIAL IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY
+    KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+    THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE MATERIAL IS WITH
+    YOU.
+
+    6. IN NO EVENT SHALL Chasseur de bots BE LIABLE FOR ANY DAMAGES WHATSOEVER,
+    INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+    OUT OF THE USE OR INABILITY TO USE THE MATERIAL.

Modified: packages/trunk/warsow-data/debian/warsow-data-get-orig-source
===================================================================
--- packages/trunk/warsow-data/debian/warsow-data-get-orig-source       
2008-04-20 22:19:26 UTC (rev 6683)
+++ packages/trunk/warsow-data/debian/warsow-data-get-orig-source       
2008-04-21 02:07:02 UTC (rev 6684)
@@ -3,9 +3,9 @@
 # This script will download the upstream tarball that contains the content of
 # the warsow-data package and create an orig tarball of it.
 
-WARSOW_DATA_TARBALL="warsow_0.32_linux.tar.gz"
-WARSOW_DATA_VERSION="0.32"
-CORRECT_CHECKSUM="508fa64b6157b3f5ebed09e9e715ec43"
+WARSOW_DATA_TARBALL="warsow_0.42_unified.zip"
+WARSOW_DATA_VERSION="0.42"
+CORRECT_CHECKSUM="cba5fe9b8af01b378e685959098fa84f"
 
 USAGE="\
 warsow-data orig tarball download script\n\
@@ -13,7 +13,7 @@
 Usage: warsow-data-get-orig-source [OPTION]\n\
 \n\
  -h, --help                 Display this text\n\
---keep-upstream             Don't delete the upstream source tarball\n\
+--keep-upstream-tarball     Don't delete the upstream source tarball\n\
 --keep-orig-dir             Don't delete the orig directory\n"
 
 while [ "$#" -gt "0" ]
@@ -35,9 +35,9 @@
 done
 
 # List of mirrors to use
-MIRROR1=http://qc-net.com/wsw
-MIRROR2=http://warsow.as-mirror.net
-MIRROR3=http://dl.warsow.us
+MIRROR1=http://tastyspleen.net/quake/downloads/mods/warsow
+MIRROR2=http://data.rodix.free.fr/warsow/files
+MIRROR3=http://www.derchris.net/warsow
 
 if [ ! -f $WARSOW_DATA_TARBALL ] ; then
     # Try each mirror until sucessful, else exit with an error
@@ -61,27 +61,31 @@
 fi
 
 # Prepare the warsow-data orig tarball
-if [ ! -d warsow ]; then
+if [ ! -d warsow_0.42_unified ]; then
        echo "Extracting $WARSOW_DATA_TARBALL."
-       tar -xzf $WARSOW_DATA_TARBALL
+       unzip -qq $WARSOW_DATA_TARBALL
 else
-       echo "Already found extracted warsow directory. Please remove 
-or move warsow and warsow-data-$WARSOW_DATA_VERSION directories and also 
warsow-data_$WARSOW_DATA_VERSION.orig.tar.gz."
+       echo "Already found extracted warsow_0.42_unified directory. Please 
remove
+or move warsow_0.42_unified and warsow-data-$WARSOW_DATA_VERSION directories 
and
+also warsow-data_$WARSOW_DATA_VERSION.orig.tar.gz."
        exit 1
 fi
 if [ ! -d warsow-data-$WARSOW_DATA_VERSION ]; then
-       echo "Renaming extracted warsow directory to 
warsow-data-$WARSOW_DATA_VERSION."
-       mv warsow warsow-data-$WARSOW_DATA_VERSION
+       echo "Renaming extracted directory to warsow-data-$WARSOW_DATA_VERSION."
+       mv warsow_0.42_unified warsow-data-$WARSOW_DATA_VERSION
 else
-       echo "Already found extracted warsow-data-$WARSOW_DATA_VERSION 
directory. Please remove 
-or move warsow and warsow-data-$WARSOW_DATA_VERSION directories and also 
warsow-data_$WARSOW_DATA_VERSION.orig.tar.gz."
+       echo "Already found extracted warsow-data-$WARSOW_DATA_VERSION 
directory. Please remove
+or move warsow_0.42_unified and warsow-data-$WARSOW_DATA_VERSION directories 
and
+also warsow-data_$WARSOW_DATA_VERSION.orig.tar.gz."
        exit 1
 fi
 
 # Remove upstream binaries.
 rm warsow-data-$WARSOW_DATA_VERSION/libs/*
-rm warsow-data-$WARSOW_DATA_VERSION/warsow.i386 
warsow-data-$WARSOW_DATA_VERSION/warsow.x86_64
-rm warsow-data-$WARSOW_DATA_VERSION/wsw_server.i386 
warsow-data-$WARSOW_DATA_VERSION/wsw_server.x86_64
+for BINARIES in `ls warsow-data-$WARSOW_DATA_VERSION | grep -e "i386" -e "x86" 
\
+               -e "x64"`; do
+       rm warsow-data-$WARSOW_DATA_VERSION/$BINARIES
+done
 
 # Create the tarball
 if [ ! -f warsow-data_$WARSOW_DATA_VERSION.orig.tar.gz ]; then
@@ -99,7 +103,7 @@
                echo "done."
        fi
 else
-       echo "Already found extracted 
warsow-data_$WARSOW_DATA_VERSION.orig.tar.gz. Please remove 
+       echo "Already found extracted 
warsow-data_$WARSOW_DATA_VERSION.orig.tar.gz. Please remove
 or move warsow and warsow-data-$WARSOW_DATA_VERSION directories and also 
warsow-data_$WARSOW_DATA_VERSION.orig.tar.gz."
        exit 1
 fi

Modified: packages/trunk/warsow-data/debian/watch
===================================================================
--- packages/trunk/warsow-data/debian/watch     2008-04-20 22:19:26 UTC (rev 
6683)
+++ packages/trunk/warsow-data/debian/watch     2008-04-21 02:07:02 UTC (rev 
6684)
@@ -2,11 +2,11 @@
 
 # A list of mirrors used by the warsow-data-get-orig-source script.
 
-http://qc-net.com/wsw/warsow_(.*)_linux.tar.gz \
-    0.32
+http://tastyspleen.net/quake/downloads/mods/warsow/warsow_(.*)_unified.zip \
+    0.42
 
-http://warsow.as-mirror.net/warsow_(.*)_linux.tar.gz \
-    0.32
+http://data.rodix.free.fr/warsow/files/warsow_(.*)_unified.zip \
+    0.42
 
-http://dl.warsow.us/warsow_(.*)_linux.tar.gz \
-    0.32
+http://www.derchris.net/warsow/warsow_(.*)_unified.zip \
+    0.42


_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

Reply via email to