[SCM] postgis branch, master, updated. upstream/2.0.1-81-g4108387

Markus Wanner markus at bluegap.ch
Tue Aug 27 06:06:48 UTC 2013


The following commit has been merged in the master branch:
commit 410838766cfd944067db8bbf30725d8cf779fb6b
Author: Markus Wanner <markus at bluegap.ch>
Date:   Mon Aug 26 22:02:29 2013 +0200

     * New upstream release
     * Update pgversions
     * Adjust liblwgeom version and symbols for new version.
     * Update build dependencies according to README.postgis
     * Adapt patches debian-versions, java-version-fix, link-liblwgeom,
       honor-build-flags.
     * 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.

diff --git a/debian/changelog b/debian/changelog
index 03cd057..13bcce9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+postgis (2.1.0-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Update pgversions
+  * Adjust liblwgeom version and symbols for new version.
+  * Update build dependencies according to README.postgis (FIXME: prefer
+    geos-3.4)
+  * Adapt patches debian-versions, java-version-fix, link-liblwgeom,
+    honor-build-flags.
+  * 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.
+
+ -- Markus Wanner <markus at bluegap.ch>  Mon, 26 Aug 2013 22:02:22 +0200
+
 postgis (2.0.3-8) unstable; urgency=low
 
   * Don't err out when setting JAVA_HOME, but only later in
diff --git a/debian/control b/debian/control
index 314d141..01cc42b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,9 @@ Uploaders: Stephen Frost <sfrost at debian.org>, Francesco Paolo
  Lovergine <frankie at debian.org>, Markus Wanner <markus at bluegap.ch>
 Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), autotools-dev,
  flex, bison, libgeos-dev (>= 3.3), libjson0-dev (>= 0.9~),
- libproj-dev (>= 4.5.0), libssl-dev, xsltproc, docbook, docbook-xsl,
+ libproj-dev (>= 4.6.0), libssl-dev, xsltproc, docbook, docbook-xsl,
  imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~),
- libgtk2.0-dev, libgdal-dev (>= 1.6.0~) | libgdal1-dev (>= 1.6.0~),
+ libgtk2.0-dev, libgdal-dev (>= 1.9.0~) | libgdal1-dev (>= 1.9.0~),
  postgresql-server-dev-all, postgresql-common (>= 146), postgresql
 Build-Depends-Indep: openjdk-8-jdk | openjdk-7-jdk | openjdk-6-jdk,
  libpostgresql-jdbc-java, fastjar, libjts-java (>= 1.7), maven2,
@@ -23,7 +23,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-grass/postgis.git
 Package: postgis
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: postgresql-9.1-postgis-2.0
+Suggests: postgresql-9.2-postgis-2.1
 Description: Geographic objects support for PostgreSQL
  PostGIS adds support for geographic objects to the PostgreSQL
  object-relational database. In effect, PostGIS "spatially enables"
@@ -53,7 +53,7 @@ Package: libpostgis-java
 Architecture: all
 Section: java
 Depends: libpostgresql-jdbc-java, ${misc:Depends}
-Suggests: postgresql-9.1-postgis-2.0
+Suggests: postgresql-9.2-postgis-2.1
 Breaks: libpostgis-jdbc, libpostgisjava, postgresql-postgis-java
 Replaces: libpostgis-jdbc, libpostgisjava, postgresql-postgis-java
 Description: Geographic objects support for PostgreSQL -- JDBC support
@@ -66,7 +66,7 @@ Description: Geographic objects support for PostgreSQL -- JDBC support
  .
  This package contains JDBC support for PostGIS.
 
-Package: liblwgeom-2.0.3
+Package: liblwgeom-2.1.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, libjson0 (>= 0.9~), ${misc:Depends}
@@ -86,7 +86,7 @@ Package: liblwgeom-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends},
- liblwgeom-2.0.3 (= ${binary:Version})
+ liblwgeom-2.1.0 (= ${binary:Version})
 Breaks: postgis (<< 2.0.0)
 Description: PostGIS "Lightweight Geometry" library - Development files
  PostGIS adds support for geographic objects to the PostgreSQL
@@ -101,9 +101,41 @@ Description: PostGIS "Lightweight Geometry" library - Development files
  processing functions, are implemented here.  This package contains
  the development files.
 
-Package: postgresql-9.1-postgis-2.0
+Package: postgresql-9.0-postgis-2.1
+Depends: ${shlibs:Depends}, postgresql-9.0,
+ postgresql-9.0-postgis-2.1-scripts, liblwgeom-2.1.0,
+ ${misc:Depends}
+Recommends: postgis
+Breaks: postgis (<< 1.2.1)
+Architecture: any
+Description: Geographic objects support for PostgreSQL 9.0
+ PostGIS adds support for geographic objects to the PostgreSQL
+ object-relational database. In effect, PostGIS "spatially enables"
+ the PostgreSQL server, allowing it to be used as a backend spatial
+ database for geographic information systems (GIS), much like ESRI's
+ SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
+ "Simple Features Specification for SQL".
+ .
+ This package supports PostgreSQL 9.0.
+
+Package: postgresql-9.0-postgis-2.1-scripts
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: postgresql-9.0-postgis-2.1
+Description: Geographic objects support for PostgreSQL 9.0 -- scripts
+ PostGIS adds support for geographic objects to the PostgreSQL
+ object-relational database. In effect, PostGIS "spatially enables"
+ the PostgreSQL server, allowing it to be used as a backend spatial
+ database for geographic information systems (GIS), much like ESRI's
+ SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
+ "Simple Features Specification for SQL".
+ .
+ This package contains SQL scripts to upgrade from earlier PostGIS
+ versions for PostgreSQL 9.0 as well as Perl utility scripts.
+
+Package: postgresql-9.1-postgis-2.1
 Depends: ${shlibs:Depends}, postgresql-9.1,
- postgresql-9.1-postgis-2.0-scripts, liblwgeom-2.0.3,
+ postgresql-9.1-postgis-2.1-scripts, liblwgeom-2.1.0,
  ${misc:Depends}
 Recommends: postgis
 Breaks: postgis (<< 1.2.1)
@@ -118,10 +150,10 @@ Description: Geographic objects support for PostgreSQL 9.1
  .
  This package supports PostgreSQL 9.1.
 
-Package: postgresql-9.1-postgis-2.0-scripts
+Package: postgresql-9.1-postgis-2.1-scripts
 Architecture: all
 Depends: ${misc:Depends}
-Recommends: postgresql-9.1-postgis-2.0
+Recommends: postgresql-9.1-postgis-2.1
 Description: Geographic objects support for PostgreSQL 9.1 -- scripts
  PostGIS adds support for geographic objects to the PostgreSQL
  object-relational database. In effect, PostGIS "spatially enables"
@@ -133,3 +165,35 @@ Description: Geographic objects support for PostgreSQL 9.1 -- scripts
  This package contains SQL scripts to upgrade from earlier PostGIS
  versions for PostgreSQL 9.1 as well as Perl utility scripts.
 
