[SCM] shapelib branch, master, updated. debian/1.2.10-6-2-g75a9b42

[Arto Jantunen]

The following commit has been merged in the master branch:
commit ed0f77b70dc551e2fa899a616de7269605447ed3
Author: Arto Jantunen <viiru at debian.org>
Date:   Fri May 18 10:21:09 2012 +0300

    Remove patch 0001 (Disable proj_api.h include), this was never used
    
    Since we don't build the contrib tools this isn't actually used for
    anything.

diff --git a/debian/patches/0002-Add-manpages.patch b/debian/patches/0001-Add-manpages.patch
similarity index 100%
rename from debian/patches/0002-Add-manpages.patch
rename to debian/patches/0001-Add-manpages.patch
diff --git a/debian/patches/0001-Disable-proj_api.h-include.patch b/debian/patches/0001-Disable-proj_api.h-include.patch
deleted file mode 100644
index 02ef2bf..0000000
--- a/debian/patches/0001-Disable-proj_api.h-include.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Author unknown
-Date: Unknown
-Subject: [PATCH] Disable proj_api.h include
-
-This patch was included in the monolithic patch which existed before the
-split, the author is most likely Noel Köthe <noel at debian.org>.
-
----
- contrib/shpgeo.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/contrib/shpgeo.h b/contrib/shpgeo.h
-index 02276b1..4210d04 100644
---- a/contrib/shpgeo.h
-+++ b/contrib/shpgeo.h
-@@ -67,7 +67,7 @@
- extern "C" {
- #endif
- 
--#include "proj_api.h"
-+## #include "proj_api.h"
- 
- 
- #define		SHPD_POINT	 		1
--- 
diff --git a/debian/patches/0003-Thread-safety-fixes.patch b/debian/patches/0002-Thread-safety-fixes.patch
similarity index 100%
rename from debian/patches/0003-Thread-safety-fixes.patch
rename to debian/patches/0002-Thread-safety-fixes.patch
diff --git a/debian/patches/0004-Properly-use-libtool.patch b/debian/patches/0003-Properly-use-libtool.patch
similarity index 100%
rename from debian/patches/0004-Properly-use-libtool.patch
rename to debian/patches/0003-Properly-use-libtool.patch
diff --git a/debian/patches/0005-Dynamically-link-the-shp-binaries-to-libshp.patch b/debian/patches/0004-Dynamically-link-the-shp-binaries-to-libshp.patch
similarity index 100%
rename from debian/patches/0005-Dynamically-link-the-shp-binaries-to-libshp.patch
rename to debian/patches/0004-Dynamically-link-the-shp-binaries-to-libshp.patch
diff --git a/debian/patches/0006-Stop-setting-CFLAGS-in-the-Makefile.patch b/debian/patches/0005-Stop-setting-CFLAGS-in-the-Makefile.patch
similarity index 100%
rename from debian/patches/0006-Stop-setting-CFLAGS-in-the-Makefile.patch
rename to debian/patches/0005-Stop-setting-CFLAGS-in-the-Makefile.patch
diff --git a/debian/patches/series b/debian/patches/series
index f2754e9..08694c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
-0001-Disable-proj_api.h-include.patch
-0002-Add-manpages.patch
-0003-Thread-safety-fixes.patch
-0004-Properly-use-libtool.patch
-0005-Dynamically-link-the-shp-binaries-to-libshp.patch
-0006-Stop-setting-CFLAGS-in-the-Makefile.patch
+0001-Add-manpages.patch
+0002-Thread-safety-fixes.patch
+0003-Properly-use-libtool.patch
+0004-Dynamically-link-the-shp-binaries-to-libshp.patch
+0005-Stop-setting-CFLAGS-in-the-Makefile.patch

-- 
Library for reading and writing ArcView Shapefiles