[postgis] 02/02: Refresh patches.
Bas Couwenberg
sebastic at xs4all.nl
Sun Sep 28 15:29:45 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository postgis.
commit e46cf1eb5b4a41bb571f74384ef57799702a69a6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Sep 28 15:30:12 2014 +0200
Refresh patches.
---
debian/patches/enable-ppc64el.patch | 2 +-
debian/patches/fix-hurd-i386-ftbfs.patch | 4 ++--
debian/patches/honor-build-flags | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/debian/patches/enable-ppc64el.patch b/debian/patches/enable-ppc64el.patch
index 5885d35..245e927 100644
--- a/debian/patches/enable-ppc64el.patch
+++ b/debian/patches/enable-ppc64el.patch
@@ -3,7 +3,7 @@ Author: Paulo Flabiano Smorigo <pfsmorigo at linux.vnet.ibm.com>
--- a/macros/libtool.m4
+++ b/macros/libtool.m4
-@@ -1300,6 +1300,9 @@
+@@ -1300,6 +1300,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
diff --git a/debian/patches/fix-hurd-i386-ftbfs.patch b/debian/patches/fix-hurd-i386-ftbfs.patch
index 2ab63a3..02b095d 100644
--- a/debian/patches/fix-hurd-i386-ftbfs.patch
+++ b/debian/patches/fix-hurd-i386-ftbfs.patch
@@ -1,8 +1,8 @@
Description: Detect GNU/Hurd and treat it like Linux just as BSD.
Author: Bas Couwenberg <sebastic at xs4all.nl>
---- postgis.orig/raster/rt_core/rt_api.h
-+++ postgis/raster/rt_core/rt_api.h
+--- a/raster/rt_core/rt_api.h
++++ b/raster/rt_core/rt_api.h
@@ -51,6 +51,15 @@
#endif
#endif
diff --git a/debian/patches/honor-build-flags b/debian/patches/honor-build-flags
index 0f0c150..ee72bbc 100644
--- a/debian/patches/honor-build-flags
+++ b/debian/patches/honor-build-flags
@@ -8,7 +8,7 @@ Last-Update: 2013-04-23
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
-@@ -97,11 +97,11 @@
+@@ -97,11 +97,11 @@ pgsql2shp-cli.o: pgsql2shp-cli.c pgsql2s
$(PGSQL2SHP-CLI): $(SHPLIB_OBJS) pgsql2shp-core.o pgsql2shp-cli.o $(LIBLWGEOM)
$(LIBTOOL) --mode=link \
@@ -22,7 +22,7 @@ Last-Update: 2013-04-23
shp2pgsql-gui.o: shp2pgsql-gui.c shp2pgsql-core.h shpcommon.h
$(CC) $(CFLAGS) $(GTK_CFLAGS) $(PGSQL_FE_CPPFLAGS) -o $@ -c shp2pgsql-gui.c
-@@ -109,7 +109,7 @@
+@@ -109,7 +109,7 @@ shp2pgsql-gui.o: shp2pgsql-gui.c shp2pgs
$(SHP2PGSQL-GUI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-gui.o pgsql2shp-core.o $(LIBLWGEOM) $(GTK_WIN32_RES)
$(LIBTOOL) --mode=link \
$(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ \
@@ -41,7 +41,7 @@ Last-Update: 2013-04-23
CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@ @JSON_CPPFLAGS@
LDFLAGS = @LDFLAGS@ @GEOS_LDFLAGS@ -lgeos_c @PROJ_LDFLAGS@ -lproj @JSON_LDFLAGS@
NUMERICFLAGS = @NUMERICFLAGS@
-@@ -153,10 +154,10 @@
+@@ -153,10 +154,10 @@ check: liblwgeom.la
# Command to build each of the .lo files
$(LT_SA_OBJS): %.lo: %.c
@@ -56,7 +56,7 @@ Last-Update: 2013-04-23
# Bison 2.5, Flex 2.5.35
--- a/configure
+++ b/configure
-@@ -18976,7 +18976,7 @@
+@@ -18976,7 +18976,7 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis.git
More information about the Pkg-grass-devel
mailing list