+Package: postgresql-9.2-postgis-2.1
+Depends: ${shlibs:Depends}, postgresql-9.2,
+ postgresql-9.2-postgis-2.1-scripts, liblwgeom-2.1.0,
+ ${misc:Depends}
+Recommends: postgis
+Breaks: postgis (<< 1.2.1)
+Architecture: any
+Description: Geographic objects support for PostgreSQL 9.2
+ PostGIS adds support for geographic objects to the PostgreSQL
+ object-relational database. In effect, PostGIS "spatially enables"
+ the PostgreSQL server, allowing it to be used as a backend spatial
+ database for geographic information systems (GIS), much like ESRI's
+ SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
+ "Simple Features Specification for SQL".
+ .
+ This package supports PostgreSQL 9.2.
+
+Package: postgresql-9.2-postgis-2.1-scripts
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: postgresql-9.2-postgis-2.1
+Description: Geographic objects support for PostgreSQL 9.2 -- scripts
+ PostGIS adds support for geographic objects to the PostgreSQL
+ object-relational database. In effect, PostGIS "spatially enables"
+ the PostgreSQL server, allowing it to be used as a backend spatial
+ database for geographic information systems (GIS), much like ESRI's
+ SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
+ "Simple Features Specification for SQL".
+ .
+ This package contains SQL scripts to upgrade from earlier PostGIS
+ versions for PostgreSQL 9.2 as well as Perl utility scripts.
+
diff --git a/debian/control.in b/debian/control.in
index 3ca9bb0..fa12b82 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -6,9 +6,9 @@ Uploaders: Stephen Frost <sfrost at debian.org>, Francesco Paolo
  Lovergine <frankie at debian.org>, Markus Wanner <markus at bluegap.ch>
 Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), autotools-dev,
  flex, bison, libgeos-dev (>= 3.3), libjson0-dev (>= 0.9~),
- libproj-dev (>= 4.5.0), libssl-dev, xsltproc, docbook, docbook-xsl,
+ libproj-dev (>= 4.6.0), libssl-dev, xsltproc, docbook, docbook-xsl,
  imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~),
- libgtk2.0-dev, libgdal-dev (>= 1.6.0~) | libgdal1-dev (>= 1.6.0~),
+ libgtk2.0-dev, libgdal-dev (>= 1.9.0~) | libgdal1-dev (>= 1.9.0~),
  postgresql-server-dev-all, postgresql-common (>= 146), postgresql
 Build-Depends-Indep: openjdk-8-jdk | openjdk-7-jdk | openjdk-6-jdk,
  libpostgresql-jdbc-java, fastjar, libjts-java (>= 1.7), maven2,
@@ -23,7 +23,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-grass/postgis.git
 Package: postgis
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: postgresql-NEWEST_PGVERSION-postgis-2.0
+Suggests: postgresql-NEWEST_PGVERSION-postgis-2.1
 Description: Geographic objects support for PostgreSQL
  PostGIS adds support for geographic objects to the PostgreSQL
  object-relational database. In effect, PostGIS "spatially enables"
@@ -53,7 +53,7 @@ Package: libpostgis-java
 Architecture: all
 Section: java
 Depends: libpostgresql-jdbc-java, ${misc:Depends}
-Suggests: postgresql-NEWEST_PGVERSION-postgis-2.0
+Suggests: postgresql-NEWEST_PGVERSION-postgis-2.1
 Breaks: libpostgis-jdbc, libpostgisjava, postgresql-postgis-java
 Replaces: libpostgis-jdbc, libpostgisjava, postgresql-postgis-java
 Description: Geographic objects support for PostgreSQL -- JDBC support
@@ -66,7 +66,7 @@ Description: Geographic objects support for PostgreSQL -- JDBC support
  .
  This package contains JDBC support for PostGIS.
 
-Package: liblwgeom-2.0.3
+Package: liblwgeom-2.1.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, libjson0 (>= 0.9~), ${misc:Depends}
@@ -86,7 +86,7 @@ Package: liblwgeom-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends},
- liblwgeom-2.0.3 (= ${binary:Version})
+ liblwgeom-2.1.0 (= ${binary:Version})
 Breaks: postgis (<< 2.0.0)
 Description: PostGIS "Lightweight Geometry" library - Development files
  PostGIS adds support for geographic objects to the PostgreSQL
@@ -101,9 +101,9 @@ Description: PostGIS "Lightweight Geometry" library - Development files
  processing functions, are implemented here.  This package contains
  the development files.
 
-Package: postgresql-PGVERSION-postgis-2.0
+Package: postgresql-PGVERSION-postgis-2.1
 Depends: ${shlibs:Depends}, postgresql-PGVERSION,
- postgresql-PGVERSION-postgis-2.0-scripts, liblwgeom-2.0.3,
+ postgresql-PGVERSION-postgis-2.1-scripts, liblwgeom-2.1.0,
  ${misc:Depends}
 Recommends: postgis
 Breaks: postgis (<< 1.2.1)
@@ -118,10 +118,10 @@ Description: Geographic objects support for PostgreSQL PGVERSION
  .
  This package supports PostgreSQL PGVERSION.
 
-Package: postgresql-PGVERSION-postgis-2.0-scripts
+Package: postgresql-PGVERSION-postgis-2.1-scripts
 Architecture: all
 Depends: ${misc:Depends}
-Recommends: postgresql-PGVERSION-postgis-2.0
+Recommends: postgresql-PGVERSION-postgis-2.1
 Description: Geographic objects support for PostgreSQL PGVERSION -- scripts
  PostGIS adds support for geographic objects to the PostgreSQL
  object-relational database. In effect, PostGIS "spatially enables"
diff --git a/debian/liblwgeom-2.0.3.install b/debian/liblwgeom-2.0.3.install
deleted file mode 100644
index fd61f8a..0000000
--- a/debian/liblwgeom-2.0.3.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/liblwgeom-2.0.3.so
diff --git a/debian/liblwgeom-2.1.0.install b/debian/liblwgeom-2.1.0.install
new file mode 100644
index 0000000..c54a2f6
--- /dev/null
+++ b/debian/liblwgeom-2.1.0.install
@@ -0,0 +1 @@
+usr/lib/liblwgeom-2.1.0.so
diff --git a/debian/liblwgeom-2.0.3.symbols b/debian/liblwgeom-2.1.0.symbols
similarity index 88%
rename from debian/liblwgeom-2.0.3.symbols
rename to debian/liblwgeom-2.1.0.symbols
index fe54e08..fd5ec03 100644
--- a/debian/liblwgeom-2.0.3.symbols
+++ b/debian/liblwgeom-2.1.0.symbols
@@ -1,4 +1,4 @@
-liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
+liblwgeom-2.1.0.so liblwgeom-2.1.0 #MINVER#
  GEOS2LWGEOM at Base 2.0.0
  LWGEOM2GEOS at Base 2.0.0
  LWGEOM_GEOS_buildArea at Base 2.0.0
