r15426 - in packages/trunk/supertuxkart/debian: . patches

[Vincent Cheng]

Author: vcheng
Date: 2015-05-18 04:54:50 +0000 (Mon, 18 May 2015)
New Revision: 15426

Added:
   packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch
   packages/trunk/supertuxkart/debian/supertuxkart.lintian-overrides
Removed:
   packages/trunk/supertuxkart/debian/patches/build_against_system_enet_and_glew.patch
Modified:
   packages/trunk/supertuxkart/debian/changelog
   packages/trunk/supertuxkart/debian/control
   packages/trunk/supertuxkart/debian/patches/series
Log:
supertuxkart: revert r15422, dropping build-dep on libglew-dev and adding override


Modified: packages/trunk/supertuxkart/debian/changelog
===================================================================
--- packages/trunk/supertuxkart/debian/changelog	2015-05-16 04:29:59 UTC (rev 15425)
+++ packages/trunk/supertuxkart/debian/changelog	2015-05-18 04:54:50 UTC (rev 15426)
@@ -1,8 +1,8 @@
 supertuxkart (0.9-2) UNRELEASED; urgency=medium
 
-  * (fix lintian tag script-not-executable)
+  * Drop build-depends on libglew-dev; add lintian override for embedded glew.
 
- -- Vincent Cheng <vcheng at debian.org>  Thu, 14 May 2015 23:16:25 -0700
+ -- Vincent Cheng <vcheng at debian.org>  Sun, 17 May 2015 21:50:45 -0700
 
 supertuxkart (0.9-1) unstable; urgency=medium
 

Modified: packages/trunk/supertuxkart/debian/control
===================================================================
--- packages/trunk/supertuxkart/debian/control	2015-05-16 04:29:59 UTC (rev 15425)
+++ packages/trunk/supertuxkart/debian/control	2015-05-18 04:54:50 UTC (rev 15426)
@@ -15,7 +15,6 @@
  libcurl4-gnutls-dev | libcurl4-dev,
  libenet-dev (>= 1.3.1),
  libfribidi-dev,
- libglew-dev,
  libjpeg-dev,
  libopenal-dev,
  libpng-dev,

Added: packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch	                        (rev 0)
+++ packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch	2015-05-18 04:54:50 UTC (rev 15426)
@@ -0,0 +1,58 @@
+Description: Build supertuxkart against system enet instead of embedded copy
+Forwarded: not-yet
+Author: Vincent Cheng <vcheng at debian.org>
+Last-Update: 2015-05-13
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -60,9 +60,9 @@
+ add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet")
+ include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src")
+ 
+-# Build the ENet UDP network library
+-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
+-include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
++# ENet
++find_package(ENet REQUIRED)
++include_directories(${ENET_INCLUDE_DIR})
+ 
+ # Build glew library
+ add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
+@@ -307,11 +307,11 @@
+     bulletdynamics
+     bulletcollision
+     bulletmath
+-    enet
+     glew
+     stkirrlicht
+     angelscript
+     ${CURL_LIBRARIES}
++    ${ENET_LIBRARIES}
+     ${OGGVORBIS_LIBRARIES}
+     ${OPENAL_LIBRARY}
+     ${OPENGL_LIBRARIES}
+--- /dev/null
++++ b/cmake/FindENet.cmake
+@@ -0,0 +1,22 @@
++# - Find ENet
++# Find the ENet includes and libraries
++#
++# Following variables are provided:
++# ENET_FOUND
++#     True if ENet has been found
++# ENET_INCLUDE_DIR
++#     The include directories of ENet
++# ENET_LIBRARIES
++#     ENet library list
++
++
++find_path(ENET_INCLUDE_DIR enet/enet.h /usr/include)
++find_library(ENET_LIBRARY NAMES enet PATHS /usr/lib)
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(ENet DEFAULT_MSG ENET_INCLUDE_DIR ENET_LIBRARY)
++
++# Publish variables
++set(ENET_INCLUDE_DIRS ${ENET_INCLUDE_DIR})
++set(ENET_LIBRARIES ${ENET_LIBRARY})
++mark_as_advanced(ENET_INCLUDE_DIR ENET_LIBRARY)

