[SCM] transportation simulator branch, master, updated. debian/111.3.1-1

Ansgar Burchardt ansgar at debian.org
Thu Aug 2 15:55:47 UTC 2012


The following commit has been merged in the master branch:
commit f08c308003848408be86842452613855a74b85e3
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Thu Aug 2 17:39:53 2012 +0200

    Drop backported patch.

diff --git a/debian/patches/0001-Add-stdlib-to-csv.h.patch b/debian/patches/0001-Add-stdlib-to-csv.h.patch
deleted file mode 100644
index 211bff3..0000000
--- a/debian/patches/0001-Add-stdlib-to-csv.h.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 155a1e4ea96f1f90fcfed91d36feef767ed8cc79 Mon Sep 17 00:00:00 2001
-From: Markus Pristovsek <prissi at physik.tu-berlin.de>
-Date: Fri, 30 Mar 2012 19:01:19 +0000
-Subject: [PATCH] Add stdlib to csv.h
-
-git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5597 8aca7d54-2c30-db11-9de9-000461428c89
----
- utils/csv.cc |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/utils/csv.cc b/utils/csv.cc
-index 9a2cdca..b5d796a 100644
---- a/utils/csv.cc
-+++ b/utils/csv.cc
-@@ -7,6 +7,7 @@
- 
- #include <cstring>
- #include <stdio.h>
-+#include <stdlib.h>
- #include <assert.h>
- 
- #include "csv.h"
--- 
-1.7.10
-
diff --git a/debian/patches/series b/debian/patches/series
index c9586e2..6681fb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ path-for-game-data.diff
 config.diff
 sha1-replacement.diff
 link-less-libraries.diff
-0001-Add-stdlib-to-csv.h.patch

-- 
transportation simulator



More information about the Pkg-games-commits mailing list