@@ -9,16 +9,17 @@ liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
  box3d_to_gbox at Base 2.0.0
  bytes_from_hexbytes at Base 2.0.0
  cart2geog at Base 2.0.0
+ circ_tree_contains_point at Base 2.1.0
+ circ_tree_distance_tree at Base 2.1.0
+ circ_tree_free at Base 2.1.0
+ circ_tree_new at Base 2.1.0
+ circ_tree_print at Base 2.1.0
  clairaut_cartesian at Base 2.0.0
  clairaut_geographic at Base 2.0.0
  clamp_srid at Base 2.0.0
  closest_point_on_segment at Base 2.0.0
  crosses_dateline at Base 2.0.0
- default_allocator at Base 2.0.0
- default_errorreporter at Base 2.0.0
- default_freeor at Base 2.0.0
- default_noticereporter at Base 2.0.0
- default_reallocator at Base 2.0.0
+ decode_geohash_bbox at Base 2.1.0
  define_plane at Base 2.0.0
  deparse_hex at Base 2.0.0
  distance2d_pt_pt at Base 2.0.0
@@ -31,9 +32,13 @@ liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
  edge_distance_to_edge at Base 2.0.0
  edge_distance_to_point at Base 2.0.0
  edge_intersection at Base 2.0.0
+ edge_intersects at Base 2.1.0
  edge_point_in_cone at Base 2.0.0
  edge_point_on_plane at Base 2.0.0
  error_if_srid_mismatch at Base 2.0.0
+ gbox_angular_height at Base 2.1.0
+ gbox_angular_width at Base 2.1.0
+ gbox_centroid at Base 2.1.0
  gbox_clone at Base 2.0.2
  gbox_contains_point3d at Base 2.0.0
  gbox_copy at Base 2.0.0
@@ -43,6 +48,8 @@ liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
  gbox_from_string at Base 2.0.0
  gbox_geocentric_slow at Base 2.0.0
  gbox_init at Base 2.0.0
+ gbox_init_point3d at Base 2.1.0
+ gbox_is_valid at Base 2.1.0
  gbox_merge at Base 2.0.0
  gbox_merge_point3d at Base 2.0.0
  gbox_new at Base 2.0.0
@@ -57,10 +64,12 @@ liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
  geographic_point_equals at Base 2.0.0
  geographic_point_init at Base 2.0.0
  geohash_point at Base 2.0.0
+ geohash_point_as_int at Base 2.1.0
  geometry_type_from_string at Base 2.0.0
  geomtype_struct_array at Base 2.0.0
  getMachineEndian at Base 2.0.0
  getPoint2d at Base 2.0.0
+ getPoint2d_cp at Base 2.1.0
  getPoint2d_p at Base 2.0.0
  getPoint2d_p_ro at Base 2.0.0
  getPoint3dm at Base 2.0.0
@@ -90,37 +99,53 @@ liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
  gserialized_set_srid at Base 2.0.0
  gserialized_to_string at Base 2.0.0
  hexbytes_from_bytes at Base 2.0.0
- init_allocator at Base 2.0.0
- init_errorreporter at Base 2.0.0
- init_freeor at Base 2.0.0
- init_noticereporter at Base 2.0.0
- init_reallocator at Base 2.0.0
  interpolate_point4d at Base 2.0.0
  latitude_degrees_normalize at Base 2.0.0
  latitude_radians_normalize at Base 2.0.0
+ ll2cart at Base 2.1.0
  longitude_degrees_normalize at Base 2.0.0
  longitude_radians_normalize at Base 2.0.0
+ lw_arc_calculate_gbox_cartesian_2d at Base 2.1.0
+ lw_arc_center at Base 2.1.0
+ lw_arc_is_pt at Base 2.1.0
+ lw_arc_length at Base 2.1.0
+ lw_arc_side at Base 2.1.0
  lw_asprintf at Base 2.0.0
+ lw_dist2d_arc_arc at Base 2.1.0
  lw_dist2d_check_overlap at Base 2.0.0
+ lw_dist2d_circstring_circstring at Base 2.1.0
+ lw_dist2d_circstring_curvepoly at Base 2.1.0
+ lw_dist2d_circstring_poly at Base 2.1.0
  lw_dist2d_comp at Base 2.0.0
+ lw_dist2d_curvepoly_curvepoly at Base 2.1.0
  lw_dist2d_distanceline at Base 2.0.0
  lw_dist2d_distancepoint at Base 2.0.0
+ lw_dist2d_distpts_init at Base 2.1.0
  lw_dist2d_distribute_bruteforce at Base 2.0.0
  lw_dist2d_distribute_fast at Base 2.0.0
  lw_dist2d_fast_ptarray_ptarray at Base 2.0.0
+ lw_dist2d_line_circstring at Base 2.1.0
+ lw_dist2d_line_curvepoly at Base 2.1.0
  lw_dist2d_line_line at Base 2.0.0
  lw_dist2d_line_poly at Base 2.0.0
+ lw_dist2d_point_circstring at Base 2.1.0
+ lw_dist2d_point_curvepoly at Base 2.1.0
  lw_dist2d_point_line at Base 2.0.0
  lw_dist2d_point_point at Base 2.0.0
  lw_dist2d_point_poly at Base 2.0.0
+ lw_dist2d_poly_curvepoly at Base 2.1.0
  lw_dist2d_poly_poly at Base 2.0.0
  lw_dist2d_pre_seg_seg at Base 2.0.0
+ lw_dist2d_pt_arc at Base 2.1.0
  lw_dist2d_pt_pt at Base 2.0.0
  lw_dist2d_pt_ptarray at Base 2.0.0
+ lw_dist2d_pt_ptarrayarc at Base 2.1.0
  lw_dist2d_pt_seg at Base 2.0.0
- lw_dist2d_ptarray_poly at Base 2.0.0
  lw_dist2d_ptarray_ptarray at Base 2.0.0
+ lw_dist2d_ptarray_ptarrayarc at Base 2.1.0
+ lw_dist2d_ptarrayarc_ptarrayarc at Base 2.1.0
  lw_dist2d_recursive at Base 2.0.0
+ lw_dist2d_seg_arc at Base 2.1.0
  lw_dist2d_seg_seg at Base 2.0.0
  lw_dist2d_selected_seg_seg at Base 2.0.0
  lw_dist3d_distanceline at Base 2.0.0
@@ -142,13 +167,14 @@ liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
  lw_dist3d_seg_seg at Base 2.0.0
  lw_get_int32_t at Base 2.0.0
  lw_get_uint32_t at Base 2.0.0
