Package: release.debian.org Severity: normal User: [email protected] Usertags: unblock
Please unblock package fife This upload fixes RC bug #690370 (copyright issue), plus a fix for embedded- library lintian autoreject, which prevents fife from being accepted. unblock fife/0.3.3+r3-1.1 -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 3.2.0-4-amd64 (SMP w/8 CPU cores)
diff -Nru fife-0.3.3+r3/debian/changelog fife-0.3.3+r3/debian/changelog --- fife-0.3.3+r3/debian/changelog 2012-04-22 19:52:01.000000000 +0200 +++ fife-0.3.3+r3/debian/changelog 2012-10-26 20:55:12.000000000 +0200 @@ -1,3 +1,12 @@ +fife (0.3.3+r3-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Add engine/core/util/utf8/utf8* to copyright file (Closes: #690370) + * Use packaged version of Glee-library to fix lintian embedded-library + autoreject tag. + + -- Anton Gladky <[email protected]> Wed, 24 Oct 2012 21:15:06 +0200 + fife (0.3.3+r3-1) unstable; urgency=low * New upstream release diff -Nru fife-0.3.3+r3/debian/control fife-0.3.3+r3/debian/control --- fife-0.3.3+r3/debian/control 2012-04-22 20:17:37.000000000 +0200 +++ fife-0.3.3+r3/debian/control 2012-10-26 20:49:50.000000000 +0200 @@ -24,7 +24,8 @@ libguichan-dev, libtinyxml-dev, libpng-dev, - libunittest++-dev + libunittest++-dev, + glee-dev X-Python-Version: >= 2.6 Vcs-Git: git://git.debian.org/git/pkg-games/fife.git Vcs-Browser: http://git.debian.org/?p=pkg-games/fife.git diff -Nru fife-0.3.3+r3/debian/copyright fife-0.3.3+r3/debian/copyright --- fife-0.3.3+r3/debian/copyright 2012-03-27 19:27:15.000000000 +0200 +++ fife-0.3.3+r3/debian/copyright 2012-10-26 20:53:35.000000000 +0200 @@ -13,6 +13,10 @@ Copyright: 2009 Ben Woodhouse License: BSD-2-clause +Files: engine/core/util/utf8/utf8.h engine/core/util/utf8/* +Copyright: 2006 Nemanja Trifunovic +License: Boost-Software-License + Files: engine/core/ext/tinyxml Copyright: 2000-2006 Lee Thomason, Yves Berquin, @@ -110,3 +114,27 @@ 3. This notice may not be removed or altered from any source distribution. + +License: Boost-Software-License + Permission is hereby granted, free of charge, to any person or organization + obtaining a copy of the software and accompanying documentation covered by + this license (the "Software") to use, reproduce, display, distribute, + 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 + SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + diff -Nru fife-0.3.3+r3/debian/patches/remove_glee.patch fife-0.3.3+r3/debian/patches/remove_glee.patch --- fife-0.3.3+r3/debian/patches/remove_glee.patch 1970-01-01 01:00:00.000000000 +0100 +++ fife-0.3.3+r3/debian/patches/remove_glee.patch 2012-10-26 20:49:50.000000000 +0200 @@ -0,0 +1,64 @@ +Description: use packaged version of glee +Author: Anton Gladky <[email protected]> +Last-Update: 2012-10-24 + +--- a/engine/core/video/opengl/fife_opengl.h ++++ b/engine/core/video/opengl/fife_opengl.h +@@ -25,7 +25,7 @@ + // Standard C++ library includes + + // 3rd party library includes +-#include "ext/glee/GLee.h" ++#include <GLee.h> + + // GLee.h includes windows.h when on a windows platform + // In winnt.h (which is included from windows.h) DELETE +--- a/doc/dependencies/filedeps.dot ++++ b/doc/dependencies/filedeps.dot +@@ -111,7 +111,6 @@ + "engine/core/eventchannel/key/ec_keyevent.h" -> "eventchannel/source/ec_ieventsource.h" + "engine/core/eventchannel/mouse/ec_mouseevent.h" -> "eventchannel/base/ec_inputevent.h" + "engine/core/eventchannel/source/ec_ieventsource.h" -> "ec_eventsourcetypes.h" +- "engine/core/ext/glee/GLee.cpp" -> "GLee.h" + "engine/core/ext/tinyxml/fife_tinyxml.h" -> "tinyxml.h" + "engine/core/ext/tinyxml/tinystr.cpp" -> "tinystr.h" + "engine/core/ext/tinyxml/tinyxml.cpp" -> "tinyxml.h" +@@ -633,7 +632,6 @@ + "engine/core/video/imagemanager.h" -> "util/base/singleton.h" + "engine/core/video/imagemanager.h" -> "util/resource/resource.h" + "engine/core/video/imagemanager.h" -> "util/resource/resourcemanager.h" +- "engine/core/video/opengl/fife_opengl.h" -> "ext/glee/GLee.h" + "engine/core/video/opengl/glimage.cpp" -> "glimage.h" + "engine/core/video/opengl/glimage.cpp" -> "util/structures/rect.h" + "engine/core/video/opengl/glimage.cpp" -> "video/opengl/renderbackendopengl.h" +@@ -886,4 +884,4 @@ + "engine/core/view/visual.h" -> "util/math/angles.h" + "engine/core/view/visual.h" -> "util/structures/rect.h" + "engine/core/view/visual.h" -> "video/animation.h" +-} +\ No newline at end of file ++} +--- a/build/linux2-config.py ++++ b/build/linux2-config.py +@@ -93,7 +93,7 @@ + return libs + + def getOptionalLibs(opengl): +- libs = [('tinyxml', 'tinyxml.h')] ++ libs = [('tinyxml', 'tinyxml.h'), ('glee', 'Glee.h')] + + return libs + +--- a/engine/core/ext/glee/GLee.cpp ++++ b/engine/core/ext/glee/GLee.cpp +@@ -1,3 +1,4 @@ ++#if 0 + /*************************************************************************** + * + * GLee.c +@@ -18168,3 +18169,5 @@ + __GLeeExtList_clean(&extensionNames); + return GL_TRUE; + } ++ ++#endif diff -Nru fife-0.3.3+r3/debian/patches/series fife-0.3.3+r3/debian/patches/series --- fife-0.3.3+r3/debian/patches/series 2012-04-22 19:50:02.000000000 +0200 +++ fife-0.3.3+r3/debian/patches/series 2012-10-26 20:49:50.000000000 +0200 @@ -1,2 +1,3 @@ support-parallel-build.diff add-kfreebsd-gnu-configuration.diff +remove_glee.patch
