r13595 - packages/trunk/warzone2100/debian
Paul Wise
pabs at alioth.debian.org
Sun May 20 11:56:51 UTC 2012
Author: pabs
Date: 2012-05-20 11:56:51 +0000 (Sun, 20 May 2012)
New Revision: 13595
Modified:
packages/trunk/warzone2100/debian/changelog
packages/trunk/warzone2100/debian/control
packages/trunk/warzone2100/debian/copyright
packages/trunk/warzone2100/debian/warzone2100-data.install
packages/trunk/warzone2100/debian/warzone2100.install
Log:
wrap-and-sort -sa
Modified: packages/trunk/warzone2100/debian/changelog
===================================================================
--- packages/trunk/warzone2100/debian/changelog 2012-05-20 11:53:47 UTC (rev 13594)
+++ packages/trunk/warzone2100/debian/changelog 2012-05-20 11:56:51 UTC (rev 13595)
@@ -14,6 +14,7 @@
* Update patch to use system quesoglc too
* Fix FTBFS with hardening flags
* Fix spelling error
+ * wrap-and-sort -sa
-- Paul Wise <pabs at debian.org> Mon, 24 Oct 2011 10:55:52 +0800
Modified: packages/trunk/warzone2100/debian/control
===================================================================
--- packages/trunk/warzone2100/debian/control 2012-05-20 11:53:47 UTC (rev 13594)
+++ packages/trunk/warzone2100/debian/control 2012-05-20 11:56:51 UTC (rev 13595)
@@ -2,38 +2,41 @@
Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Paul Wise <pabs at debian.org>,
+Uploaders:
+ Paul Wise <pabs at debian.org>,
Bradley Smith <bradsmith at debian.org>,
Christoph Egger <christoph at debian.org>
-Build-Depends: debhelper (>= 9),
+Build-Depends:
+ asciidoc,
autotools-dev,
+ bison,
+ debhelper (>= 9),
dh-autoreconf,
- bison,
- flex (>= 2.5.35~) | flex (<< 2.5.34~), flex (>= 2.5.33~),
+ docbook-xml,
+ docbook-xsl,
+ dpkg-dev (>= 1.13.19),
+ flex (>= 2.5.33~),
+ flex (>= 2.5.35~) | flex (<< 2.5.34~),
+ libglc-dev,
+ libglew-dev,
+ libminiupnpc-dev,
libopenal-dev,
- libsdl1.2-dev,
- libqt4-dev,
- libxrandr-dev,
- libvorbis-dev,
- libtheora-dev,
libphysfs-dev,
libpng12-dev,
- dpkg-dev (>= 1.13.19),
- libglc-dev,
libpopt-dev,
- libglew-dev,
- libminiupnpc-dev,
+ libqt4-dev,
+ libsdl1.2-dev,
+ libtheora-dev,
+ libvorbis-dev,
+ libxml2-utils,
+ libxrandr-dev,
pkg-config,
- asciidoc,
+ unzip,
wkhtmltopdf,
- libxml2-utils,
- docbook-xml,
- docbook-xsl,
+ xauth,
xsltproc,
- xauth,
xvfb,
- zip,
- unzip
+ zip
Standards-Version: 3.9.3
Homepage: http://www.wz2100.net/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/warzone2100/
@@ -41,10 +44,14 @@
Package: warzone2100
Architecture: any
-Depends: ${shlibs:Depends},
+Depends:
+ warzone2100-data (<= ${source:Version}),
+ warzone2100-data (>= ${source:Upstream-Version}),
${misc:Depends},
- warzone2100-data (>= ${source:Upstream-Version}), warzone2100-data (<= ${source:Version})
-Recommends: warzone2100-music (>= ${source:Upstream-Version}), warzone2100-music (<= ${source:Version})
+ ${shlibs:Depends}
+Recommends:
+ warzone2100-music (<= ${source:Version}),
+ warzone2100-music (>= ${source:Upstream-Version})
Description: 3D real time strategy game
In Warzone 2100 you command the forces of “The Project” in a battle to
rebuild the world after mankind has almost been destroyed by nuclear
@@ -65,11 +72,13 @@
Package: warzone2100-data
Architecture: all
-Depends: ${misc:Depends}
-Recommends: warzone2100
+Depends:
+ ${misc:Depends}
+Recommends:
+ warzone2100
Description: data files for warzone2100
This package contains data, docs and translations for the warzone2100 game.
- .
+ .
It contains the campaign and multiplayer data, several mods (including
a more advanced AI, different terrain textures, new maps and scavengers)
and documentation for the game.
@@ -78,7 +87,9 @@
Section: debug
Architecture: any
Priority: extra
-Depends: ${misc:Depends}, warzone2100 (= ${binary:Version})
+Depends:
+ warzone2100 (= ${binary:Version}),
+ ${misc:Depends}
Description: debug files for warzone2100
This package contains debug information for the warzone2100 game.
.
@@ -88,8 +99,10 @@
Package: warzone2100-music
Architecture: all
-Depends: ${misc:Depends}
-Recommends: warzone2100
+Depends:
+ ${misc:Depends}
+Recommends:
+ warzone2100
Description: official music for warzone2100
This package contains official music for the warzone2100 game.
.
Modified: packages/trunk/warzone2100/debian/copyright
===================================================================
--- packages/trunk/warzone2100/debian/copyright 2012-05-20 11:53:47 UTC (rev 13594)
+++ packages/trunk/warzone2100/debian/copyright 2012-05-20 11:56:51 UTC (rev 13595)
@@ -141,7 +141,7 @@
Files: lib/netplay/miniupnpc/*
Copyright: 2005-2009 Thomas Bernard
License: BSD
- Copyright (c) 2005-2008, Thomas BERNARD
+ Copyright (c) 2005-2008, Thomas BERNARD
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -181,7 +181,7 @@
3. Neither the name of the University 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 REGENTS 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
@@ -206,28 +206,28 @@
This file is derived from the SDL player example as found in the OggTheora
software codec source code. In particular this is examples/player_example.c
as found in OggTheora 1.0beta3.
-
+
The copyright to this file was originally owned by and licensed as follows.
Please note, however, that *this* file, i.e. the one you are currently
reading is not licensed as such anymore.
-
+
Copyright (C) 2002-2007 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
@@ -252,7 +252,7 @@
Copyright (c)2009 Ben Woodhouse All rights reserved.
Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
+ modification, are permitted provided that the following conditions are
met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer as
@@ -312,7 +312,7 @@
Please note that the actual code of GNU gettext is covered by the GNU
General Public License and is *not* in the public domain.
-Files: po/*.po
+Files: po/*.po
Copyright: 2007-2008 Warzone 2100 Resurrection Project
2008 Rosetta Contributors and Canonical Ltd 2008
@@ -320,28 +320,28 @@
Copyright: 2007-2008 Bruce V. Edwards
License: CC-BY-SA-3.0
Creative Commons Attribution-ShareAlike 3.0 License Agreement
-
+
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS"
BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION
PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
-
+
License
-
+
THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN
AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
+
BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE
MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
CONDITIONS.
-
+
1. Definitions
-
+
a. "Adaptation" means a work based upon the Work, or upon the Work
and other pre-existing works, such as a translation, adaptation,
derivative work, arrangement of music or other alterations of a
@@ -429,17 +429,17 @@
fixation and reproducing fixations of the Work, including storage
of a protected performance or phonogram in digital form or other
electronic medium.
-
+
2. Fair Dealing Rights. Nothing in this License is intended to reduce,
limit, or restrict any uses free from copyright or rights arising from
limitations or exceptions that are provided for in connection with the
copyright protection under copyright law or other applicable laws.
-
+
3. License Grant. Subject to the terms and conditions of this License,
Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
perpetual (for the duration of the applicable copyright) license to
exercise the rights in the Work as stated below:
-
+
a. to Reproduce the Work, to incorporate the Work into one or
more Collections, and to Reproduce the Work as incorporated in the
Collections;
@@ -453,7 +453,7 @@
incorporated in Collections; and,
d. to Distribute and Publicly Perform Adaptations.
e.
-
+
For the avoidance of doubt:
i. Non-waivable Compulsory License Schemes. In those
jurisdictions in which the right to collect royalties through any
@@ -470,16 +470,16 @@
that the Licensor is a member of a collecting society that
administers voluntary licensing schemes, via that society, from
any exercise by You of the rights granted under this License.
-
+
The above rights may be exercised in all media and formats whether now
known or hereafter devised. The above rights include the right to make
such modifications as are technically necessary to exercise the rights
in other media and formats. Subject to Section 8(f), all rights not
expressly granted by Licensor are hereby reserved.
-
+
4. Restrictions. The license granted in Section 3 above is expressly
made subject to and limited by the following restrictions:
-
+
a. You may Distribute or Publicly Perform the Work only under the
terms of this License. You must include a copy of, or the Uniform
Resource Identifier (URI) for, this License with every copy of the
@@ -575,9 +575,9 @@
applicable national law, to enable You to reasonably exercise Your
right under Section 3(b) of this License (right to make Adaptations)
but not otherwise.
-
+
5. Representations, Warranties and Disclaimer
-
+
UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
@@ -586,15 +586,15 @@
LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
+
6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR
HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
+
7. Termination
-
+
a. This License and the rights granted hereunder will terminate
automatically upon any breach by You of the terms of this
License. Individuals or entities who have received Adaptations or
@@ -611,9 +611,9 @@
or is required to be, granted under the terms of this License), and
this License will continue in full force and effect unless terminated
as stated above.
-
+
8. Miscellaneous
-
+
a. Each time You Distribute or Publicly Perform the Work or a
Collection, the Licensor offers to the recipient a license to the
Work on the same terms and conditions as the license granted to You
@@ -650,9 +650,9 @@
rights not granted under this License, such additional rights are
deemed to be included in the License; this License is not intended
to restrict the license of any rights under applicable law.
-
+
Creative Commons Notice
-
+
Creative Commons is not a party to this License, and makes no warranty
whatsoever in connection with the Work. Creative Commons will not
be liable to You or any party on any legal theory for any damages
@@ -661,7 +661,7 @@
license. Notwithstanding the foregoing two (2) sentences, if Creative
Commons has expressly identified itself as the Licensor hereunder,
it shall have all rights and obligations of Licensor.
-
+
Except for the limited purpose of indicating to the public that the Work
is licensed under the CCPL, Creative Commons does not authorize the use by
either party of the trademark "Creative Commons" or any related trademark
@@ -671,7 +671,7 @@
website or otherwise made available upon request from time to time. For
the avoidance of doubt, this trademark restriction does not form part
of the License.
-
+
Creative Commons may be contacted at http://creativecommons.org/.
Files: data/mods/multiplay/dydo-ai/*
@@ -801,4 +801,3 @@
4. Affirmer understands and acknowledges that Creative Commons is not
a party to this document and has no duty or obligation with respect to
this CC0 or use of the Work.
-
Modified: packages/trunk/warzone2100/debian/warzone2100-data.install
===================================================================
--- packages/trunk/warzone2100/debian/warzone2100-data.install 2012-05-20 11:53:47 UTC (rev 13594)
+++ packages/trunk/warzone2100/debian/warzone2100-data.install 2012-05-20 11:56:51 UTC (rev 13595)
@@ -1,3 +1,3 @@
usr/share/doc
+usr/share/games/warzone2100/*.wz
usr/share/locale
-usr/share/games/warzone2100/*.wz
Modified: packages/trunk/warzone2100/debian/warzone2100.install
===================================================================
--- packages/trunk/warzone2100/debian/warzone2100.install 2012-05-20 11:53:47 UTC (rev 13594)
+++ packages/trunk/warzone2100/debian/warzone2100.install 2012-05-20 11:56:51 UTC (rev 13595)
@@ -1,6 +1,6 @@
+../../debian/warzone2100-16x16.xpm usr/share/pixmaps
+../../debian/warzone2100-32x32.xpm usr/share/pixmaps
usr/games
+usr/share/applications
+usr/share/icons
usr/share/man
-usr/share/icons
-usr/share/applications
-../../debian/warzone2100-16x16.xpm usr/share/pixmaps
-../../debian/warzone2100-32x32.xpm usr/share/pixmaps
More information about the Pkg-games-commits
mailing list