- lw_segment_envelope_intersects at Base 2.0.0
+ lw_pt_in_arc at Base 2.1.0
+ lw_pt_in_seg at Base 2.1.0
+ lw_seg_length at Base 2.1.0
  lw_segment_intersects at Base 2.0.0
  lw_segment_side at Base 2.0.0
  lw_vasprintf at Base 2.0.0
  lwalloc at Base 2.0.0
  lwalloc_var at Base 2.0.0
- lwcircle_center at Base 2.0.0
  lwcircstring_addpoint at Base 2.0.0
  lwcircstring_as_lwgeom at Base 2.0.0
  lwcircstring_clone at Base 2.0.0
@@ -157,6 +183,7 @@ liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
  lwcircstring_free at Base 2.0.0
  lwcircstring_from_lwmpoint at Base 2.0.0
  lwcircstring_from_lwpointarray at Base 2.0.0
+ lwcircstring_get_lwpoint at Base 2.1.0
  lwcircstring_is_closed at Base 2.0.0
  lwcircstring_is_empty at Base 2.0.0
  lwcircstring_length at Base 2.0.0
@@ -189,9 +216,11 @@ liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
  lwcollection_segmentize2d at Base 2.0.0
  lwcollection_segmentize at Base 2.0.0
  lwcollection_simplify at Base 2.0.0
+ lwcollection_startpoint at Base 2.1.0
  lwcompound_add_lwgeom at Base 2.0.0
  lwcompound_as_lwgeom at Base 2.0.0
  lwcompound_construct_empty at Base 2.0.0
+ lwcompound_contains_point at Base 2.1.0
  lwcompound_is_closed at Base 2.0.0
  lwcompound_length at Base 2.0.0
  lwcompound_length_2d at Base 2.0.0
@@ -200,6 +229,7 @@ liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
  lwcurvepoly_area at Base 2.0.0
  lwcurvepoly_as_lwgeom at Base 2.0.0
  lwcurvepoly_construct_empty at Base 2.0.0
+ lwcurvepoly_construct_from_lwpoly at Base 2.1.0
  lwcurvepoly_perimeter at Base 2.0.0
  lwcurvepoly_perimeter_2d at Base 2.0.0
  lwcurvepoly_segmentize at Base 2.0.0
@@ -229,6 +259,7 @@ liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
  lwgeom_as_multi at Base 2.0.0
  lwgeom_azumith_spheroid at Base 2.0.0
  lwgeom_buildarea at Base 2.0.0
+ lwgeom_calculate_circ_tree at Base 2.1.0
  lwgeom_calculate_gbox at Base 2.0.0
  lwgeom_calculate_gbox_cartesian at Base 2.0.0
  lwgeom_calculate_gbox_geodetic at Base 2.0.0
@@ -237,9 +268,11 @@ liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
  lwgeom_clone at Base 2.0.0
  lwgeom_clone_deep at Base 2.0.0
  lwgeom_construct_empty at Base 2.0.0
+ lwgeom_contains_point at Base 2.1.0
  lwgeom_count_rings at Base 2.0.0
  lwgeom_count_vertices at Base 2.0.0
  lwgeom_covers_lwgeom_sphere at Base 2.0.0
+ lwgeom_delaunay_triangulation at Base 2.1.0
  lwgeom_desegmentize at Base 2.0.0
  lwgeom_difference at Base 2.0.0
  lwgeom_dimension at Base 2.0.0
@@ -256,11 +289,12 @@ liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
  lwgeom_force_4d at Base 2.0.0
  lwgeom_force_clockwise at Base 2.0.0
  lwgeom_force_dims at Base 2.0.0
+ lwgeom_force_geodetic at Base 2.1.0
+ lwgeom_force_sfs at Base 2.1.0
  lwgeom_free at Base 2.0.0
+ lwgeom_from_geojson at Base 2.1.0
  lwgeom_from_gserialized at Base 2.0.0
  lwgeom_from_hexwkb at Base 2.0.0
- lwgeom_from_tgeom at Base 2.0.0
- lwgeom_from_tserialized at Base 2.0.0
  lwgeom_from_wkb at Base 2.0.0
  lwgeom_from_wkb_state at Base 2.0.0
  lwgeom_from_wkt at Base 2.0.0
@@ -272,18 +306,17 @@ liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
  lwgeom_geos_version at Base 2.0.0
  lwgeom_get_bbox at Base 2.0.0
  lwgeom_get_srid at Base 2.0.0
+ lwgeom_get_type at Base 2.1.0
  lwgeom_has_arc at Base 2.0.0
  lwgeom_has_m at Base 2.0.0
  lwgeom_has_srid at Base 2.0.0
  lwgeom_has_z at Base 2.0.0
  lwgeom_homogenize at Base 2.0.0
- lwgeom_install_default_allocators at Base 2.0.0
  lwgeom_interpolate_point at Base 2.0.0
  lwgeom_intersection at Base 2.0.0
  lwgeom_is_closed at Base 2.0.0
  lwgeom_is_collection at Base 2.0.0
  lwgeom_is_empty at Base 2.0.0
- lwgeom_is_solid at Base 2.0.0
  lwgeom_length at Base 2.0.0
  lwgeom_length_2d at Base 2.0.0
  lwgeom_length_spheroid at Base 2.0.0
@@ -311,19 +344,21 @@ liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
  lwgeom_perimeter at Base 2.0.0
  lwgeom_perimeter_2d at Base 2.0.0
  lwgeom_project_spheroid at Base 2.0.0
- lwgeom_pt_inside_circle at Base 2.0.0
  lwgeom_release at Base 2.0.0
  lwgeom_remove_repeated_points at Base 2.0.0
  lwgeom_reverse at Base 2.0.0
  lwgeom_same at Base 2.0.0
  lwgeom_segmentize2d at Base 2.0.0
  lwgeom_segmentize at Base 2.0.0
+ lwgeom_segmentize_sphere at Base 2.1.0
  lwgeom_set_geodetic at Base 2.0.0
+ lwgeom_set_handlers at Base 2.1.0
  lwgeom_set_srid at Base 2.0.0
  lwgeom_sharedpaths at Base 2.0.0
  lwgeom_simplify at Base 2.0.0
  lwgeom_snap at Base 2.0.0
  lwgeom_split at Base 2.0.0
+ lwgeom_startpoint at Base 2.1.0
  lwgeom_summary at Base 2.0.0
  lwgeom_symdifference at Base 2.0.0
  lwgeom_to_ewkt at Base 2.0.0
@@ -412,6 +447,7 @@ liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
  lwpoint_get_x at Base 2.0.0
  lwpoint_get_y at Base 2.0.0
  lwpoint_get_z at Base 2.0.0
+ lwpoint_inside_circle at Base 2.1.0
  lwpoint_is_empty at Base 2.0.0
  lwpoint_make2d at Base 2.0.0
  lwpoint_make3dm at Base 2.0.0
@@ -446,6 +482,7 @@ liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
  lwpoly_same at Base 2.0.0
  lwpoly_segmentize2d at Base 2.0.0
  lwpoly_simplify at Base 2.0.0
