r3420 - packages/trunk/warsow/debian

Andres Mejia ceros-guest at alioth.debian.org
Mon Jul 16 03:14:36 UTC 2007 

Author: ceros-guest
Date: 2007-07-16 03:14:36 +0000 (Mon, 16 Jul 2007)
New Revision: 3420

Modified:
   packages/trunk/warsow/debian/changelog
   packages/trunk/warsow/debian/control
   packages/trunk/warsow/debian/copyright
   packages/trunk/warsow/debian/rules
Log:
Preparing warsow for release

Modified: packages/trunk/warsow/debian/changelog
===================================================================
--- packages/trunk/warsow/debian/changelog	2007-07-16 02:59:51 UTC (rev 3419)
+++ packages/trunk/warsow/debian/changelog	2007-07-16 03:14:36 UTC (rev 3420)
@@ -1,5 +1,26 @@
-warsow (0.31.dfsg-2) UNRELEASED; urgency=low
+warsow (0.31.dfsg-2) unstable; urgency=low
 
+  [ Andres Mejia ]
+  * Still initial release (Closes: #375430)
+  * Deleting unneeded directories from orig tarball.
+    + Explained in detail in debian/copyright.
+  * Modified debian/copyright.
+    + Explained why certain directories are deleted.
+    + Listed directories that are deleted.
+    + Including section titled Copyright and License.
+  * Taking out Suggests line for warsow-battleye.
+    + There's no Battleye packages in Debian yet.
+  * Modified debian/rules.
+    + Renamed Q2ARCH to a more clear variable DPKG_ARCH.
+    + Added UNAME_ARCH, used when running rules clean twice.
+  * Added other changes made by team in SVN.
+    + Changes that were added are below. They are from Eddy Petrișor and
+      Jon Dowland.
+
+ -- Andres Mejia <mcitadel at gmail.com>  Sun, 15 Jul 2007 17:59:06 -0400
+
+warsow (0.31.dfsg-1) unstable; urgency=low
+
   [ Eddy Petrișor ]
   * added encoding to the desktop file
   * some fixes to the Romanian translation of the comment in the desktop file
@@ -8,10 +29,6 @@
   * update menu section to "Games/Action" for menu policy transition.
     Thanks Linas Žvirblis.
 
- -- Jon Dowland <jon at alcopop.org>  Thu, 12 Jul 2007 12:08:15 +0100
-
-warsow (0.31.dfsg-1) unstable; urgency=low
-
   [ Gonéri Le Bouder ]
   * Initial release (Closes: #375430)
 
@@ -20,4 +37,4 @@
   * Added patch to modify makefile.
   * Added README.Debian file.
 
- -- Gonéri Le Bouder <goneri at rulezlan.org>  Tue,  3 Jul 2007 22:13:26 +0200
+ -- Jon Dowland <jon at alcopop.org>  Thu, 12 Jul 2007 12:08:15 +0100

Modified: packages/trunk/warsow/debian/control
===================================================================
--- packages/trunk/warsow/debian/control	2007-07-16 02:59:51 UTC (rev 3419)
+++ packages/trunk/warsow/debian/control	2007-07-16 03:14:36 UTC (rev 3420)
@@ -9,7 +9,6 @@
 Package: warsow
 Architecture: any
 Depends: ${shlibs:Depends}, warsow-data (>= 0.31), warsow-data (<< 0.32)
-Suggests: warsow-battleye [i386]
 Description: A comic-style fast-paced 3D ego-shooter
  Warsow is a fast-paced 3D ego-shooter with colorful graphics which look like 
  in comic (black lines around things; deliberatly surrealistic graphics) or 
@@ -24,7 +23,6 @@
 Package: warsow-server
 Architecture: any
 Depends: ${shlibs:Depends}, warsow-data (>= 0.31), warsow-data (<< 0.32)
-Suggests: warsow-battleye [i386]
 Description: Server for the Warsow 3D ego-shooter game
  Warsow is a fast-paced 3D ego-shooter with colorful graphics which look like 
  in comic (black lines around things; deliberatly surrealistic graphics) or 

Modified: packages/trunk/warsow/debian/copyright
===================================================================
--- packages/trunk/warsow/debian/copyright	2007-07-16 02:59:51 UTC (rev 3419)
+++ packages/trunk/warsow/debian/copyright	2007-07-16 03:14:36 UTC (rev 3420)
@@ -1,13 +1,26 @@
 This package was debianized by Gonéri Le Bouder on
 Sat, 24 Jun 2006 22:50:33 +0200
 
+The actual maintainer is the Debian Games Team:
+http://wiki.debian.org/Games/Development
+
 It was downloaded from http://www.warsow.net
 The upstream source for this package is the warsow sdk tarball.
-Certain documents from warsow binary tarball were included with this package.
 
-The actual maintainer is the Debian Games Team:
-http://wiki.debian.org/Games/Development
+Certain documents from the warsow binary tarball were included with this
+package. Also, certain directories included in the upstream warsow sdk tarball
+were deleted in the orig tarball as they are not used at all to build warsow.
+Also, the deleted directories contained libs that were already in Debian which
+lead to a rejection of this package with the first upload.
 
+The deleted directories are:
+mapping
+modelling
+other
+warsow_0.31/libsrcs
+
+Copyright and License:
+
 Copyright (C) 1995-1998 Mark Adler
 Copyright (C) 1997-2001 Id Software, Inc.
 Copyright (C) 1997-2004 Sam Lantinga
@@ -20,8 +33,6 @@
 Copyright (c) 2005 Andreas Schneider
 Copyright (C) 2006 Warsow Team
 
-License:
-
    This package 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
@@ -38,65 +49,3 @@
 
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
-
-
-Parts of the source code are covered by other licenses than the GNU GPL!
-
-
-source/win32/include/vorbis/*, source/win32/include/ogg/*
-============================================================
-
-Copyright (c) 2002, Xiph.org Foundation
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-- Neither the name of the Xiph.org Foundation nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-source/win32/include/curl/*
-===========================
-
-COPYRIGHT AND PERMISSION NOTICE
-
-Copyright (c) 1996 - 2006, Daniel Stenberg, <daniel at haxx.se>.
-
-All rights reserved.
-
-Permission to use, copy, modify, and distribute this software for any purpose
-with or without fee is hereby granted, provided that the above copyright
-notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
-NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
-OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder shall not
-be used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization of the copyright holder.

Modified: packages/trunk/warsow/debian/rules
===================================================================
--- packages/trunk/warsow/debian/rules	2007-07-16 02:59:51 UTC (rev 3419)
+++ packages/trunk/warsow/debian/rules	2007-07-16 03:14:36 UTC (rev 3420)
@@ -6,8 +6,12 @@
 DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
 # Needed for linking proper files
-Q2ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
+DPKG_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
 
+# Needed for deleting directory created when running rules clean twice on
+# x86_64 and other architectures.
+UNAME_ARCH=$(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/)
+
 include /usr/share/dpatch/dpatch.make
 
 build: patch build-stamp
@@ -22,7 +26,8 @@
 	dh_testroot
 	cd warsow_0.31/source && $(MAKE) clean
 	rm -rf warsow_0.31/source/build warsow_0.31/source/release \
-		warsow_0.31/source/build$(Q2ARCH)
+		warsow_0.31/source/build$(UNAME_ARCH) \
+		warsow_0.31/source/build$(DPKG_ARCH)
 	rm -f build-stamp
 	dh_clean
 
@@ -40,9 +45,9 @@
 	dh_testroot
 	dh_installchangelogs 
 	dh_installdocs
-	dh_link -pwarsow usr/lib/games/warsow/basewsw/cgame_$(Q2ARCH).so usr/share/games/warsow/basewsw/cgame_$(Q2ARCH).so
-	dh_link -pwarsow usr/lib/games/warsow/basewsw/game_$(Q2ARCH).so usr/share/games/warsow/basewsw/game_$(Q2ARCH).so
-	dh_link -pwarsow usr/lib/games/warsow/basewsw/ui_$(Q2ARCH).so usr/share/games/warsow/basewsw/ui_$(Q2ARCH).so
+	dh_link -pwarsow usr/lib/games/warsow/basewsw/cgame_$(DPKG_ARCH).so usr/share/games/warsow/basewsw/cgame_$(DPKG_ARCH).so
+	dh_link -pwarsow usr/lib/games/warsow/basewsw/game_$(DPKG_ARCH).so usr/share/games/warsow/basewsw/game_$(DPKG_ARCH).so
+	dh_link -pwarsow usr/lib/games/warsow/basewsw/ui_$(DPKG_ARCH).so usr/share/games/warsow/basewsw/ui_$(DPKG_ARCH).so
 	dh_link -pwarsow usr/lib/games/warsow/libs usr/share/games/warsow/libs
 	dh_installmenu
 	dh_desktop

More information about the Pkg-games-commits mailing list