[SCM] qgis branch, master, updated. upstream/2.0.1-13436-g7969474

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 0e326b8ef41266376d291975de762988799ddff0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 27 04:13:31 2013 +0200

    Drop 10_fix_gcc4.7_build.patch, no longer required.

diff --git a/debian/changelog b/debian/changelog
index f5aba26..b145396 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ qgis (2.0.1-1) UNRELEASED; urgency=low
   * Merge changes from control.sid.
   * Use minimal dh rules.
   * Update watch file. (closes: #717052)
+  * Drop 10_fix_gcc4.7_build.patch, no longer required.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 27 Sep 2013 02:05:32 +0200
 
diff --git a/debian/patches/10_fix_gcc4.7_build.patch b/debian/patches/10_fix_gcc4.7_build.patch
deleted file mode 100644
index bfd69ba..0000000
--- a/debian/patches/10_fix_gcc4.7_build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: fix to build with GCC 4.7
- Must include <unistd.h> where needed, because GCC 4.7 has stopped including
- it throughout much of the standard library.
- .
- See http://gcc.gnu.org/gcc-4.7/porting_to.html
-Author: Steven Chamberlain <steven at pyro.eu.org>
-Bug-Debian: http://bugs.debian.org/673567
-
---- qgis-1.7.4+1.7.5~20120320.orig/src/core/spatialindex/tools/TemporaryFile.cc	2012-05-19 21:42:30.010157000 +0100
-+++ qgis-1.7.4+1.7.5~20120320/src/core/spatialindex/tools/TemporaryFile.cc	2012-05-19 21:42:34.797198134 +0100
-@@ -20,6 +20,7 @@
- //    mhadji at gmail.com
- 
- #include <stdio.h>
-+#include <unistd.h>
- 
- #include <Tools.h>
- 
---- qgis-1.7.4+1.7.5~20120320.orig/src/core/spatialindex/storagemanager/DiskStorageManager.cc	2012-03-17 13:48:08.000000000 +0000
-+++ qgis-1.7.4+1.7.5~20120320/src/core/spatialindex/storagemanager/DiskStorageManager.cc	2012-05-19 21:43:14.837512956 +0100
-@@ -25,6 +25,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <stdio.h>
-+#include <unistd.h>
- #include <cstring>
- 
- #ifdef WIN32
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7e4182d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-10_fix_gcc4.7_build.patch

-- 
The Quantum GIS in Debian project