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

Sat Dec 29 07:05:35 UTC 2012

Author: vincentc-guest
Date: 2012-12-29 07:05:34 +0000 (Sat, 29 Dec 2012)
New Revision: 13926

Modified:
   packages/trunk/supertuxkart/debian/changelog
   packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch
   packages/trunk/supertuxkart/debian/patches/fix_desktop_file.patch
   packages/trunk/supertuxkart/debian/rules
Log:
supertuxkart: Refresh patches


Modified: packages/trunk/supertuxkart/debian/changelog
===================================================================

--- packages/trunk/supertuxkart/debian/changelog	2012-12-29 06:47:36 UTC (rev 13925)
+++ packages/trunk/supertuxkart/debian/changelog	2012-12-29 07:05:34 UTC (rev 13926)
@@ -3,6 +3,7 @@
   * New upstream release.
     - Remove backport_cmake.patch and build_with_irrlicht_1.8.patch; applied
       upstream.
+    - Refresh remaining patches.
 
  -- Vincent Cheng <Vincentc1208 at gmail.com>  Fri, 28 Dec 2012 22:45:14 -0800
 

Modified: packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch	2012-12-29 06:47:36 UTC (rev 13925)
+++ packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch	2012-12-29 07:05:34 UTC (rev 13926)
@@ -1,34 +1,22 @@
 Description: Build supertuxkart against system enet instead of embedded copy
- Note that this patch must be applied _after_ backport_cmake.patch.
 Forwarded: not-yet
 Author: Vincent Cheng <Vincentc1208 at gmail.com>
-Last-Update: 2012-05-31
+Last-Update: 2012-12-28
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -19,19 +19,15 @@
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
+@@ -28,10 +28,6 @@
+ add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet")
+ include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src")
  
- # Define install paths
--set(STK_INSTALL_BINARY_DIR "bin" CACHE
-+set(STK_INSTALL_BINARY_DIR "games" CACHE
-     STRING "Install executable to this directory, absolute or relative to CMAKE_INSTALL_PREFIX")
--set(STK_INSTALL_DATA_DIR "share/supertuxkart" CACHE
-+set(STK_INSTALL_DATA_DIR "share/games/supertuxkart" CACHE
-     STRING "Install data folder to this directory, absolute or relative to CMAKE_INSTALL_PREFIX")
- 
- # Build the Bullet physics library
- add_subdirectory("${STK_SOURCE_DIR}/bullet")
- include_directories("${STK_SOURCE_DIR}/bullet/src")
- 
 -# Build the ENet UDP network library
--add_subdirectory("${STK_SOURCE_DIR}/enet")
--include_directories("${STK_SOURCE_DIR}/enet/include")
+-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
+-include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
 -
  # Build the Wiiuse library
  if(USE_WIIUSE)
-     add_subdirectory("${STK_SOURCE_DIR}/wiiuse")
-@@ -64,6 +60,10 @@
+     add_subdirectory("${PROJECT_SOURCE_DIR}/lib/wiiuse")
+@@ -60,6 +56,10 @@
  find_package(CURL REQUIRED)
  include_directories(${CURL_INCLUDE_DIRS})
  
@@ -39,7 +27,7 @@
  # Fribidi
  if(USE_FRIBIDI)
      find_package(Fribidi)
-@@ -158,8 +158,8 @@
+@@ -189,8 +189,8 @@
      bulletdynamics
      bulletcollision
      bulletmath
@@ -48,7 +36,7 @@
 +    ${ENET_LIBRARIES}
      ${IRRLICHT_LIBRARIES}
      ${OGGVORBIS_LIBRARIES}
-     ${OPENAL_LIBRARY}
+     ${IRRLICHT_LIBRARY}
 --- /dev/null
 +++ b/cmake/FindENet.cmake
 @@ -0,0 +1,22 @@

Modified: packages/trunk/supertuxkart/debian/patches/fix_desktop_file.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/fix_desktop_file.patch	2012-12-29 06:47:36 UTC (rev 13925)
+++ packages/trunk/supertuxkart/debian/patches/fix_desktop_file.patch	2012-12-29 07:05:34 UTC (rev 13926)
@@ -1,26 +1,22 @@
 Description: Fix various issues found in desktop menu entry file
- - Fix issues found by desktop-file-validate (deprecated Encoding key, Version
-   key with incorrect value).
- - Change Icon path to a valid path on Debian systems.
- - Make translations less specific to localization. See #667640
+ - Fix issue found by desktop-file-validate (deprecated Encoding key)
+ - Make translations less specific to localization. See Debian BTS #667640
  - Original .desktop file in past STK versions on Debian had extra fields in
    Categories, which ended up showing STK's menu entry in multiple locations;
    remove these extra fields. See LP: #709987
-Forwarded: https://sourceforge.net/apps/trac/supertuxkart/ticket/632
+Forwarded: http://sourceforge.net/apps/trac/supertuxkart/ticket/632
+           http://sourceforge.net/apps/trac/supertuxkart/ticket/841
 Bug-Debian: http://bugs.debian.org/667640
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/709987
-Last-Update: 05-10-2012
+Last-Update: 2012-12-28
 
 --- a/data/supertuxkart_desktop.template
 +++ b/data/supertuxkart_desktop.template
-@@ -1,16 +1,15 @@
+@@ -1,12 +1,11 @@
  [Desktop Entry]
 -Encoding=UTF-8
  Name=SuperTuxKart
--Version=VERSION
--Icon=PREFIX/share/pixmaps/supertuxkart_64.xpm
-+Version=1.0
-+Icon=supertuxkart
+ Icon=@PREFIX@/share/pixmaps/supertuxkart_64.xpm
  GenericName=A kart racing game
 -GenericName[de_DE]=Ein Kart-Rennspiel
 -GenericName[fr_FR]=Un jeu de karting
@@ -28,13 +24,7 @@
 +GenericName[fr]=Un jeu de karting
  GenericName[gl]=Xogo de carreiras con karts
 -GenericName[ro_RO]=Un joc de curse cu carturi
--Exec=PREFIX/games/supertuxkart --log=file
 +GenericName[ro]=Un joc de curse cu carturi
-+Exec=supertuxkart --log=file
+ Exec=@PREFIX@/games/supertuxkart --log=file
  Terminal=false
  StartupNotify=false
- Type=Application
--TryExec=PREFIX/games/supertuxkart
-+TryExec=supertuxkart
- Categories=Game;ArcadeGame;
-\ No newline at end of file

Modified: packages/trunk/supertuxkart/debian/rules
===================================================================
--- packages/trunk/supertuxkart/debian/rules	2012-12-29 06:47:36 UTC (rev 13925)
+++ packages/trunk/supertuxkart/debian/rules	2012-12-29 07:05:34 UTC (rev 13926)
@@ -13,7 +13,8 @@
 	# Generate sources.cmake
 	sh update_file_list.sh
 	
-	dh_auto_configure
+	dh_auto_configure -DSTK_INSTALL_BINARY_DIR="games" \
+	                  -DSTK_INSTALL_DATA_DIR="share/games/supertuxkart"
 
 override_dh_auto_build:
 	# Generate manual page