+ lwpoly_startpoint at Base 2.1.0
  lwpolygon_desegmentize at Base 2.0.0
  lwproj_from_string at Base 2.0.0
  lwpsurface_add_lwpoly at Base 2.0.0
@@ -457,6 +494,7 @@ liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
  lwtin_add_lwtriangle at Base 2.0.0
  lwtin_as_lwgeom at Base 2.0.0
  lwtin_free at Base 2.0.0
+ lwtin_from_geos at Base 2.1.0
  lwtin_is_closed at Base 2.0.0
  lwtriangle_area at Base 2.0.0
  lwtriangle_as_lwgeom at Base 2.0.0
@@ -480,7 +518,9 @@ liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
  next_double_up at Base 2.0.0
  next_float_down at Base 2.0.0
  next_float_up at Base 2.0.0
+ normalize at Base 2.1.0
  p2d_same at Base 2.0.0
+ p3d_same at Base 2.1.0
  p4d_same at Base 2.0.0
  parse_hex at Base 2.0.0
  parser_error_messages at Base 2.0.0
@@ -496,9 +536,7 @@ liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
  printLWTIN at Base 2.0.0
  printLWTRIANGLE at Base 2.0.0
  printPA at Base 2.0.0
- printTGEOM at Base 2.0.0
  project_point_on_plane at Base 2.0.0
- pt_in_poly_2d at Base 2.0.0
  pt_in_ring_2d at Base 2.0.0
  pt_in_ring_3d at Base 2.0.0
  pta_desegmentize at Base 2.0.0
@@ -517,6 +555,8 @@ liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
  ptarray_construct_empty at Base 2.0.0
  ptarray_construct_reference_data at Base 2.0.0
  ptarray_contains_point at Base 2.0.2
+ ptarray_contains_point_partial at Base 2.1.0
+ ptarray_contains_point_sphere at Base 2.1.0
  ptarray_flip_coordinates at Base 2.0.0
  ptarray_force_dims at Base 2.0.0
  ptarray_free at Base 2.0.0
@@ -524,11 +564,11 @@ liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
  ptarray_has_m at Base 2.0.0
  ptarray_has_z at Base 2.0.0
  ptarray_insert_point at Base 2.0.0
+ ptarray_is_closed at Base 2.1.0
+ ptarray_is_closed_2d at Base 2.1.0
+ ptarray_is_closed_3d at Base 2.1.0
+ ptarray_is_closed_z at Base 2.1.0
  ptarray_isccw at Base 2.0.0
- ptarray_isclosed2d at Base 2.0.0
- ptarray_isclosed3d at Base 2.0.0
- ptarray_isclosed at Base 2.0.0
- ptarray_isclosedz at Base 2.0.0
  ptarray_length at Base 2.0.0
  ptarray_length_2d at Base 2.0.0
  ptarray_length_spheroid at Base 2.0.0
@@ -543,10 +583,14 @@ liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
  ptarray_same at Base 2.0.0
  ptarray_segmentize2d at Base 2.0.0
  ptarray_set_point4d at Base 2.0.0
+ ptarray_signed_area at Base 2.1.0
  ptarray_simplify at Base 2.0.0
+ ptarray_startpoint at Base 2.1.0
  ptarray_substring at Base 2.0.0
  ptarray_to_GEOSCoordSeq at Base 2.0.0
  ptarray_transform at Base 2.0.0
+ ptarrayarc_contains_point at Base 2.1.0
+ ptarrayarc_contains_point_partial at Base 2.1.0
  rect_node_internal_new at Base 2.0.0
  rect_node_leaf_new at Base 2.0.0
  rect_tree_contains_point at Base 2.0.0
@@ -556,6 +600,7 @@ liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
  ring_make_geos_friendly at Base 2.0.0
  robust_cross_product at Base 2.0.0
  signum at Base 2.0.0
+ sphere_direction at Base 2.1.0
  sphere_distance at Base 2.0.0
  sphere_distance_cartesian at Base 2.0.0
  sphere_project at Base 2.0.0
@@ -578,15 +623,11 @@ liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
  stringbuffer_trim_trailing_white at Base 2.0.0
  stringbuffer_trim_trailing_zeroes at Base 2.0.0
  struct_cmp_by_measure at Base 2.0.0
- tgeom_deserialize at Base 2.0.0
- tgeom_free at Base 2.0.0
- tgeom_from_lwgeom at Base 2.0.0
- tgeom_new at Base 2.0.0
- tgeom_perimeter2d at Base 2.0.0
- tgeom_perimeter at Base 2.0.0
- tgeom_serialize at Base 2.0.0
  trim_trailing_zeros at Base 2.0.0
- tserialized_from_lwgeom at Base 2.0.0
+ unit_normal at Base 2.1.0
+ vector_angle at Base 2.1.0
+ vector_rotate at Base 2.1.0
+ vector_sum at Base 2.1.0
  wkt_lexer_close at Base 2.0.0
  wkt_lexer_init at Base 2.0.0
  wkt_lexer_read_srid at Base 2.0.0
