r14175 - in packages/trunk/freesynd/debian: . patches source

Lubos Novak lubos-guest at alioth.debian.org
Tue May 28 13:48:51 UTC 2013


Author: lubos-guest
Date: 2013-05-28 13:48:50 +0000 (Tue, 28 May 2013)
New Revision: 14175

Added:
   packages/trunk/freesynd/debian/freesynd.manpages
   packages/trunk/freesynd/debian/patches/cmake_installation.patch
   packages/trunk/freesynd/debian/source/
   packages/trunk/freesynd/debian/source/format
Removed:
   packages/trunk/freesynd/debian/THANKS
Modified:
   packages/trunk/freesynd/debian/changelog
   packages/trunk/freesynd/debian/compat
   packages/trunk/freesynd/debian/control
   packages/trunk/freesynd/debian/copyright
   packages/trunk/freesynd/debian/docs
   packages/trunk/freesynd/debian/freesynd.6
   packages/trunk/freesynd/debian/freesynd.install
   packages/trunk/freesynd/debian/patches/series
   packages/trunk/freesynd/debian/rules
   packages/trunk/freesynd/debian/watch
Log:
new upstream version 0.7.1

Deleted: packages/trunk/freesynd/debian/THANKS
===================================================================
--- packages/trunk/freesynd/debian/THANKS	2013-05-28 02:08:24 UTC (rev 14174)
+++ packages/trunk/freesynd/debian/THANKS	2013-05-28 13:48:50 UTC (rev 14175)
@@ -1,16 +0,0 @@
-I would like to give thanks at the following persons for their helps and
-kidness :
-Myriam Ruiz
-Gonéri LE BOUDER
-Cyril Brulebois
-Samuel Hocevar
-
-And too, the freesynd developers :
-Bruce Sutherland
-Davor Ocelic
-Anders Eurenius
-Joost Peters
-Trent Waddington
-Stuart Bingë
-Tarjei Knapstad
-Unavowed

Modified: packages/trunk/freesynd/debian/changelog
===================================================================
--- packages/trunk/freesynd/debian/changelog	2013-05-28 02:08:24 UTC (rev 14174)
+++ packages/trunk/freesynd/debian/changelog	2013-05-28 13:48:50 UTC (rev 14175)
@@ -1,16 +1,5 @@
-freesynd (0.2.dsfg-1.1) UNRELEASED; urgency=low
+freesynd (0.7.1-1) UNRELEASED; urgency=low
 