Deleted: packages/trunk/supertuxkart/debian/patches/build_against_system_enet_and_glew.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/build_against_system_enet_and_glew.patch	2015-05-16 04:29:59 UTC (rev 15425)
+++ packages/trunk/supertuxkart/debian/patches/build_against_system_enet_and_glew.patch	2015-05-18 04:54:50 UTC (rev 15426)
@@ -1,68 +0,0 @@
-Description: Build supertuxkart against system enet and system glew, instead
- of embedded copies
-Forwarded: not-yet
-Author: Vincent Cheng <vcheng at debian.org>
-Last-Update: 2015-05-14
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,13 +60,13 @@
- add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet")
- include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src")
- 
--# Build the ENet UDP network library
--add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
--include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
--
--# Build glew library
--add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
--include_directories("${PROJECT_SOURCE_DIR}/lib/glew/include")
-+# ENet
-+find_package(ENet REQUIRED)
-+include_directories(${ENET_INCLUDE_DIR})
-+
-+# GLEW
-+find_package(GLEW REQUIRED)
-+include_directories(${GLEW_INCLUDE_DIRS})
- 
- if((WIN32 AND NOT MINGW) OR APPLE)
-     if (NOT APPLE)
-@@ -307,11 +307,11 @@
-     bulletdynamics
-     bulletcollision
-     bulletmath
--    enet
--    glew
-     stkirrlicht
-     angelscript
-     ${CURL_LIBRARIES}
-+    ${ENET_LIBRARIES}
-+    ${GLEW_LIBRARIES}
-     ${OGGVORBIS_LIBRARIES}
-     ${OPENAL_LIBRARY}
-     ${OPENGL_LIBRARIES}
---- /dev/null
-+++ b/cmake/FindENet.cmake
-@@ -0,0 +1,22 @@
-+# - Find ENet
-+# Find the ENet includes and libraries
-+#
-+# Following variables are provided:
-+# ENET_FOUND
-+#     True if ENet has been found
-+# ENET_INCLUDE_DIR
-+#     The include directories of ENet
-+# ENET_LIBRARIES
-+#     ENet library list
-+
-+
-+find_path(ENET_INCLUDE_DIR enet/enet.h /usr/include)
-+find_library(ENET_LIBRARY NAMES enet PATHS /usr/lib)
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(ENet DEFAULT_MSG ENET_INCLUDE_DIR ENET_LIBRARY)
-+
-+# Publish variables
-+set(ENET_INCLUDE_DIRS ${ENET_INCLUDE_DIR})
-+set(ENET_LIBRARIES ${ENET_LIBRARY})
-+mark_as_advanced(ENET_INCLUDE_DIR ENET_LIBRARY)

Modified: packages/trunk/supertuxkart/debian/patches/series
===================================================================
--- packages/trunk/supertuxkart/debian/patches/series	2015-05-16 04:29:59 UTC (rev 15425)
+++ packages/trunk/supertuxkart/debian/patches/series	2015-05-18 04:54:50 UTC (rev 15426)
@@ -1,4 +1,4 @@
-build_against_system_enet_and_glew.patch
+build_against_system_enet.patch
 link_against_system_libs.patch
 remove_irrlicht_embedded_libs.patch
 # Irrlicht patches taken directly from irrlicht source package in Debian

Added: packages/trunk/supertuxkart/debian/supertuxkart.lintian-overrides
===================================================================
--- packages/trunk/supertuxkart/debian/supertuxkart.lintian-overrides	                        (rev 0)
+++ packages/trunk/supertuxkart/debian/supertuxkart.lintian-overrides	2015-05-18 04:54:50 UTC (rev 15426)
@@ -0,0 +1,2 @@
+# http://sourceforge.net/p/glew/patches/40/
+supertuxkart: embedded-library usr/games/supertuxkart: glew