diff --git a/debian/patches/add-loader-manpage b/debian/patches/add-loader-manpage
new file mode 100644
index 0000000..41fa396
--- /dev/null
+++ b/debian/patches/add-loader-manpage
@@ -0,0 +1,16 @@
+--- a/loader/Makefile.in
++++ b/loader/Makefile.in
+@@ -111,6 +111,13 @@
+ 	  $(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ \
+ 	  $(GTK_LIBS) $(LDFLAGS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS)
+ 
++man-install: shp2pgsql-gui.1
++	mkdir -p $(DESTDIR)$(PGSQL_MANDIR)/man1
++	$(INSTALL_DATA) shp2pgsql-gui.1 $(DESTDIR)$(PGSQL_MANDIR)/man1/shp2pgsql-gui.1
++
++man-uninstall:
++	rm -f $(DESTDIR)$(PGSQL_MANDIR)/man1/shp2pgsql-gui.1
++
+ installdir:
+ 	@mkdir -p $(DESTDIR)$(bindir)
+ 
diff --git a/debian/patches/debian-versions b/debian/patches/debian-versions
index 60619a4..8687d76 100644
--- a/debian/patches/debian-versions
+++ b/debian/patches/debian-versions
@@ -3,17 +3,14 @@ Description: Update various files to Debian versions
  specific versions of software being compiled against.  Update these to
  match the current Debian build environment.
 Author: Stephen Frost <sfrost at snowman.net>
-Last-Update: 2012-10-12
+Last-Update: 2013-07-22
 
 --- a/postgis/sqldefines.h
 +++ b/postgis/sqldefines.h
-@@ -8,9 +8,9 @@
-  */
- #define POSTGIS_PGSQL_VERSION 91
- #define POSTGIS_GEOS_VERSION 33
--#define POSTGIS_PROJ_VERSION 48
-+#define POSTGIS_PROJ_VERSION 47
- #define POSTGIS_LIB_VERSION 2.0.3
+@@ -10,7 +10,7 @@
+ #define POSTGIS_GEOS_VERSION 35
+ #define POSTGIS_PROJ_VERSION 47
+ #define POSTGIS_LIB_VERSION 2.1.0
 -#define POSTGIS_LIBXML2_VERSION 2.7.8
 +#define POSTGIS_LIBXML2_VERSION 2.8.0
  
@@ -21,12 +18,14 @@ Last-Update: 2012-10-12
   * Define the build date and the version number
 --- a/doc/Makefile.comments
 +++ b/doc/Makefile.comments
-@@ -21,7 +21,7 @@
+@@ -21,8 +21,8 @@
  DATA_built=postgis_comments.sql raster_comments.sql topology_comments.sql
  
  # PGXS information
--PG_CONFIG = /usr/bin/pg_config 
+-PG_CONFIG = /var/lib/jenkins/workspace/pg/rel/pg9.2w64/bin/pg_config 
+-PGXS := /var/lib/jenkins/workspace/pg/rel/pg9.2w64/lib/postgresql/pgxs/src/makefiles/pgxs.mk
 +PG_CONFIG = /usr/lib/postgresql/9.1/bin/pg_config
- PGXS := /usr/lib/postgresql/9.1/lib/pgxs/src/makefiles/pgxs.mk
++PGXS := /usr/lib/postgresql/9.1/lib/pgxs/src/makefiles/pgxs.mk
  include $(PGXS)
  
+ # PGXS override feature. The ability to allow PostGIS to install itself
diff --git a/debian/patches/fix-spelling b/debian/patches/fix-spelling
index e32c455..0a2a463 100644
--- a/debian/patches/fix-spelling
+++ b/debian/patches/fix-spelling
@@ -4,7 +4,7 @@ Last-Update: 2013-04-14
 
 --- a/liblwgeom/lwout_wkt.c
 +++ b/liblwgeom/lwout_wkt.c
-@@ -325,7 +325,7 @@
+@@ -323,7 +323,7 @@
  		}
  		else
  		{
@@ -13,7 +13,7 @@ Last-Update: 2013-04-14
  		}
  	}
  	stringbuffer_append(sb, ")");
-@@ -372,7 +372,7 @@
+@@ -370,7 +370,7 @@
  			lwcompound_to_wkt_sb((LWCOMPOUND*)cpoly->rings[i], sb, precision, variant );
  			break;
  		default:
@@ -22,7 +22,7 @@ Last-Update: 2013-04-14
  		}
  	}
  	stringbuffer_append(sb, ")");
-@@ -420,7 +420,7 @@
+@@ -418,7 +418,7 @@
  			lwcompound_to_wkt_sb((LWCOMPOUND*)mcurv->geoms[i], sb, precision, variant );
  			break;
  		default:
@@ -31,7 +31,7 @@ Last-Update: 2013-04-14
  		}
  	}
  	stringbuffer_append(sb, ")");
-@@ -464,7 +464,7 @@
+@@ -462,7 +462,7 @@
  			lwcurvepoly_to_wkt_sb((LWCURVEPOLY*)msurf->geoms[i], sb, precision, variant);
  			break;
  		default:
