r15910 - in packages/trunk/freesynd/debian: . patches
Lubos Novak
lubos-guest at moszumanska.debian.org
Tue Oct 25 12:23:48 UTC 2016
Author: lubos-guest
Date: 2016-10-25 12:23:48 +0000 (Tue, 25 Oct 2016)
New Revision: 15910
Added:
packages/trunk/freesynd/debian/patches/install_icon.patch
packages/trunk/freesynd/debian/patches/spelling_errors.patch
Removed:
packages/trunk/freesynd/debian/dirs
packages/trunk/freesynd/debian/patches/cmake_installation.patch
Modified:
packages/trunk/freesynd/debian/changelog
packages/trunk/freesynd/debian/compat
packages/trunk/freesynd/debian/control
packages/trunk/freesynd/debian/freesynd.desktop
packages/trunk/freesynd/debian/patches/series
packages/trunk/freesynd/debian/rules
packages/trunk/freesynd/debian/watch
Log:
new upstream version 0.7.5
Modified: packages/trunk/freesynd/debian/changelog
===================================================================
--- packages/trunk/freesynd/debian/changelog 2016-10-24 23:38:49 UTC (rev 15909)
+++ packages/trunk/freesynd/debian/changelog 2016-10-25 12:23:48 UTC (rev 15910)
@@ -1,5 +1,5 @@
-freesynd (0.7.1+dfsg-1) UNRELEASED; urgency=low
+freesynd (0.7.5+dfsg-1) UNRELEASED; urgency=low
* Initial release. (Closes: #404762)
- -- Luboš Novák <alvinx12 at centrum.cz> Sat, 18 May 2013 09:27:40 +0100
\ No newline at end of file
+ -- Luboš Novák <alvinx12 at centrum.cz> Sat, 14 May 2016 10:05:51 +0100
\ No newline at end of file
Modified: packages/trunk/freesynd/debian/compat
===================================================================
--- packages/trunk/freesynd/debian/compat 2016-10-24 23:38:49 UTC (rev 15909)
+++ packages/trunk/freesynd/debian/compat 2016-10-25 12:23:48 UTC (rev 15910)
@@ -1 +1 @@
-9
+10
Modified: packages/trunk/freesynd/debian/control
===================================================================
--- packages/trunk/freesynd/debian/control 2016-10-24 23:38:49 UTC (rev 15909)
+++ packages/trunk/freesynd/debian/control 2016-10-25 12:23:48 UTC (rev 15910)
@@ -4,9 +4,8 @@
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Benoit Tuduri <tuduri.benoit at freesurf.fr>,
Luboš Novák <alvinx12 at centrum.cz>
-Build-Depends: debhelper (>= 9), libpng-dev, libsdl1.2-dev,
- libsdl-image1.2-dev, libsdl-mixer1.2-dev
-Standards-Version: 3.9.4
+Build-Depends: debhelper (>= 10), libpng-dev, libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev
+Standards-Version: 3.9.8
Homepage: http://freesynd.sourceforge.net/
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/freesynd/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/freesynd/
@@ -14,8 +13,8 @@
Package: freesynd
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: game-data-packager
Description: reimplementation of Syndicate game engine
Freesynd is a port of the famous game of BullFrog named Syndicate.
You manage a syndicate which it fight versus others with some futurists
weapons and humans cybernetics customization to win your quest.
-
Deleted: packages/trunk/freesynd/debian/dirs
===================================================================
--- packages/trunk/freesynd/debian/dirs 2016-10-24 23:38:49 UTC (rev 15909)
+++ packages/trunk/freesynd/debian/dirs 2016-10-25 12:23:48 UTC (rev 15910)
@@ -1,3 +0,0 @@
-usr/games
-usr/share/doc/freesynd
-usr/share/applications
Modified: packages/trunk/freesynd/debian/freesynd.desktop
===================================================================
--- packages/trunk/freesynd/debian/freesynd.desktop 2016-10-24 23:38:49 UTC (rev 15909)
+++ packages/trunk/freesynd/debian/freesynd.desktop 2016-10-25 12:23:48 UTC (rev 15910)
@@ -1,7 +1,9 @@
[Desktop Entry]
Type=Application
-Name=Free syndicate
-GenericName=freesynd
+Name=FreeSynd
+GenericName=Real-time tactical game
+Icon=freesynd
Exec=freesynd
Terminal=false
Categories=Game;StrategyGame;
+Keywords=combat;tactic;real-time;action;strategy;fiction;
\ No newline at end of file
Deleted: packages/trunk/freesynd/debian/patches/cmake_installation.patch
===================================================================
--- packages/trunk/freesynd/debian/patches/cmake_installation.patch 2016-10-24 23:38:49 UTC (rev 15909)
+++ packages/trunk/freesynd/debian/patches/cmake_installation.patch 2016-10-25 12:23:48 UTC (rev 15910)
@@ -1,69 +0,0 @@
-Index: freesynd-0.7.1/CMakeLists.txt
-===================================================================
---- freesynd-0.7.1.orig/CMakeLists.txt 2013-05-18 14:09:12.000000000 +0200
-+++ freesynd-0.7.1/CMakeLists.txt 2013-05-18 15:38:06.000000000 +0200
-@@ -34,9 +34,15 @@
- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_C_FLAGS}")
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXX_FLAGS}")
-
-+if(NOT DATA_DIR)
-+ if(UNIX)
-+ SET(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/freesynd/")
-+ endif(UNIX)
-+endif(NOT DATA_DIR)
-+
- # Set standard definitions for all platforms.
- add_definitions (-DSYSTEM_SDL)
--add_definitions (-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\")
-+add_definitions (-DPREFIX=\"${DATA_DIR}\")
-
- # Locate libs we depend on directly.
- find_package (SDL)
-@@ -66,7 +72,7 @@
- # We only define an install target if we're doing a release build.
- # Furthermore, on Mac, the data folder is a part of the app bundle.
- if (NOT APPLE)
-- install (DIRECTORY data DESTINATION share/freesynd PATTERN .svn EXCLUDE)
-+ install (DIRECTORY data DESTINATION ${DATA_DIR} PATTERN .svn EXCLUDE)
- endif ()
- endif ()
-
-Index: freesynd-0.7.1/src/CMakeLists.txt
-===================================================================
---- freesynd-0.7.1.orig/src/CMakeLists.txt 2013-05-18 14:09:12.000000000 +0200
-+++ freesynd-0.7.1/src/CMakeLists.txt 2013-05-18 15:38:06.000000000 +0200
-@@ -183,6 +183,12 @@
-
- target_link_libraries (freesynd ${PNG_LIBRARIES} ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLMIXER_LIBRARY})
-
-+if(NOT BIN_DIR)
-+ if(UNIX)
-+ SET(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
-+ endif(UNIX)
-+endif(NOT BIN_DIR)
-+
- if (BUILD_DEV_TOOLS)
- add_executable (dump
- dump.cpp
-@@ -203,7 +209,7 @@
- if (APPLE)
- install (TARGETS freesynd DESTINATION /Applications)
- else ()
-- install (TARGETS freesynd DESTINATION bin)
-+ install (TARGETS freesynd DESTINATION ${BIN_DIR})
- endif ()
- endif ()
-
-Index: freesynd-0.7.1/src/app.cpp
-===================================================================
---- freesynd-0.7.1.orig/src/app.cpp 2013-04-07 12:52:07.000000000 +0200
-+++ freesynd-0.7.1/src/app.cpp 2013-05-18 15:38:53.000000000 +0200
-@@ -187,7 +187,7 @@
- return false;
- }
- #else
-- ourDataDir = PREFIX"/share/freesynd/data";
-+ ourDataDir = PREFIX"/data";
- #endif
- }
- addMissingSlash(ourDataDir);
Added: packages/trunk/freesynd/debian/patches/install_icon.patch
===================================================================
--- packages/trunk/freesynd/debian/patches/install_icon.patch (rev 0)
+++ packages/trunk/freesynd/debian/patches/install_icon.patch 2016-10-25 12:23:48 UTC (rev 15910)
@@ -0,0 +1,14 @@
+Install icon
+
+Index: freesynd-0.7.5/CMakeLists.txt
+===================================================================
+--- freesynd-0.7.5.orig/CMakeLists.txt
++++ freesynd-0.7.5/CMakeLists.txt
+@@ -82,6 +82,7 @@ else ()
+ # Furthermore, on Mac, the data folder is a part of the app bundle.
+ if (UNIX)
+ install (DIRECTORY data DESTINATION ${DATA_DIR} PATTERN .svn EXCLUDE)
++ install (FILES "icon/sword.png" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/128x128/apps/" RENAME "freesynd.png")
+ endif ()
+ endif ()
+
Modified: packages/trunk/freesynd/debian/patches/series
===================================================================
--- packages/trunk/freesynd/debian/patches/series 2016-10-24 23:38:49 UTC (rev 15909)
+++ packages/trunk/freesynd/debian/patches/series 2016-10-25 12:23:48 UTC (rev 15910)
@@ -1 +1,2 @@
-cmake_installation.patch
+spelling_errors.patch
+install_icon.patch
Added: packages/trunk/freesynd/debian/patches/spelling_errors.patch
===================================================================
--- packages/trunk/freesynd/debian/patches/spelling_errors.patch (rev 0)
+++ packages/trunk/freesynd/debian/patches/spelling_errors.patch 2016-10-25 12:23:48 UTC (rev 15910)
@@ -0,0 +1,45 @@
+Fix spelling errors
+
+Index: freesynd-0.7.5/src/mission.cpp
+===================================================================
+--- freesynd-0.7.5.orig/src/mission.cpp
++++ freesynd-0.7.5/src/mission.cpp
+@@ -2236,7 +2236,7 @@ bool Mission::getWalkable(TilePoint &mtp
+ unsigned char twd;
+ do {
+ bz--;
+- // using lowered Z, at start postion is at top of tile not at bottom
++ // using lowered Z, at start position is at top of tile not at bottom
+ bx = mtp.tx * 256 + mtp.ox + 128 * (bz - 1);
+ box = bx % 256;
+ bx = bx / 256;
+Index: freesynd-0.7.5/src/pedpathfinding.cpp
+===================================================================
+--- freesynd-0.7.5.orig/src/pedpathfinding.cpp
++++ freesynd-0.7.5/src/pedpathfinding.cpp
+@@ -99,14 +99,14 @@ void PedInstance::setDestinationP(Missio
+ if(targetd->t == m_fdNonWalkable || map_ == -1 || health_ <= 0) {
+ printf("==== unwalk target: x %i; y %i; z %i, ox %i, oy %i\n",
+ x, y, z, ox, oy);
+- printf("setDestinationP, Movement to nonwalkable postion\n");
++ printf("setDestinationP, Movement to nonwalkable position\n");
+ return;
+ }
+
+ if(based->t == m_fdNonWalkable) {
+ printf("==== unwalk pos: x %i; y %i; z %i, ox %i, oy %i, oz %i\n",
+ pos_.tx, pos_.ty, pos_.tz, pos_.ox, pos_.oy, pos_.oz);
+- printf("setDestinationP, Movement from nonwalkable postion\n");
++ printf("setDestinationP, Movement from nonwalkable position\n");
+ return;
+ }
+
+@@ -2449,7 +2449,7 @@ uint8 PedInstance::moveToDir(Mission* m,
+ if (based->t == m_fdNonWalkable) {
+ printf("==== unwalk pos: x %i; y %i; z %i, ox %i, oy %i, oz %i\n",
+ pos_.tx, pos_.ty, pos_.tz, pos_.ox, pos_.oy, pos_.oz);
+- printf("moveToDir, Movement from nonwalkable postion\n");
++ printf("moveToDir, Movement from nonwalkable position\n");
+ return 8;
+ }
+
Modified: packages/trunk/freesynd/debian/rules
===================================================================
--- packages/trunk/freesynd/debian/rules 2016-10-24 23:38:49 UTC (rev 15909)
+++ packages/trunk/freesynd/debian/rules 2016-10-25 12:23:48 UTC (rev 15910)
@@ -1,17 +1,15 @@
#!/usr/bin/make -f
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
%:
dh $@ --buildsystem=cmake
override_dh_auto_configure:
dh_auto_configure -- -DCMAKE_BUILD_TYPE=release -DDATA_DIR="/usr/share/games/freesynd" -DBIN_DIR="/usr/games/"
-#override_dh_strip:
-# dh_strip --dbg-package=freesynd-dbg
+VERSION=0.7.5
-
-VERSION=0.7.1
-
get-orig-source:
uscan --upstream-version $(VERSION) --verbose --rename --force-download --destdir=$(CURDIR)
tar xf freesynd_$(VERSION).orig.tar.gz
Modified: packages/trunk/freesynd/debian/watch
===================================================================
--- packages/trunk/freesynd/debian/watch 2016-10-24 23:38:49 UTC (rev 15909)
+++ packages/trunk/freesynd/debian/watch 2016-10-25 12:23:48 UTC (rev 15910)
@@ -1,3 +1,4 @@
version=3
+opts=dversionmangle=s/\.dfsg\.\d+// \
http://sf.net/freesynd/freesynd-([\d\.]+)\.tar\.gz
More information about the Pkg-games-commits
mailing list