From 27f5c7cba0087870d22ee7a2539ff76e41815778 Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 14 Aug 2009 22:27:48 +0000 Subject: (svn r17179) -Merge: changelog etc. changes from 0.7 branch --- os/debian/changelog | 32 +++++++++++++++++++++++++------- os/rpm/openttd.spec | 33 +++++++++++++++++++-------------- os/win32/installer/install.nsi | 6 +++--- 3 files changed, 47 insertions(+), 24 deletions(-) (limited to 'os') diff --git a/os/debian/changelog b/os/debian/changelog index 6af62d4d9..67a16b3e2 100644 --- a/os/debian/changelog +++ b/os/debian/changelog @@ -5,47 +5,65 @@ openttd (0.8~svn-1) UNRELEASED; urgency=low -- Matthijs Kooijman Wed, 03 Sep 2008 18:56:04 +0200 +openttd (0.7.2) unstable; urgency=low + + * New upstream release. + + -- Matthijs Kooijman Sat, 01 Aug 2009 00:19:43 +0200 + +openttd (0.7.2~RC2) unstable; urgency=low + + * New upstream release. + + -- Matthijs Kooijman Tue, 21 Jul 2009 20:25:56 +0200 + +openttd (0.7.2~RC1) unstable; urgency=low + + * New upstream release. + + -- Matthijs Kooijman Wed, 15 Jul 2009 22:25:56 +0200 + openttd (0.7.1) unstable; urgency=low * New upstream release. - -- Matthijs Kooijman Tue, 09 Jun 2008 01:34:56 +0200 + -- Matthijs Kooijman Tue, 09 Jun 2009 01:34:56 +0200 openttd (0.7.1~RC3) unstable; urgency=low * New upstream release. - -- Matthijs Kooijman Wed, 03 Jun 2008 15:34:56 +0200 + -- Matthijs Kooijman Wed, 03 Jun 2009 15:34:56 +0200 openttd (0.7.1~RC2) unstable; urgency=low * New upstream release. - -- Matthijs Kooijman Thu, 21 Mar 2008 14:34:56 +0200 + -- Matthijs Kooijman Thu, 21 Mar 2009 14:34:56 +0200 openttd (0.7.1~RC1) unstable; urgency=low * New upstream release. - -- Matthijs Kooijman Mon, 11 Mar 2008 17:34:56 +0200 + -- Matthijs Kooijman Mon, 11 Mar 2009 17:34:56 +0200 openttd (0.7.0) unstable; urgency=low * New upstream release. - -- Matthijs Kooijman Wed, 01 Apr 2008 13:37:42 +0000 + -- Matthijs Kooijman Wed, 01 Apr 2009 13:37:42 +0000 openttd (0.7.0~RC2) unstable; urgency=low * New upstream release. - -- Matthijs Kooijman Mon, 23 Mar 2008 00:42:00 +0200 + -- Matthijs Kooijman Mon, 23 Mar 2009 00:42:00 +0200 openttd (0.7.0~RC1) unstable; urgency=low * New upstream release. - -- Matthijs Kooijman Mon, 16 Mar 2008 00:07:00 +0200 + -- Matthijs Kooijman Mon, 16 Mar 2009 00:07:00 +0200 openttd (0.7.0~beta2) unstable; urgency=low diff --git a/os/rpm/openttd.spec b/os/rpm/openttd.spec index 2c768d3bc..08d0941ab 100644 --- a/os/rpm/openttd.spec +++ b/os/rpm/openttd.spec @@ -7,10 +7,13 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself # +# Note: for (at least) CentOS '#' comments end '\' continue command on new line. +# So place all '#' commented parameters of e.g. configure to the end. +# #------------------------------------------------------------------------------- Name: openttd -Version: 0.7.0 +Version: 0.7.2 Release: 1%{?dist} Group: Amusements/Games @@ -18,7 +21,7 @@ License: GPLv2 URL: http://www.openttd.org Summary: OpenTTD is an Open Source clone of Chris Sawyer's Transport Tycoon Deluxe -Source: %{name}-%{version}.tar.bz2 +Source: %{name}-%{version}-source.tar.bz2 Requires: fontconfig Requires: libicu @@ -76,22 +79,23 @@ download of the game. --prefix-dir="%{_prefix}" \ --binary-dir="bin" \ --binary-name="%{name}" \ -# --menu-name="OpenTTD" \ -# --data-dir="share\games\%{name}" \ -# --doc-dir="share\doc\%{name}" \ -# --icon-dir="share/pixmaps" \ -# --icon-theme-dir="share/icons/hicolor" \ -# --man-dir="share/man/man6" \ -# --menu-dir="share/applications" \ --enable-debug=0 \ -# --menu_group="Game;" \ --with-sdl \ --with-zlib \ --with-png \ --with-freetype \ --with-fontconfig \ --with-icu \ - --enable-strip + --enable-strip \ +# --menu_group="Game;" \ +# --menu-name="OpenTTD" \ +# --data-dir="share\games\%{name}" \ +# --doc-dir="share\doc\%{name}" \ +# --icon-dir="share/pixmaps" \ +# --icon-theme-dir="share/icons/hicolor" \ +# --man-dir="share/man/man6" \ +# --menu-dir="share/applications" + make %{?_smp_mflags} %install @@ -101,11 +105,11 @@ make install INSTALL_DIR="%{buildroot}" # Validate menu entrys (vendor specific) %if %{_vendor} == "redhat" || %{_vendor}=="fedora" desktop-file-install \ -# --delete-original \ --vendor="%{_vendor}" \ --remove-key Version \ --dir="%{buildroot}/%{_datadir}/applications/" \ - "%{buildroot}/%{_datadir}/applications/%{name}.desktop" + "%{buildroot}/%{_datadir}/applications/%{name}.desktop" \ +# --delete-original %endif %clean @@ -148,7 +152,8 @@ fi %{_datadir}/doc/%{name}/* %{_datadir}/games/%{name}/lang/* %{_datadir}/games/%{name}/data/* -%{_datadir}/applications/%{name}.desktop +%{_datadir}/games/%{name}/scripts/* +%{_datadir}/applications/*%{name}.desktop %{_datadir}/pixmaps/* %{_datadir}/icons/hicolor/*/apps/%{name}.png %doc %{_mandir}/man6/%{name}.6.gz diff --git a/os/win32/installer/install.nsi b/os/win32/installer/install.nsi index 893b3189f..a607c2cf1 100644 --- a/os/win32/installer/install.nsi +++ b/os/win32/installer/install.nsi @@ -1,7 +1,7 @@ !define APPNAME "OpenTTD" ; Define application name -!define APPVERSION "0.7.1" ; Define application version -!define APPVERSIONINTERNAL "0.7.1.0" ; Define application version in X.X.X.X -!define INSTALLERVERSION 62 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!! +!define APPVERSION "0.7.2" ; Define application version +!define APPVERSIONINTERNAL "0.7.2.0" ; Define application version in X.X.X.X +!define INSTALLERVERSION 65 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!! !include ${VERSION_INCLUDE} !define APPURLLINK "http://www.openttd.org" -- cgit v1.2.3-54-g00ecf