r8179 - in packages/trunk/btanks/debian: . patches

Ansgar Burchardt ansgar-guest at alioth.debian.org
Sun Sep 21 15:26:40 UTC 2008


Author: ansgar-guest
Date: 2008-09-21 15:26:39 +0000 (Sun, 21 Sep 2008)
New Revision: 8179

Removed:
   packages/trunk/btanks/debian/patches/fix_path_bug.patch
Modified:
   packages/trunk/btanks/debian/
   packages/trunk/btanks/debian/changelog
   packages/trunk/btanks/debian/control
   packages/trunk/btanks/debian/copyright
   packages/trunk/btanks/debian/patches/series
Log:
new upstream release, convert debian/copyright to proposed machine-readable format


Property changes on: packages/trunk/btanks/debian
___________________________________________________________________
Name: svn-bs:origUrl
   + http://pkg-games.alioth.debian.org/tarballs/btanks_0.8.7686.orig.tar.gz

Modified: packages/trunk/btanks/debian/changelog
===================================================================
--- packages/trunk/btanks/debian/changelog	2008-09-21 14:08:08 UTC (rev 8178)
+++ packages/trunk/btanks/debian/changelog	2008-09-21 15:26:39 UTC (rev 8179)
@@ -1,19 +1,16 @@
-btanks (0.8.7656-1) UNRELEASED; urgency=low
+btanks (0.8.7686-1) UNRELEASED; urgency=low
 
