r7143 - in packages/trunk/libclaw/debian: . patches
Julien Jorge
j-jorge-guest at alioth.debian.org
Wed May 21 18:18:07 UTC 2008
Author: j-jorge-guest
Date: 2008-05-21 18:18:07 +0000 (Wed, 21 May 2008)
New Revision: 7143
Added:
packages/trunk/libclaw/debian/patches/cmake-version.diff
packages/trunk/libclaw/debian/patches/fix-g++-4.3.diff
Modified:
packages/trunk/libclaw/debian/libclaw-dev.install
packages/trunk/libclaw/debian/patches/series
Log:
- Fix compilation issues with g++ 4.3
- Fix a warning about the version of CMake
Modified: packages/trunk/libclaw/debian/libclaw-dev.install
===================================================================
--- packages/trunk/libclaw/debian/libclaw-dev.install 2008-05-21 17:57:57 UTC (rev 7142)
+++ packages/trunk/libclaw/debian/libclaw-dev.install 2008-05-21 18:18:07 UTC (rev 7143)
@@ -70,4 +70,4 @@
debian/tmp/usr/include/claw/tree.hpp usr/include/claw
debian/tmp/usr/bin/* usr/bin
-debian/tmp/usr/share/cmake-2.4/Modules/* usr/share/cmake-2.4/Modules
+debian/tmp/usr/share/cmake-*/Modules/* usr/share/cmake-*/Modules
Added: packages/trunk/libclaw/debian/patches/cmake-version.diff
===================================================================
--- packages/trunk/libclaw/debian/patches/cmake-version.diff (rev 0)
+++ packages/trunk/libclaw/debian/patches/cmake-version.diff 2008-05-21 18:18:07 UTC (rev 7143)
@@ -0,0 +1,282 @@
+Index: libclaw-1.5.2b/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/CMakeLists.txt 2008-05-21 20:04:59.000000000 +0200
++++ libclaw-1.5.2b/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,7 @@
++cmake_minimum_required(VERSION 2.4)
++
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw)
+
+ INCLUDE_DIRECTORIES(.)
+Index: libclaw-1.5.2b/claw/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/claw/CMakeLists.txt 2008-05-21 20:05:17.000000000 +0200
++++ libclaw-1.5.2b/claw/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw)
+
+ SUBDIRS( impl )
+Index: libclaw-1.5.2b/claw/impl/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/claw/impl/CMakeLists.txt 2008-05-21 20:05:17.000000000 +0200
++++ libclaw-1.5.2b/claw/impl/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw)
+
+ FILE(GLOB CLAW_CODE "*.[ti]pp")
+Index: libclaw-1.5.2b/cmake-module/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/cmake-module/CMakeLists.txt 2008-05-21 20:05:17.000000000 +0200
++++ libclaw-1.5.2b/cmake-module/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw:cmake-modules)
+
+ IF( NOT CLAW_CMAKE_MODULES_INSTALL_PATH )
+Index: libclaw-1.5.2b/doc/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/doc/CMakeLists.txt 2008-05-21 20:05:17.000000000 +0200
++++ libclaw-1.5.2b/doc/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw)
+
+ INCLUDE( ${CMAKE_ROOT}/Modules/FindDoxygen.cmake OPTIONAL )
+Index: libclaw-1.5.2b/examples/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/examples/CMakeLists.txt 2008-05-21 20:05:20.000000000 +0200
++++ libclaw-1.5.2b/examples/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw-examples)
+
+ SUBDIRS(
+Index: libclaw-1.5.2b/examples/application/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/examples/application/CMakeLists.txt 2008-05-21 20:05:19.000000000 +0200
++++ libclaw-1.5.2b/examples/application/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw-application-example)
+
+ # check profiling mode
+Index: libclaw-1.5.2b/examples/automate/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/examples/automate/CMakeLists.txt 2008-05-21 20:05:17.000000000 +0200
++++ libclaw-1.5.2b/examples/automate/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw-automaton-example)
+
+ # check profiling mode
+Index: libclaw-1.5.2b/examples/avl/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/examples/avl/CMakeLists.txt 2008-05-21 20:05:18.000000000 +0200
++++ libclaw-1.5.2b/examples/avl/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw-avl-example)
+
+ # check profiling mode
+Index: libclaw-1.5.2b/examples/compress/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/examples/compress/CMakeLists.txt 2008-05-21 20:05:21.000000000 +0200
++++ libclaw-1.5.2b/examples/compress/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw-codec-example)
+
+ # common flags
+Index: libclaw-1.5.2b/examples/config_file/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/examples/config_file/CMakeLists.txt 2008-05-21 20:05:19.000000000 +0200
++++ libclaw-1.5.2b/examples/config_file/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw-config_file-example)
+
+ # check profiling mode
+Index: libclaw-1.5.2b/examples/dynamic_library/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/examples/dynamic_library/CMakeLists.txt 2008-05-21 20:05:20.000000000 +0200
++++ libclaw-1.5.2b/examples/dynamic_library/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw-dynamic_library-example)
+
+ # check profiling mode
+Index: libclaw-1.5.2b/examples/graphe/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/examples/graphe/CMakeLists.txt 2008-05-21 20:05:20.000000000 +0200
++++ libclaw-1.5.2b/examples/graphe/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw-graph-example)
+
+ # check profiling mode
+Index: libclaw-1.5.2b/examples/ia_jeux/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/examples/ia_jeux/CMakeLists.txt 2008-05-21 20:05:18.000000000 +0200
++++ libclaw-1.5.2b/examples/ia_jeux/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw-ai-example)
+
+ SUBDIRS(allumettes morpion_console)
+Index: libclaw-1.5.2b/examples/ia_jeux/allumettes/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/examples/ia_jeux/allumettes/CMakeLists.txt 2008-05-21 20:05:18.000000000 +0200
++++ libclaw-1.5.2b/examples/ia_jeux/allumettes/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw-allumettes-example)
+
+ # check profiling mode
+Index: libclaw-1.5.2b/examples/ia_jeux/morpion_console/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/examples/ia_jeux/morpion_console/CMakeLists.txt 2008-05-21 20:05:18.000000000 +0200
++++ libclaw-1.5.2b/examples/ia_jeux/morpion_console/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw-morpion-example)
+
+ # check profiling mode
+Index: libclaw-1.5.2b/examples/image/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/examples/image/CMakeLists.txt 2008-05-21 20:05:18.000000000 +0200
++++ libclaw-1.5.2b/examples/image/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw-image-example)
+
+ # check profiling mode
+Index: libclaw-1.5.2b/examples/iterator/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/examples/iterator/CMakeLists.txt 2008-05-21 20:05:21.000000000 +0200
++++ libclaw-1.5.2b/examples/iterator/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw-iterator-example)
+
+ # check profiling mode
+Index: libclaw-1.5.2b/examples/kmp/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/examples/kmp/CMakeLists.txt 2008-05-21 20:05:19.000000000 +0200
++++ libclaw-1.5.2b/examples/kmp/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw-kmp-example)
+
+ # check profiling mode
+Index: libclaw-1.5.2b/examples/memory/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/examples/memory/CMakeLists.txt 2008-05-21 20:05:20.000000000 +0200
++++ libclaw-1.5.2b/examples/memory/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw-memory)
+
+ # check profiling mode
+Index: libclaw-1.5.2b/examples/multi_type_map/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/examples/multi_type_map/CMakeLists.txt 2008-05-21 20:05:19.000000000 +0200
++++ libclaw-1.5.2b/examples/multi_type_map/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw-multi_type_map)
+
+ # check profiling mode
+Index: libclaw-1.5.2b/examples/ordered_set/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/examples/ordered_set/CMakeLists.txt 2008-05-21 20:05:19.000000000 +0200
++++ libclaw-1.5.2b/examples/ordered_set/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw-ordered_set-example)
+
+ # check profiling mode
+Index: libclaw-1.5.2b/examples/singleton/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/examples/singleton/CMakeLists.txt 2008-05-21 20:05:19.000000000 +0200
++++ libclaw-1.5.2b/examples/singleton/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw-singleton-example)
+
+ # check profiling mode
+Index: libclaw-1.5.2b/examples/sockets/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/examples/sockets/CMakeLists.txt 2008-05-21 20:05:20.000000000 +0200
++++ libclaw-1.5.2b/examples/sockets/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw-sockets-example)
+
+ # check profiling mode
+Index: libclaw-1.5.2b/examples/string_algorithm/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/examples/string_algorithm/CMakeLists.txt 2008-05-21 20:05:20.000000000 +0200
++++ libclaw-1.5.2b/examples/string_algorithm/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw-string_algorithm-example)
+
+ # check profiling mode
+Index: libclaw-1.5.2b/examples/system/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/examples/system/CMakeLists.txt 2008-05-21 20:05:18.000000000 +0200
++++ libclaw-1.5.2b/examples/system/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw-system-example)
+
+ # check profiling mode
+Index: libclaw-1.5.2b/examples/trie/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/examples/trie/CMakeLists.txt 2008-05-21 20:05:19.000000000 +0200
++++ libclaw-1.5.2b/examples/trie/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ PROJECT(claw-trie-example)
+
+ # check profiling mode
+Index: libclaw-1.5.2b/win/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/win/CMakeLists.txt 2008-05-21 20:05:21.000000000 +0200
++++ libclaw-1.5.2b/win/CMakeLists.txt 2008-05-21 20:08:20.000000000 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.4)
++
+ CONFIGURE_FILE(
+ "${CMAKE_CURRENT_SOURCE_DIR}/definitions.txt.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/definitions.txt"
Added: packages/trunk/libclaw/debian/patches/fix-g++-4.3.diff
===================================================================
--- packages/trunk/libclaw/debian/patches/fix-g++-4.3.diff (rev 0)
+++ packages/trunk/libclaw/debian/patches/fix-g++-4.3.diff 2008-05-21 18:18:07 UTC (rev 7143)
@@ -0,0 +1,127 @@
+Index: libclaw-1.5.2b/claw/code/logger.cpp
+===================================================================
+--- libclaw-1.5.2b.orig/claw/code/logger.cpp 2008-05-21 17:12:59.000000000 +0000
++++ libclaw-1.5.2b/claw/code/logger.cpp 2008-05-21 17:13:46.000000000 +0000
+@@ -29,6 +29,8 @@
+ */
+ #include <claw/logger.hpp>
+
++#include <algorithm>
++
+ namespace claw
+ {
+ log_system logger;
+Index: libclaw-1.5.2b/claw/code/pcx_reader.cpp
+===================================================================
+--- libclaw-1.5.2b.orig/claw/code/pcx_reader.cpp 2008-05-21 17:14:59.000000000 +0000
++++ libclaw-1.5.2b/claw/code/pcx_reader.cpp 2008-05-21 17:15:21.000000000 +0000
+@@ -30,6 +30,8 @@
+ #include <claw/pcx.hpp>
+ #include <claw/exception.hpp>
+
++#include <limits>
++
+ /*----------------------------------------------------------------------------*/
+ /**
+ * \brief Converts a scan line of a monochrome pcx into 32 bpp pixels.
+Index: libclaw-1.5.2b/claw/code/png_reader.cpp
+===================================================================
+--- libclaw-1.5.2b.orig/claw/code/png_reader.cpp 2008-05-21 17:16:00.000000000 +0000
++++ libclaw-1.5.2b/claw/code/png_reader.cpp 2008-05-21 17:16:22.000000000 +0000
+@@ -32,6 +32,8 @@
+ #include <claw/exception.hpp>
+ #include <claw/assert.hpp>
+
++#include <limits>
++
+ /*----------------------------------------------------------------------------*/
+ /**
+ * \brief Read data from the input stream.
+Index: libclaw-1.5.2b/claw/impl/game_ai.tpp
+===================================================================
+--- libclaw-1.5.2b.orig/claw/impl/game_ai.tpp 2008-05-21 17:27:00.000000000 +0000
++++ libclaw-1.5.2b/claw/impl/game_ai.tpp 2008-05-21 17:27:52.000000000 +0000
+@@ -29,6 +29,8 @@
+ */
+ #include <claw/max_vector.hpp>
+
++#include <cstdlib>
++
+ //**************************** gamestate **************************************
+
+ /*---------------------------------------------------------------------------*/
+Index: libclaw-1.5.2b/claw/impl/graph.tpp
+===================================================================
+--- libclaw-1.5.2b.orig/claw/impl/graph.tpp 2008-05-21 17:20:27.000000000 +0000
++++ libclaw-1.5.2b/claw/impl/graph.tpp 2008-05-21 17:22:04.000000000 +0000
+@@ -29,6 +29,8 @@
+ */
+ #include <stack>
+ #include <cassert>
++#include <algorithm>
++
+ #include <claw/functional.hpp>
+
+ //*************************** graph_exception *********************************
+Index: libclaw-1.5.2b/claw/socket_traits_unix.hpp
+===================================================================
+--- libclaw-1.5.2b.orig/claw/socket_traits_unix.hpp 2008-05-21 17:18:26.000000000 +0000
++++ libclaw-1.5.2b/claw/socket_traits_unix.hpp 2008-05-21 17:18:52.000000000 +0000
+@@ -36,6 +36,7 @@
+ #include <netinet/in.h>
+ #include <netdb.h>
+ #include <unistd.h>
++#include <cstring>
+
+ #include <claw/assert.hpp>
+
+Index: libclaw-1.5.2b/examples/graphe/mk_test.cpp
+===================================================================
+--- libclaw-1.5.2b.orig/examples/graphe/mk_test.cpp 2008-05-21 17:23:12.000000000 +0000
++++ libclaw-1.5.2b/examples/graphe/mk_test.cpp 2008-05-21 17:23:52.000000000 +0000
+@@ -2,6 +2,7 @@
+ #include <sstream>
+ #include <math.h>
+ #include <time.h>
++#include <stdlib.h>
+
+ int main(int argc, char* argv[])
+ {
+Index: libclaw-1.5.2b/examples/ia_jeux/allumettes/allumettes.hpp
+===================================================================
+--- libclaw-1.5.2b.orig/examples/ia_jeux/allumettes/allumettes.hpp 2008-05-21 17:28:59.000000000 +0000
++++ libclaw-1.5.2b/examples/ia_jeux/allumettes/allumettes.hpp 2008-05-21 17:29:25.000000000 +0000
+@@ -8,6 +8,8 @@
+
+ #include "claw/game_ai.hpp"
+
++#include <iostream>
++
+ /**
+ * \brief Représentation de l'état du jeu.
+ */
+Index: libclaw-1.5.2b/examples/ia_jeux/morpion_console/morpion.hpp
+===================================================================
+--- libclaw-1.5.2b.orig/examples/ia_jeux/morpion_console/morpion.hpp 2008-05-21 17:29:52.000000000 +0000
++++ libclaw-1.5.2b/examples/ia_jeux/morpion_console/morpion.hpp 2008-05-21 17:30:17.000000000 +0000
+@@ -8,6 +8,8 @@
+
+ #include "claw/game_ai.hpp"
+
++#include <iostream>
++
+ //*********************** symbole_morpion ************************************
+
+ /** \brief Les symboles que l'on peut trouver dans les cases. */
+Index: libclaw-1.5.2b/examples/ordered_set/main.cpp
+===================================================================
+--- libclaw-1.5.2b.orig/examples/ordered_set/main.cpp 2008-05-21 17:24:34.000000000 +0000
++++ libclaw-1.5.2b/examples/ordered_set/main.cpp 2008-05-21 17:25:41.000000000 +0000
+@@ -8,6 +8,7 @@
+ #include <string>
+ #include <iostream>
+ #include <sstream>
++#include <cstdlib>
+
+ #include "claw/ordered_set.hpp"
+
Modified: packages/trunk/libclaw/debian/patches/series
===================================================================
--- packages/trunk/libclaw/debian/patches/series 2008-05-21 17:57:57 UTC (rev 7142)
+++ packages/trunk/libclaw/debian/patches/series 2008-05-21 18:18:07 UTC (rev 7143)
@@ -1,2 +1,4 @@
fix-soname.diff
add-html-doc.diff
+fix-g++-4.3.diff
+cmake-version.diff
More information about the Pkg-games-commits
mailing list