diff --git a/debian/patches/fix-test-case-for-i386 b/debian/patches/fix-test-case-for-i386
deleted file mode 100644
index 805c70d..0000000
--- a/debian/patches/fix-test-case-for-i386
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: sanitize test case for architectures other than amd64
- Stop penalizing windows 9.2 32-bit when it gives a stupid answer to
- an ill-defined question. Change to be a well-defined question.
-Author: Regina Obe <lr at pcorp.us>
-Last-Update: 2013-07-10
-Origin: http://trac.osgeo.org/postgis/changeset/10642
-
---- a/regress/lwgeom_regress.sql
-+++ b/regress/lwgeom_regress.sql
-@@ -92,7 +92,7 @@
- 
- 
- SELECT ST_extent(geometry(wkb_ndr)) from test_data;
--SELECT ST_3DExtent(geometry(wkb_ndr)) from test_data;
-+SELECT ST_3DExtent(geometry(wkb_ndr)) from test_data WHERE ST_NDims(wkb_ndr) > 2;
- SELECT ST_mem_size(ST_collect(ST_force_2d(geometry(wkb_ndr)))) from test_data;
- SELECT ST_mem_size(ST_collect(ST_force_3dz(geometry(wkb_ndr)))) from test_data;
- SELECT ST_mem_size(ST_collect(ST_force_4d(ST_force_2d(geometry(wkb_ndr))))) from test_data;
diff --git a/debian/patches/fix-tests-on-big-endian b/debian/patches/fix-tests-on-big-endian
deleted file mode 100644
index aceae31..0000000
--- a/debian/patches/fix-tests-on-big-endian
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Fix an endianness issue in unit tests
-Author: Regina Obe <lr at pcorp.us>
-Last-Update: 2013-08-06
-Origin: http://trac.osgeo.org/postgis/changeset/11738
-
---- a/liblwgeom/cunit/cu_libgeom.c
-+++ b/liblwgeom/cunit/cu_libgeom.c
-@@ -693,6 +693,7 @@
- static void test_lwgeom_force_clockwise(void)
- {
- 	LWGEOM *geom;
-+	LWGEOM *geom2;
- 	char *in_ewkt, *out_ewkt;
- 
- 	/* counterclockwise, must be reversed */
-@@ -743,13 +744,14 @@
- 	/* NOTE: this is a narrow ring, see ticket #1302 */
- 	in_ewkt  = "0103000000010000000500000000917E9BA468294100917E9B8AEA2841C976BE1FA4682941C976BE9F8AEA2841B39ABE1FA46829415ACCC29F8AEA284137894120A4682941C976BE9F8AEA284100917E9BA468294100917E9B8AEA2841";
- 	geom = lwgeom_from_hexwkb(in_ewkt, LW_PARSER_CHECK_NONE);
--	lwgeom_force_clockwise(geom);
--	out_ewkt = lwgeom_to_hexwkb(geom, WKB_ISO, NULL);
--	if (strcmp(in_ewkt, out_ewkt))
--		fprintf(stderr, "\nExp:   %s\nObt:   %s\n", in_ewkt, out_ewkt);
--	CU_ASSERT_STRING_EQUAL(in_ewkt, out_ewkt);
--	lwfree(out_ewkt);
-+	geom2 = lwgeom_from_hexwkb(in_ewkt, LW_PARSER_CHECK_NONE);
-+	lwgeom_force_clockwise(geom2);
-+	
-+	/** use same check instead of strcmp to account 
-+	  for difference in endianness **/
-+	CU_ASSERT( lwgeom_same(geom, geom2) );
- 	lwgeom_free(geom);
-+	lwgeom_free(geom2);
- }
- 
- /*
diff --git a/debian/patches/fixmakedoc b/debian/patches/fixmakedoc
index 5529d03..3a2ad3c 100644
--- a/debian/patches/fixmakedoc
+++ b/debian/patches/fixmakedoc
@@ -4,7 +4,7 @@ Last-Update: 2013-04-14
 
 --- a/doc/Makefile
 +++ b/doc/Makefile
-@@ -244,7 +244,7 @@
+@@ -327,7 +327,7 @@
  	rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/postgis.html
  	rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/README.postgis
  
diff --git a/debian/patches/honor-build-flags b/debian/patches/honor-build-flags
index a2b50f4..a00cee3 100644
--- a/debian/patches/honor-build-flags
+++ b/debian/patches/honor-build-flags
@@ -38,10 +38,10 @@ Last-Update: 2013-04-23
  
  CC = @CC@
 +CPPFLAGS = @CPPFLAGS@
- CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@
- LDFLAGS = @LDFLAGS@ @GEOS_LDFLAGS@ -lgeos_c @PROJ_LDFLAGS@ -lproj
+ CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@ @JSON_CPPFLAGS@
+ LDFLAGS = @LDFLAGS@ @GEOS_LDFLAGS@ -lgeos_c @PROJ_LDFLAGS@ -lproj @JSON_LDFLAGS@
  NUMERICFLAGS = @NUMERICFLAGS@
-@@ -147,10 +148,10 @@
+@@ -153,10 +154,10 @@
  
  # Command to build each of the .lo files
  $(LT_SA_OBJS): %.lo: %.c
@@ -56,12 +56,12 @@ Last-Update: 2013-04-23
  # Bison 2.5, Flex 2.5.35
 --- a/configure
 +++ b/configure
-@@ -19526,7 +19526,7 @@
+@@ -18886,7 +18886,7 @@
+ _ACEOF
  
  
- 
--CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $JSON_CPPFLAGS $XML2_CPPFLAGS"
-+CPPFLAGS="$CPPFLAGS $PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $JSON_CPPFLAGS $XML2_CPPFLAGS"
- 
- SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LDFLAGS $XML2_LDFLAGS"
+-CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $XML2_CPPFLAGS $SFCGAL_CPPFLAGS $CPPFLAGS"
++CPPFLAGS="$CPPFLAGS $PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $XML2_CPPFLAGS $SFCGAL_CPPFLAGS $CPPFLAGS"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: CPPFLAGS: $CPPFLAGS" >&5
+ $as_echo "CPPFLAGS: $CPPFLAGS" >&6; }
  
diff --git a/debian/patches/java-version-fix b/debian/patches/java-version-fix
index 742f5d5..df02d33 100644
--- a/debian/patches/java-version-fix
+++ b/debian/patches/java-version-fix
@@ -20,9 +20,9 @@ Last-Update: 2013-04-14
 @@ -176,7 +176,7 @@
    <properties>
      <POSTGIS_MAJOR_VERSION>2</POSTGIS_MAJOR_VERSION>
-     <POSTGIS_MINOR_VERSION>0</POSTGIS_MINOR_VERSION>
--    <POSTGIS_MICRO_VERSION>2SVN</POSTGIS_MICRO_VERSION>
-+    <POSTGIS_MICRO_VERSION>3</POSTGIS_MICRO_VERSION>
+     <POSTGIS_MINOR_VERSION>1</POSTGIS_MINOR_VERSION>
+-    <POSTGIS_MICRO_VERSION>0SVN</POSTGIS_MICRO_VERSION>
++    <POSTGIS_MICRO_VERSION>0~rc1</POSTGIS_MICRO_VERSION>
    </properties>
  	
  </project>
diff --git a/debian/patches/link-liblwgeom b/debian/patches/link-liblwgeom
index 4190dc2..27bd87b 100644
--- a/debian/patches/link-liblwgeom
+++ b/debian/patches/link-liblwgeom
@@ -6,7 +6,7 @@ Last-Update: 2013-04-23
 
 --- a/postgis/Makefile.in
 +++ b/postgis/Makefile.in
-@@ -65,14 +65,8 @@
+@@ -83,14 +83,8 @@
  OBJS=$(PG_OBJS)
  
  # Libraries to link into the module (proj, geos)
@@ -16,12 +16,12 @@ Last-Update: 2013-04-23
 -# to an existing liblwgeom.so in the PostgreSQL $libdir supplied by an
 -# older version of PostGIS, rather than with the static liblwgeom.a 
 -# supplied with newer versions of PostGIS
- PG_CPPFLAGS += @CPPFLAGS@ -I../liblwgeom -I../libpgcommon
--SHLIB_LINK_F = ../liblwgeom/.libs/liblwgeom.a ../libpgcommon/libpgcommon.a @SHLIB_LINK@ 
+ PG_CPPFLAGS += -I../liblwgeom -I../libpgcommon @CPPFLAGS@ -fPIC
+-SHLIB_LINK_F = ../libpgcommon/libpgcommon.a ../liblwgeom/.libs/liblwgeom.a @SHLIB_LINK@
 +SHLIB_LINK_F = -L../liblwgeom/.libs -llwgeom ../libpgcommon/libpgcommon.a @SHLIB_LINK@
  
- # Extra files to remove during 'make clean'
- EXTRA_CLEAN=$(SQL_OBJS) legacy_uninstall.sql
+ # Add SFCGAL Flags if defined
+ ifeq (@SFCGAL@,sfcgal)
 --- a/raster/rt_pg/Makefile.in
 +++ b/raster/rt_pg/Makefile.in
 @@ -27,14 +27,7 @@
@@ -42,7 +42,7 @@ Last-Update: 2013-04-23
  LIBPGCOMMON_LDFLAGS=../../libpgcommon/libpgcommon.a
 --- a/raster/loader/Makefile.in
 +++ b/raster/loader/Makefile.in
-@@ -31,7 +31,7 @@
+@@ -26,7 +26,7 @@
  
  RT_CORE=../rt_core
  
diff --git a/debian/patches/series b/debian/patches/series
index 17a0a48..a03355c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,8 +4,5 @@ fixmakedoc
 fix-spelling
 link-liblwgeom
 use-debian-maven
-fix-manpages
 honor-build-flags
-fix-test-case-for-i386
 fix-kfreebsd
-fix-tests-on-big-endian
diff --git a/debian/pgversions b/debian/pgversions
index 6d3dbe3..4228be8 100644
--- a/debian/pgversions
+++ b/debian/pgversions
@@ -1,6 +1,5 @@
-# Note that postgis-2.0 is not recommended for 8.4 and 9.0, works fine
-# with 9.1 and 9.2, but doesn't work with 9.3, yet.
-8.4
+# Note that postgis-2.1 is not recommended for 9.0, anymore.
 9.0
 9.1
 9.2
+9.3
diff --git a/debian/postgis.manpages b/debian/postgis.manpages
index c6e6c0a..c64b403 100644
--- a/debian/postgis.manpages
+++ b/debian/postgis.manpages
@@ -1 +1,3 @@
-debian/shp2pgsql-gui.1
+doc/man/pgsql2shp.1
+doc/man/shp2pgsql.1
+loader/shp2pgsql-gui.1
diff --git a/debian/postgresql-generic-postgis-2.0-scripts.install.in b/debian/postgresql-generic-postgis-2.1-scripts.install.in
similarity index 100%
rename from debian/postgresql-generic-postgis-2.0-scripts.install.in
rename to debian/postgresql-generic-postgis-2.1-scripts.install.in
diff --git a/debian/postgresql-generic-postgis-2.0.install.in b/debian/postgresql-generic-postgis-2.1.install.in
similarity index 100%
rename from debian/postgresql-generic-postgis-2.0.install.in
rename to debian/postgresql-generic-postgis-2.1.install.in
diff --git a/debian/rules b/debian/rules
index 7d4f8b4..dfde74f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -122,9 +122,9 @@ build-indep-stamp: configuration-stamp
 
 #	Create a few SQL scripts that the Makefiles are not clever enough
 #	to resolve, when building arch-indep only.
-	$(MAKE) -C postgis postgis.sql postgis_upgrade_20_minor.sql
-	$(MAKE) -C raster/rt_pg rtpostgis.sql rtpostgis_upgrade_20_minor.sql
-	$(MAKE) -C topology topology.sql topology_upgrade_20_minor.sql
+	$(MAKE) -C postgis postgis.sql postgis_upgrade_21_minor.sql
+	$(MAKE) -C raster/rt_pg rtpostgis.sql rtpostgis_upgrade_21_minor.sql
+	$(MAKE) -C topology topology.sql topology_upgrade_21_minor.sql
 
 #	This creates the required SQL scripts. Again, the Makefile is not
 #	clever enough to run this before 'install'.
@@ -186,8 +186,8 @@ clean: debian/control
 	rm -f $(CURDIR)/debian/*.postinst $(CURDIR)/debian/*.postrm
 	rm -f postgis/postgis_upgrade_20_minor.sql.in raster/rt_pg/rtpostgis_drop.sql \
 		raster/rt_pg/rtpostgis_upgrade_cleanup.sql
-	rm -f $(CURDIR)/debian/postgresql-*-postgis-2.0.install
-	rm -f $(CURDIR)/debian/postgresql-*-postgis-2.0-scripts.install
+	rm -f $(CURDIR)/debian/postgresql-*-postgis-2.1.install
+	rm -f $(CURDIR)/debian/postgresql-*-postgis-2.1-scripts.install
 	rm -f loader/cunit/cu_tester
 	rm -rf liblwgeom/cunit/.libs
 
@@ -253,12 +253,12 @@ install-arch: build-arch
 #	Auto-create required .install file for the current Postgres version.
 	(set -e; \
 	for PGVER in $(OTHER_POSTGRES_VERSIONS) $(NEWEST_POSTGRES_VERSION); do \
-		cat $(CURDIR)/debian/postgresql-generic-postgis-2.0.install.in \
+		cat $(CURDIR)/debian/postgresql-generic-postgis-2.1.install.in \
 			| sed -e "s/@PGVERSION@/$$PGVER/" \
-			> $(CURDIR)/debian/postgresql-$$PGVER-postgis-2.0.install; \
-		cat $(CURDIR)/debian/postgresql-generic-postgis-2.0-scripts.install.in \
+			> $(CURDIR)/debian/postgresql-$$PGVER-postgis-2.1.install; \
+		cat $(CURDIR)/debian/postgresql-generic-postgis-2.1-scripts.install.in \
 			| sed -e "s/@PGVERSION@/$$PGVER/" \
-			> $(CURDIR)/debian/postgresql-$$PGVER-postgis-2.0-scripts.install; \
+			> $(CURDIR)/debian/postgresql-$$PGVER-postgis-2.1-scripts.install; \
 	done)
 
 	dh_install -s
@@ -266,7 +266,7 @@ install-arch: build-arch
 check: build-arch-stamp
 #   Run unit tests (against the newest Postgres version only, for
 #   now).
-	echo "LD_PRELOAD = '$(CURDIR)/liblwgeom/.libs/liblwgeom-2.0.3.so'" \
+	echo "LD_PRELOAD = '$(CURDIR)/liblwgeom/.libs/liblwgeom-2.1.0.so'" \
 		> $(CURDIR)/postgis-check-env.tmp
 	(set -e; \
 		test -z '$(CHECK)' || \
diff --git a/debian/shp2pgsql-gui.1 b/debian/shp2pgsql-gui.1
deleted file mode 100644
index f63ca9d..0000000
--- a/debian/shp2pgsql-gui.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.TH SHP2PGSQL-GUI 1 "January 14, 2012" "" "PostGIS"
-
-.SH NAME
-shp2pgsql-gui \- Graphical User Interface for shp2pgsql
-
-.SH SYNOPSIS
-.B shp2pgsql-gui
-.RI [ options ]
-.br
-
-.SH DESCRIPTION
-This manual page documents briefly the 
-.B shp2pgsql-gui 
-command.
-.PP
-.B shp2pgsql-gui 
-is a program that converts ESRI Shape files into SQL statements and imports these statements to a PostGIS/PostgreSQL database. The GUI allows the user to set the shape file to import, the PostGIS/PostgreSQL connection parameters and some options related to the table where the data will be imported to.
-.PP
-.B shp2pgsql-gui
-can be called with some command line options that fill the PostGIS/PostgreSQL server connection parameters in.
-
-.SH OPTIONS
-.TP 
-.B -d \fIdatabase\fP
-Specifies the name of the database where the data will be imported to.
-.TP
-.B -h \fIhost\fP
-Specifies the host name of the machine on which the PostGIS/PostgreSQL server is running.
-.TP
-.B -p \fIport\fP
-Specifies the TCP port on which the PostGIS/PostgreSQL server is listening for connections.
-.TP
-.B -U \fIusername\fP
-Specifies the username with which the user will connect to the database.
-.TP 
-.B -W \fIpassword\fP
-Specifies the password with which the user will connect to the database.
-.TP 
-.B -?
-Shows help about shp2pgsql-gui command line arguments.
-
-.SH "SEE ALSO"
-shp2pgsql(1), pgsql2shp(1)
-
-The documentation of pgsql2shp, shp2pgsql and shp2pgsql-gui in HTML format is available on the filesystem at /usr/share/doc/postgis.
-
-.SH AUTHOR
-shp2pgsql-gui was written by Paul Ramsey <pramsey at opengeo.org> and Mark Cave-Ayland <mark.cave-ayland at siriusit.co.uk>.
-.PP
-This manual page was written by Mònica Ramírez Arceda <monica at probeta.net>, for the Debian project. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 and any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2.

-- 
PostGIS for PostgreSQL



More information about the Pkg-grass-devel mailing list