[SCM] postgis branch, master, updated. upstream/2.0.1-84-g2913e57

[Markus Wanner]

The following commit has been merged in the master branch:
commit 5c7a0a094727f2bc242aa4b0c209a592f8e87cf6
Author: Markus Wanner <markus at bluegap.ch>
Date:   Wed Aug 28 20:36:25 2013 +0200

    Correct the shp2pgsql-gui.1 manpage by stripping an UTF-8 marker.

diff --git a/debian/changelog b/debian/changelog
index 7128c9c..5edbe6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,8 @@ postgis (2.1.0-1) UNRELEASED; urgency=low
   * Refresh line numbers on patches: fixmakedoc, fix-spelling.
   * Drop patches: fix-manpages, fix-test-case-for-i386,
     fix-tests-on-big-endian: applied upstream.
-  * shp2pgsql-gui.1 is now provided upstream. Drop the debian variant.
+  * shp2pgsql-gui.1 is now provided upstream. Drop the debian variant. Add
+    a patch stripping an initial UTF-8 marker from the upstream file.
 
  -- Markus Wanner <markus at bluegap.ch>  Mon, 26 Aug 2013 22:02:22 +0200
 
diff --git a/debian/patches/fix-manpage b/debian/patches/fix-manpage
new file mode 100644
index 0000000..bdb8aa5
--- /dev/null
+++ b/debian/patches/fix-manpage
@@ -0,0 +1,8 @@
+--- a/loader/shp2pgsql-gui.1
++++ b/loader/shp2pgsql-gui.1
+@@ -1,4 +1,4 @@
+-.TH SHP2PGSQL-GUI 1 "January 14, 2012" "" "PostGIS"
++.TH SHP2PGSQL-GUI 1 "January 14, 2012" "" "PostGIS"
+ 
+ .SH NAME
+ shp2pgsql-gui \- Graphical User Interface for shp2pgsql
diff --git a/debian/patches/series b/debian/patches/series
index a03355c..30534e1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ link-liblwgeom
 use-debian-maven
 honor-build-flags
 fix-kfreebsd
+fix-manpage

-- 
PostGIS for PostgreSQL