-  TODO: Test if sound problem is really fixed
-  TODO: Test building in pbuilder
-  TODO: Convert copyright, check if still up to date
-  MAYBE: install map editor (depends how usable it is)
-
   * New Upstream Version (Closes: #490792, #496997)
     + Get available resolutions from the SDL (Closes: #440737)
-    + New sound backend (MAYBE Closes: #440897)
+    + New sound backend (Closes: #440897)
   * Refresh remove_default_optimizations.patch
   * Remove btanks_gcc43.patch (applied upstream)
-  * New patch fix_path_but.patch: Fix problem with normalizing absolute paths
   * Rewrote debian/rules to use debhelper 7
   * Change description for btanks-data
   * Add myself to Uploaders
+  * Convert debian/copyright to proposed machine-readable format
+    and update for new upstream release
+  * Bump Standards Version to 3.8.0 (no changes)
 
  -- Ansgar Burchardt <ansgar at 43-1.org>  Sun, 31 Aug 2008 20:04:12 +0200
 

Modified: packages/trunk/btanks/debian/control
===================================================================
--- packages/trunk/btanks/debian/control	2008-09-21 14:08:08 UTC (rev 8178)
+++ packages/trunk/btanks/debian/control	2008-09-21 15:26:39 UTC (rev 8179)
@@ -8,7 +8,7 @@
  libsdl1.2-dev, libsdl-image1.2-dev, liblua5.1-dev,
  libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev,
  libsmpeg-dev, libvorbis-dev, libsigc++-2.0-dev, libexpat1-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://btanks.sourceforge.net
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/btanks/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/btanks/?op=log

Modified: packages/trunk/btanks/debian/copyright
===================================================================
--- packages/trunk/btanks/debian/copyright	2008-09-21 14:08:08 UTC (rev 8178)
+++ packages/trunk/btanks/debian/copyright	2008-09-21 15:26:39 UTC (rev 8179)
@@ -1,71 +1,215 @@
-This package was debianized by Miriam Ruiz <little_miry at yahoo.es> on
-Sat, 04 Aug 2007 17:16:13 +0000.
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=228
+Upstream-Name: Battle Tanks
+Upstream-Source: http://sourceforge.net/projects/btanks
 
-It was downloaded from http://sourceforge.net/projects/btanks/
-
-Upstream Authors:
-
-    Vladimir Menshakov <megath at users.sourceforge.net>
-    Methos <methos_wagner at users.sourceforge.net>
-    Vladimir Zhuravlev <private_face at users.sourceforge.net>
-
+Files: *
 Copyright:
+ © 2005-2008, Vladimir Menshakov
+ © 2006-2008, Battle Tanks Team
+License: GPL-2+ | other
+ Battle Tanks is distributed in accordance with the terms and conditions of
+ the GNU GPL with the following interpretation and a specific Exception:
+  1. Definitions used in this Exception:
+ .
+     Battle Tanks refers to a scalable computer game program (able to be
+     combined with non-Open Source Applications). The program contains limited
+     game logic and limited game content (including pictures, maps, visual
+     images of game scenery, sounds and other artwork) and is distributed free
+     on the GNU GPL conditions.
+ .
+     A Non-Open Source Application refers to a body of expanded game content
+     (including pictures, maps, visual images of game scenery, sounds and
+     other artwork) together with patterns containing expanded game logic,
+     which is intended solely for the use with Battle Tanks, can work
+     exclusively along with Battle Tanks and shall be distributed through
+     selling on the terms and conditions other than those of GNU GPL.
+ .
+  2. Exclusive rights to Battle Tanks belong to the company
+     Netive Company Ltd., Novosibirsk (Russia), which may link or combine
+     Battle Tanks with some non-Open Source Applications.
+ .
+     Netive Company Ltd. can sign a separate written License Agreement with
+     a third party, under which they are granted permission to:
+       a) link or combine Battle Tanks with non-Open Source Applications;
+       b) reproduce and distribute through selling copies of non-Open Source
+          Applications along with Battle Tanks.
+ .
+  3. All the provisions granted under the section 2 of the Exception go into
+     effect, provided all the corresponding licenses of using non-Open Source
+     Applications are available and observed.
+ .
+  4. You must obey the GNU General Public License in all respects for all of
+     the Program code and other code used in conjunction with the Program
+     except the Non-GPL Code covered by this exception.
+ .
+  5. Only Netive Company, Ltd. may make changes or additions to the Exception.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'.
 
-    Copyright (C) 2006-2007 Battle Tanks Team
-    Copyright (C) 2005-2007 Vladimir Menshakov
+Files: clunk/*
+Copyright: © 2007-2008, Netive Media Group
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL'.
 
-License:
+Files: clunk/kemar.c, clunk/kemar.h
+Copyright: © 1994, MIT Media Laboratory
+License: other
+ It is provided free with no restrictions on use, provided the authors are
+ cited when the data is used in any research or commercial application.
 
-    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
-    (at your option) any later version.
- 
-    This package 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.
- 
-    You should have received a copy of the GNU General Public License
-    along with this package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+Files: clunk/kiss/*
+Copyright: © 2003-2004, Mark Borgerding
+License: other
+ 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 author nor the names of any 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 COPYRIGHT OWNER 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.
 
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Files: mrt/tclUniData.c
+Copyright: © 1998, Scriptics Corporation
+License: other
+ This file is part of TCL which is distributed under the following license:
+ .
+ This software is copyrighted by the Regents of the University of
+ California, Sun Microsystems, Inc., Scriptics Corporation,
+ and other parties.  The following terms apply to all files associated
+ with the software unless explicitly disclaimed in individual files.
+ .
+ The authors hereby grant permission to use, copy, modify, distribute,
+ and license this software and its documentation for any purpose, provided
+ that existing copyright notices are retained in all copies and that this
+ notice is included verbatim in any distributions. No written agreement,
+ license, or royalty fee is required for any of the authorized uses.
+ Modifications to this software may be copyrighted by their authors
+ and need not follow the licensing terms described here, provided that
+ the new terms are clearly indicated on the first page of each file where
+ they apply.
+ .
+ IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+ FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+ DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ .
+ THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
+ IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+ NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+ MODIFICATIONS.
+ .
+ GOVERNMENT USE: If you are acquiring this software on behalf of the
+ U.S. government, the Government shall have only "Restricted Rights"
+ in the software and related documentation as defined in the Federal
+ Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
+ are acquiring the software on behalf of the Department of Defense, the
+ software shall be classified as "Commercial Computer Software" and the
+ Government shall have only "Restricted Rights" as defined in Clause
+ 252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
+ authors grant the U.S. Government and others acting in its behalf
+ permission to use and distribute the software in accordance with the
+ terms specified in this license.
 
+Files: sdlx/SDL_main.h
+Copyright: © 1997-2006 Sam Lantinga
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL'.
 
-sdlx/glSDL:
+Files: sdlx/SDL_win32_main.c
+Copyright: placed in the public domain by Sam Lantinga  4/13/98
+License: other
+ placed in the public domain by Sam Lantinga  4/13/98
 
-Copyright (C) 2001-2004, 2006-2007, David Olofson
+Files: sdlx/wrappers/*
+Copyright: © 2001-2004, 2006-2007, David Olofson
+License: LGPL-any
+ This code is released under the terms of the GNU LGPL.
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL'.
 
+Files: sdlx/wrappers/d3dsdl.cpp
+Copyright: © 2008, Vladimir Menshakov
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL'.
 
-debian/html.tar.uu:
+Files: debian/*
+Copyright:
+ © 2007, Miriam Ruiz <little_miry at yahoo.es>
+ © 2007, Paul Wise
+ © 2007, Barry deFreese <bddebian at comcast.net>
+ © 2007, Simon Ruggier
+ © 2008, Alexander Schmehl <tolimar at debian.org>
+ © 2008, Ansgar Burchardt <ansgar at 43-1.org>
+License: GPL-2+
 
-    Copyright (C) 2006-2007 Battle Tanks Team
+Files: debian/html.tar.uu
+Copyright: © 2006-2007, Battle Tanks Team
+License: GPL-2+
+ Permission has been granted by the authors of the documentation to release
+ it under the GPL license.
 
-    Permission has been granted by the authors of the documentation to release
-    it under the GPL license.
-
-
-License:
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
- 
-    This software 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
-    Lesser General Public License for more details.
- 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
-
-
-The Debian packaging and patches are (C) 2007, Debian Games Team and
-are licensed under the GPL, see above.

Deleted: packages/trunk/btanks/debian/patches/fix_path_bug.patch
===================================================================
--- packages/trunk/btanks/debian/patches/fix_path_bug.patch	2008-09-21 14:08:08 UTC (rev 8178)
+++ packages/trunk/btanks/debian/patches/fix_path_bug.patch	2008-09-21 15:26:39 UTC (rev 8179)
@@ -1,11 +0,0 @@
---- btanks.orig/mrt/fs_node.cpp
-+++ btanks/mrt/fs_node.cpp
-@@ -121,7 +121,7 @@
- 	std::vector<std::string> p, r;
- 	mrt::split(p, path, "/");
- 	for(size_t i = 0; i < p.size(); ++i) {
--		if (p[i] == "." || p[i].empty())
-+		if (p[i] == ".")
- 			continue;
- 		if (p[i] == ".." && !r.empty()) {
- 			r.resize(r.size() - 1);

Modified: packages/trunk/btanks/debian/patches/series
===================================================================
--- packages/trunk/btanks/debian/patches/series	2008-09-21 14:08:08 UTC (rev 8178)
+++ packages/trunk/btanks/debian/patches/series	2008-09-21 15:26:39 UTC (rev 8179)
@@ -1,2 +1 @@
 remove_default_optimizations.patch
-fix_path_bug.patch




More information about the Pkg-games-commits mailing list