-  * Close the ITP number for freesynd (Closes: #404762)
-  * 
+  * Initial release. (Closes: #404762)
 
- -- benoit <benoit at maracuja>  Sun, 29 Jun 2008 13:50:11 +0200
-
-freesynd (0.2.dsfg-1) unstable; urgency=low
-
-  [ Benoit Tuduri ]
-  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
-
-  [ Ansgar Burchardt ]
-  * debian/control: move Homepage from Description into its own field
-
- -- Benoit Tuduri <tuduri.benoit at freesurf.fr>  Mon, 25 Feb 2008 20:05:55 +0100
+ -- Luboš Novák <alvinx12 at centrum.cz>  Sat, 18 May 2013 09:27:40 +0100
\ No newline at end of file

Modified: packages/trunk/freesynd/debian/compat
===================================================================
--- packages/trunk/freesynd/debian/compat	2013-05-28 02:08:24 UTC (rev 14174)
+++ packages/trunk/freesynd/debian/compat	2013-05-28 13:48:50 UTC (rev 14175)
@@ -1 +1 @@
-5
+9

Modified: packages/trunk/freesynd/debian/control
===================================================================
--- packages/trunk/freesynd/debian/control	2013-05-28 02:08:24 UTC (rev 14174)
+++ packages/trunk/freesynd/debian/control	2013-05-28 13:48:50 UTC (rev 14175)
@@ -1,17 +1,20 @@
 Source: freesynd
-Section: games
+Section: contrib/games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Benoit Tuduri <tuduri.benoit at freesurf.fr>
-Build-Depends: debhelper (>= 5), quilt, unzip, libpng12-dev
-               libsdl1.2-dev (>= 1.2.13-2), libsdl-mixer1.2-dev (>= 1.2.8-3)
-Standards-Version: 3.7.3
+Uploaders: Benoit Tuduri <tuduri.benoit at freesurf.fr>,
+ Luboš Novák <alvinx12 at centrum.cz>
+Build-Depends: debhelper (>= 8), libpng-dev, libsdl1.2-dev,
+ libsdl-image1.2-dev, libsdl-mixer1.2-dev
+Standards-Version: 3.9.4
 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/
 
 Package: freesynd
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: freesynd is a portage of syndicate game
+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.

Modified: packages/trunk/freesynd/debian/copyright
===================================================================
--- packages/trunk/freesynd/debian/copyright	2013-05-28 02:08:24 UTC (rev 14174)
+++ packages/trunk/freesynd/debian/copyright	2013-05-28 13:48:50 UTC (rev 14175)
@@ -3,7 +3,7 @@
 
 It was downloaded from http://freesynd.sourceforge.net 
 
-Upstream Author(s): 
+Upstream Authors:
 
     Bruce Sutherland <brucesutherland at users.sourceforge.net>
     Davor Ocelic <docelic at users.sourceforge.net>
@@ -14,7 +14,7 @@
     Tarjei Knapstad <tarjeik at users.sourceforge.net>
     Unavowed <unavowed at users.sourceforge.net>
 
-Copyright: 
+Copyright:
 
     2005-2007 by authors mentioned above
 
@@ -24,17 +24,16 @@
     modify it  under the  terms of the  GNU General  Public License as
     published by the Free Software Foundation; either version 2 of the
     License, or (at your option) any later version.
-    
+
     This program is  distributed in the hope that it will be useful,
     but WITHOUT  ANY WARRANTY;  without even  the implied  warranty of
     MERCHANTABILITY  or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     General Public License for more details.
-    
+
     You can view the GNU  General Public License, online, at the GNU
     project's  web  site;  see <http://www.gnu.org/licenses/gpl.html>.
     The full text of the license is also included in the file COPYING.
 
 
 The Debian packaging is (C) 2008, Benoit Tuduri <tuduri.benoit at freesurf.fr>
-and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-
+and is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.

Modified: packages/trunk/freesynd/debian/docs
===================================================================
--- packages/trunk/freesynd/debian/docs	2013-05-28 02:08:24 UTC (rev 14174)
+++ packages/trunk/freesynd/debian/docs	2013-05-28 13:48:50 UTC (rev 14175)
@@ -1,3 +1,3 @@
-README.txt
-debian/THANKS
+README
+NEWS
 debian/freesynd.md5

Modified: packages/trunk/freesynd/debian/freesynd.6
===================================================================
--- packages/trunk/freesynd/debian/freesynd.6	2013-05-28 02:08:24 UTC (rev 14174)
+++ packages/trunk/freesynd/debian/freesynd.6	2013-05-28 13:48:50 UTC (rev 14175)
@@ -20,16 +20,15 @@
 
 .SH "OPTIONS"
 These options are available:
-.TP 
-\fB\-h or --help \fR
+.TP
+\fB\-h or \-\-help \fR
 Give the command line options.
-.TP 
-\fB\-f or --fullscreen\fR
-Set the fullscreen or windowed mode.
-.TP 
-\fB\-p <pathtodata> or --path <pathtodata>\fR
-Set the data path of Freesynd. (it's a folder with contains music and
-maps files.
+.TP
+\fB\-i or \-\-ini <path>\fR
+Specify the location of the FreeSynd config file.
+.TP
+\fB\-\-nosound\fR
+Disable all sound.
 .SH "SEE ALSO"
 You can find more about the game on its homepage: http://freesynd.sf.net
 .SH "AUTHOR"

Modified: packages/trunk/freesynd/debian/freesynd.install
===================================================================
--- packages/trunk/freesynd/debian/freesynd.install	2013-05-28 02:08:24 UTC (rev 14174)
+++ packages/trunk/freesynd/debian/freesynd.install	2013-05-28 13:48:50 UTC (rev 14175)
@@ -1,2 +1 @@
-freesynd usr/games
 debian/freesynd.desktop usr/share/applications

Added: packages/trunk/freesynd/debian/freesynd.manpages
===================================================================
--- packages/trunk/freesynd/debian/freesynd.manpages	                        (rev 0)
+++ packages/trunk/freesynd/debian/freesynd.manpages	2013-05-28 13:48:50 UTC (rev 14175)
@@ -0,0 +1 @@
+debian/freesynd.6

Added: packages/trunk/freesynd/debian/patches/cmake_installation.patch
===================================================================
--- packages/trunk/freesynd/debian/patches/cmake_installation.patch	                        (rev 0)
+++ packages/trunk/freesynd/debian/patches/cmake_installation.patch	2013-05-28 13:48:50 UTC (rev 14175)
@@ -0,0 +1,69 @@
+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);

Modified: packages/trunk/freesynd/debian/patches/series
===================================================================
--- packages/trunk/freesynd/debian/patches/series	2013-05-28 02:08:24 UTC (rev 14174)
+++ packages/trunk/freesynd/debian/patches/series	2013-05-28 13:48:50 UTC (rev 14175)
@@ -1,5 +1 @@
-01_remove_dump_and_dumpmaps_programs.patches
-02_update_music_and_data_path.patches
-03_use_only_xmi_files_for_music.patches
-04_resolving_calloc_error.patches
-05_remove_the_typdef_warning_due_to_gplusplus_4.3_compiler.patches
+cmake_installation.patch

Modified: packages/trunk/freesynd/debian/rules
===================================================================
--- packages/trunk/freesynd/debian/rules	2013-05-28 02:08:24 UTC (rev 14174)
+++ packages/trunk/freesynd/debian/rules	2013-05-28 13:48:50 UTC (rev 14175)
@@ -1,77 +1,10 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+	dh $@ --buildsystem=cmake
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DCMAKE_BUILD_TYPE=release -DDATA_DIR="/usr/share/games/freesynd" -DBIN_DIR="/usr/games/"
 
-
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-
-	touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp 
-	dh_testdir
-	$(MAKE) -f /usr/share/quilt/quilt.make patch
-	$(MAKE)
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	$(MAKE) clean
-	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/freesynd.
-	#$(MAKE) DESTDIR=$(CURDIR)/debian/freesynd install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_install
-	dh_installmenu
-	dh_installman debian/*.6
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+#override_dh_strip:
+#	dh_strip --dbg-package=freesynd-dbg

Added: packages/trunk/freesynd/debian/source/format
===================================================================
--- packages/trunk/freesynd/debian/source/format	                        (rev 0)
+++ packages/trunk/freesynd/debian/source/format	2013-05-28 13:48:50 UTC (rev 14175)
@@ -0,0 +1 @@
+3.0 (quilt)

Modified: packages/trunk/freesynd/debian/watch
===================================================================
--- packages/trunk/freesynd/debian/watch	2013-05-28 02:08:24 UTC (rev 14174)
+++ packages/trunk/freesynd/debian/watch	2013-05-28 13:48:50 UTC (rev 14175)
@@ -1,21 +1,3 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
 version=3
 
-# Uncomment to examine a Webpage 
-# <Webpage URL> <string match>
-#http://www.example.com/downloads.php freesynd-(.*)\.tar\.gz
-
-# Uncomment to examine a Webserver directory
-#http://www.example.com/pub/freesynd-(.*)\.tar\.gz
-
-# Uncommment to examine a FTP server
-#ftp://ftp.example.com/pub/freesynd-(.*)\.tar\.gz debian uupdate
-opts=dversionmangle=s/\.dfsg\.\d+// \
-http://sf.net/freesynd/freesynd-(.*)\.zip
-
-
+http://sf.net/freesynd/freesynd-([\d\.]+)\.tar\.gz




More information about the Pkg-games-commits mailing list