[SCM] transportation simulator branch, master, updated. upstream/100.0-18-g1815291

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit eab24714e4b0cff3b0b65f5cc2b0cf017b49f5e0
Author: Ansgar Burchardt <ansgar at 2008.43-1.org>
Date:   Sun Jun 29 17:46:20 2008 +0200

    Update to Standards Version 3.8.0
    
    * Use noopt, debug from DEB_BUILD_OPTIONS
    * debian/control: Change Vcs-* fields to point to Git repository
    * Bump Standards Version to 3.8.0
      + Add debian/README.source

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..7df3fd2
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,6 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
+
diff --git a/debian/changelog b/debian/changelog
index 532cadc..4f04c75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ simutrans (100.0-1) UNRELEASED; urgency=low
   * Link makeobj with g++ instead of ld (should fix build on mipsel)
   * Use debhelper 7 to clean up debian/rules
   * Move translations to debian/translations instead of a patch
+  * Use noopt, debug from DEB_BUILD_OPTIONS
+  * debian/control: Change Vcs-* fields to point to Git repository
+  * Bump Standards Version to 3.8.0
+    + Add debian/README.source
 
  -- Ansgar Burchardt <ansgar at 43-1.org>  Sun, 23 Mar 2008 21:15:39 +0100
 
diff --git a/debian/control b/debian/control
index c3f5953..c5bd5e8 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,10 @@ Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Ansgar Burchardt <ansgar at 43-1.org>
 Build-Depends: debhelper (>= 7), quilt (>= 0.46), libsdl1.2-dev, zlib1g-dev, imagemagick, libpng12-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://www.simutrans.com/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/simutrans/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/simutrans/?op=log
+Vcs-Git: git://git.debian.org/git/pkg-games/simutrans.git
+Vcs-Browser: http://git.debian.org/?p=pkg-games/simutrans.git
 
 Package: simutrans
 Architecture: any
diff --git a/debian/patches/config.diff b/debian/patches/config.diff
index 443b3c6..42df093 100644
--- a/debian/patches/config.diff
+++ b/debian/patches/config.diff
@@ -43,7 +43,7 @@ Index: simutrans-debian/config.default
 ===================================================================
 --- /dev/null
 +++ simutrans-debian/config.default
-@@ -0,0 +1,57 @@
+@@ -0,0 +1,65 @@
 +#
 +# to compile:
 +# copy this file to config.default and adjust the settings
@@ -65,9 +65,17 @@ Index: simutrans-debian/config.default
 +#OSTYPE = mingw
 +#OSTYPE = mac
 +
-+DEBUG = 1    # Level 1-3, higher number means more debug-friendly, see Makefile
++#DEBUG = 1    # Level 1-3, higher number means more debug-friendly, see Makefile
 +#OPTIMISE = 1 # Add umpteen optimisation flags
 +#PROFILE = 1
++ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
++  OPTIMISE=
++else
++  OPTIMISE=1
++endif
++ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
++  DEBUG=1
++endif
 +
 +# Define these as empty strings, if you don't have allegro/sdl-config
 +#ALLEGRO_CONFIG = allegro-config

-- 
transportation simulator