[megaglest] 67/143: updated to include changes for new upcoming upstream release
Markus Koschany
apo-guest at moszumanska.debian.org
Sat Jan 31 20:46:10 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository megaglest.
commit 24e181ae95aa02371094de6e0403938abaeebb95
Author: Mark Vejvoda <mark_vejvoda at hotmail.com>
Date: Wed Oct 31 06:13:52 2012 +0000
updated to include changes for new upcoming upstream release
---
debian/changelog | 9 ++++
debian/control | 2 +-
debian/copyright | 98 +++++++++++++++---------------------------
debian/megaglest.README.Debian | 4 ++
debian/megaglest.install | 1 -
debian/patches/gcc4.7.patch | 31 -------------
debian/patches/series | 1 -
7 files changed, 48 insertions(+), 98 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d5110da..e2516aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+megaglest (3.7.0-1) unstable; urgency=low
+
+ [ Mark Vejvoda ]
+ * New upstream release
+ - Fixes FTBFS on non-x86 architectures (Closes: #654283)
+ - Fixes graphics issues (Closes: #534213)
+
+ -- Mark Vejvoda <mark_vejvoda at hotmail.com> Mon, 29 Oct 2012 12:30:18 +0800
+
megaglest (3.6.0.3-2) UNRELEASED; urgency=low
* Remove myself from Uploaders
diff --git a/debian/control b/debian/control
index fc96127..4664124 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Build-Depends:
libz-dev,
xauth,
xvfb
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/megaglest/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/megaglest/?op=log
Homepage: http://megaglest.org/
diff --git a/debian/copyright b/debian/copyright
index b7e960f..833a1aa 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,21 +1,20 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Almost-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: MegaGlest
Upstream-Contact: Mark Vejvoda <mark_vejvoda at hotmail.com>
Source: http://sourceforge.net/projects/megaglest/files/
Files: *
-License: GPL-2+
Copyright: 2008-2011 Titus Tscharntke (info at titusgames.de)
2008-2011 Mark Vejvoda (www.soft-haus.com - mark_vejvoda at hotmail.com)
2001-2008 Martiño Figueroa <contact at glest.org>
2005 Matthias Braun <matze at braunis.de>
- 2010 James McCulloch (silnarm at gmail.com) --> Some pathfinder logic
2008 Frank Tetzel --> Map Editor Icon
2010 Andreas Martin (andreas.martin at linuxmail.org) --> feathery FTP server
2008 Bryan L Blackburn --> Mac OSX legacy fonts
2005 Roland BROCHAR --> string utilities
2006-2008 Alexander Chemeris --> data types for win32
2006 Nemanja Trifunovic --> utf8 code
+License: GPL-2+
Files: source/shared_lib/sources/feathery_ftp/* source/shared_lib/include/feathery_ftp/*
Copyright: Copyright 2005-2010 Andreas Martin (andreas.martin at linuxmail.org)
@@ -25,35 +24,6 @@ Files: *.sh
Copyright: Copyright 2008-2011 Mark Vejvoda (www.soft-haus.com - mark_vejvoda at hotmail.com)
License: GPL-3+
-Files: source/shared_lib/sources/graphics/md5/* source/shared_lib/include/graphics/md5/*
-Copyright: Copyright 2006-2007 David Henry
-License: MIT
- This code is licensed under the MIT license:
- http://www.opensource.org/licenses/mit-license.php
-
- Open Source Initiative OSI - The MIT License (MIT):Licensing
-
- The MIT License (MIT)
- Copyright (c) <year> <copyright holders>
-
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- 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. 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.//
-
Files: source/shared_lib/sources/platform/win32/glob.cpp source/shared_lib/include/platform/win32/glob.h
Copyright: Copyright 2002-2010 Matthew Wilson and Synesis Software
License: BSD-2-clause
@@ -118,14 +88,14 @@ License: BSL-1.0
execute, and transmit the Software, and to prepare derivative works of the
Software, and to permit third-parties to whom the Software is furnished to
do so, all subject to the following:
-
+ .
The copyright notices in the Software and this entire statement, including
the above license grant, this restriction and the following disclaimer,
must be included in all copies of the Software, in whole or in part, and
all derivative works of the Software, unless such copies or derivative
works are solely in the form of machine-executable object code generated by
a source language processor.
-
+ .
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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
@@ -158,18 +128,18 @@ License: BSD-2-clause
Redistribution and use in source and binary forms, with or without
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.
-
+ .
2. 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.
-
+ .
3. The names of its contributors may not 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
@@ -182,59 +152,59 @@ License: BSD-2-clause
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-This package was debianized by Giuseppe Borzi <gborzi at ieee.org>
-and Mark Vejvoda <mark_vejvoda at hotmail.com>
-on Wed, 25 May 2011 Wed, 25 May 2011 23:31:21 -0700.
-
-It was downloaded from http://sourceforge.net/projects/megaglest
-
-Embedded libs:
-
+Comment:
+ This package was debianized by Giuseppe Borzi <gborzi at ieee.org>
+ and Mark Vejvoda <mark_vejvoda at hotmail.com>
+ on Wed, 25 May 2011 Wed, 25 May 2011 23:31:21 -0700.
+ .
+ It was downloaded from http://sourceforge.net/projects/megaglest
+ .
+ Embedded libs:
+ .
freetype-gl:
Nicolas P. Rougier
Stefan Gustavson (stefan.gustavson at gmail.com)
-
+ .
streflop:
Makoto Matsumoto and Takuji Nishimura / Mutsuo Saito
Sun Microsystems
Free Software Foundation, Inc
Stephen L. Moshier <moshier at na-net.ornl.gov>
Tobi Vollebregt
-
-MojoSetup Installer:
-
+ .
+ MojoSetup Installer:
+ .
Julian Seward <jseward at bzip.org>
Mark Adler
Jean-loup Gailly
Dag-Erling Coïdan Smørgrav
Massachusetts Institute of Technology
Lua.org, PUC-Rio
-
-Scripts:
-
+ .
+ Scripts:
+ .
nixCraft (nixcraft.com)
Vincent Gadoury
Jonathan Merritt
Andreas Becker (seltsamuel at yahoo.de)
-
-Original Glest:
-
+ .
+ Original Glest:
+ .
Copyright (C) 2001-2008 Martiño Figueroa
- Everything except the files inside the directories listed below,
which belong to Matthias Braun.
-
+ .
Copyright (C) 2005 Matthias Braun <matze at braunis.de>
- source/shared_lib/*/platform/posix/
- source/shared_lib/*/platform/sdl/
- source/shared_lib/*/sound/openal/
-
-License:
-
+ .
+ License:
+ .
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 3 of the License, or
(at your option) any later version.
-
-On Debian systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL-3.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in /usr/share/common-licenses/GPL-3.
diff --git a/debian/megaglest.README.Debian b/debian/megaglest.README.Debian
index 323bd49..c7123b2 100644
--- a/debian/megaglest.README.Debian
+++ b/debian/megaglest.README.Debian
@@ -1,6 +1,10 @@
MegaGlest for Debian
-----------------------
+To display numerous options run from a terminal with: --help
+
+ -- Mark Vejvoda <mark_vejvoda at hotmail.com> Mon, 29 Oct 2012 12:30:18 +0800
+
If your glx version is lower
than 1.3 set CheckGlCaps=0 in the ~/.megaglest/glestuser.ini file.
diff --git a/debian/megaglest.install b/debian/megaglest.install
index 86f720a..36e4e1a 100644
--- a/debian/megaglest.install
+++ b/debian/megaglest.install
@@ -1,5 +1,4 @@
usr/bin/megaglest usr/games
-usr/bin/megaglest_configurator usr/games
usr/bin/megaglest_editor usr/games
usr/bin/megaglest_g3dviewer usr/games
usr/share
diff --git a/debian/patches/gcc4.7.patch b/debian/patches/gcc4.7.patch
deleted file mode 100644
index 23a9fca..0000000
--- a/debian/patches/gcc4.7.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Fix build failures with g++ 4.7
-Author: Sebastian Ramacher <s.ramacher at gmx.at>
-Last-Update: 2012-05-13
-Bug-Debian: http://bugs.debian.org/672014
---- a/source/shared_lib/sources/util/util.cpp
-+++ b/source/shared_lib/sources/util/util.cpp
-@@ -33,6 +33,7 @@
- #ifndef WIN32
- #include <errno.h>
- #endif
-+#include <unistd.h>
-
- #include "leak_dumper.h"
-
---- a/source/shared_lib/include/graphics/math_util.h
-+++ b/source/shared_lib/include/graphics/math_util.h
-@@ -184,10 +184,10 @@
-
- Rect2<T> computeBoundingRect() const{
- return Rect2i(
-- min(p[0].x, p[1].x),
-- min(p[0].y, p[2].y),
-- max(p[2].x, p[3].x),
-- max(p[1].y, p[3].y));
-+ std::min(p[0].x, p[1].x),
-+ std::min(p[0].y, p[2].y),
-+ std::max(p[2].x, p[3].x),
-+ std::max(p[1].y, p[3].y));
- }
-
- bool isInside(const Vec2<T> &pt) const{
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3e58d6e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-gcc4.7.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/megaglest.git
More information about the Pkg-games-commits
mailing list