This is an automated email from the git hooks/post-receive script.
markus_wanner-guest pushed a commit to branch master
in repository postgis.
commit 2a7a84a445f3e45bd3aecfdb3b1c462d73229933
Author: Markus Wanner <mar...@bluegap.ch>
Date: Tue Apr 8 08:16:06 2014 +0200
* Allow translations of the debconf notice for postgis-2.0 deprecation.
* Add a German translation.
* Downgrade package priority to extra.
---
debian/changelog | 8 +
debian/control | 5 +-
debian/control.in | 5 +-
debian/po/POTFILES.in | 1 +
debian/po/de.po | 69 ++++++++
debian/po/templates.pot | 56 +++++++
...ostgresql-generic-postgis-2.0-scripts.templates | 18 +++
...gresql-generic-postgis-2.0-scripts.templates.in | 18 ---
debian/rules | 15 +-
doc/Makefile | 18 +--
doc/html/image_src/Makefile | 8 +-
java/jdbc/Makefile | 2 +-
libtool | 177 +++++++++++----------
topology/test/Makefile | 2 +-
14 files changed, 274 insertions(+), 128 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b1064c3..8165ead 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+postgis (2.1.2+dfsg-3) UNRELEASED; urgency=medium
+
+ * Allow translations of the debconf notice for postgis-2.0 deprecation.
+ * Add a German translation.
+ * Downgrade package priority to extra.
+
+ -- Markus Wanner <mar...@bluegap.ch> Mon, 07 Apr 2014 22:47:01 +0200
+
postgis (2.1.2+dfsg-2) unstable; urgency=medium
* Fix arch-only builds by moving the maven-repo-helper dependency from
diff --git a/debian/control b/debian/control
index 2d39a01..d8e7600 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,12 @@
Source: postgis
Section: misc
-Priority: optional
+Priority: extra
Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
Uploaders: Stephen Frost <sfr...@debian.org>, Francesco Paolo
Lovergine <fran...@debian.org>, Markus Wanner <mar...@bluegap.ch>,
Bas Couwenberg <sebas...@xs4all.nl>
-Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), autotools-dev,
+Build-Depends: debhelper (>= 9), po-debconf,
+ dpkg-dev (>= 1.16.1~), autotools-dev,
flex, bison, rdfind, libgeos-dev (>= 3.3), libjson0-dev (>= 0.9~),
libproj-dev (>= 4.6.0), libssl-dev, xsltproc, docbook, docbook-xsl,
imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~),
diff --git a/debian/control.in b/debian/control.in
index eb5c47c..ab948d5 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,11 +1,12 @@
Source: postgis
Section: misc
-Priority: optional
+Priority: extra
Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
Uploaders: Stephen Frost <sfr...@debian.org>, Francesco Paolo
Lovergine <fran...@debian.org>, Markus Wanner <mar...@bluegap.ch>,
Bas Couwenberg <sebas...@xs4all.nl>
-Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), autotools-dev,
+Build-Depends: debhelper (>= 9), po-debconf,
+ dpkg-dev (>= 1.16.1~), autotools-dev,
flex, bison, rdfind, libgeos-dev (>= 3.3), libjson0-dev (>= 0.9~),
libproj-dev (>= 4.6.0), libssl-dev, xsltproc, docbook, docbook-xsl,
imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~),
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
new file mode 100644
index 0000000..0113b7f
--- /dev/null
+++ b/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] postgresql-generic-postgis-2.0-scripts.templates
diff --git a/debian/po/de.po b/debian/po/de.po
new file mode 100644
index 0000000..b216dad
--- /dev/null
+++ b/debian/po/de.po
@@ -0,0 +1,69 @@
+# postgis debconf templates
+# Copyright (C) 2014 Markus Wanner <mar...@bluegap.ch>
+# This file is distributed under the same license as the postgis package.
+# Markus Wanner <mar...@bluegap.ch>, 2014
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: postgis\n"
+"Report-Msgid-Bugs-To: post...@packages.debian.org\n"
+"POT-Creation-Date: 2014-04-07 13:24+0200\n"
+"PO-Revision-Date: 2014-04-07 13:28+0100\n"
+"Last-Translator: Markus Wanner <mar...@bluegap.ch>\n"
+"Language-Team: German <d...@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#. Translators, note that @PGVERSION@ will automatically get replaced.
+#: ../postgresql-generic-postgis-2.0-scripts.templates:1001
+msgid "PostGIS 2.0 has been deprecated - please migrate your databases"
+msgstr ""
+"PostGIS 2.0 wird nicht mehr unterstützt - bitte migrieren Sie ihre "
+"Datenbanken"
+
+#. Type: note
+#. Description
+#. Translators, note that @PGVERSION@ will automatically get replaced.
+#: ../postgresql-generic-postgis-2.0-scripts.templates:1001
+msgid ""
+"The package postgresql-@PGVERSION@-postgis-2.0-scripts is installed on this "
+"system, which means you likely use the PostGIS extension in some databases."
+msgstr ""
+"Das Paket postgresql-@PGVERSION@-postgis-2.0-scripts ist auf diesem System "
+"installiert und wird möglicherweise in einigen Datenbanken genutzt."
+
+#. Type: note
+#. Description
+#. Translators, note that @PGVERSION@ will automatically get replaced.
+#: ../postgresql-generic-postgis-2.0-scripts.templates:1001
+msgid ""
+"Debian is now shipping PostGIS version 2.1 and dropped support for 2.0, "
+"meaning bug or security fixes will no longer be provided for the older one. "
+"Thus it is strongly recommended to migrate all databases to PostGIS 2.1 as "
+"soon as possible."
+msgstr ""
+"Debian liefert nun PostGIS in Version 2.1 aus und stellte die Unterstützung "
+"für 2.0 ein, d.h. es werden keine Sicherheitsupdates mehr geliefert. Deshalb "
+"empfiehlt es sich, so bald als möglich alle Datenbanken auf die neue Version "
+"zu migrieren."
+
+#. Type: note
+#. Description
+#. Translators, note that @PGVERSION@ will automatically get replaced.
+#: ../postgresql-generic-postgis-2.0-scripts.templates:1001
+msgid ""
+"Of course, databases that are already using PostGIS 2.0 will continue to "
+"work. Note, however, that with this upgrade it's no longer possible to "
+"create version 2.0 of the extension PostGIS. Instead, 'CREATE EXTENSION "
+"postgis;' will now give you version 2.1. Note that this also affects backups."
+msgstr ""
+"Selbstverständlich werden bestehende Datenbanken, die bereits PostGIS 2.0 "
+"verwenden, weiterhin funktionieren. Beachten Sie aber, dass es ab diesem "
+"Upgrade nicht mehr möglich sein wird, eine Datenbank mit Version 2.0 der "
+"Extension PostGIS zu erstellen. Stattdessen wird der Befehl 'CREATE "
+"EXTENSION postgis;' nun stets Version 2.1 installieren. Dies betrifft "
+"möglicherweise auch Backups."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
new file mode 100644
index 0000000..ed3a022
--- /dev/null
+++ b/debian/po/templates.pot
@@ -0,0 +1,56 @@
+# postgis debconf templates
+# Copyright (C) 2014 Markus Wanner <mar...@bluegap.ch>
+# This file is distributed under the same license as the postgis package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: postgis\n"
+"Report-Msgid-Bugs-To: post...@packages.debian.org\n"
+"POT-Creation-Date: 2014-04-07 13:24+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <l...@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#. Translators, note that @PGVERSION@ will automatically get replaced.
+#: ../postgresql-generic-postgis-2.0-scripts.templates:1001
+msgid "PostGIS 2.0 has been deprecated - please migrate your databases"
+msgstr ""
+
+#. Type: note
+#. Description
+#. Translators, note that @PGVERSION@ will automatically get replaced.
+#: ../postgresql-generic-postgis-2.0-scripts.templates:1001
+msgid ""
+"The package postgresql-@PGVERSION@-postgis-2.0-scripts is installed on this "
+"system, which means you likely use the PostGIS extension in some databases."
+msgstr ""
+
+#. Type: note
+#. Description
+#. Translators, note that @PGVERSION@ will automatically get replaced.
+#: ../postgresql-generic-postgis-2.0-scripts.templates:1001
+msgid ""
+"Debian is now shipping PostGIS version 2.1 and dropped support for 2.0, "
+"meaning bug or security fixes will no longer be provided for the older one. "
+"Thus it is strongly recommended to migrate all databases to PostGIS 2.1 as "
+"soon as possible."
+msgstr ""
+
+#. Type: note
+#. Description
+#. Translators, note that @PGVERSION@ will automatically get replaced.
+#: ../postgresql-generic-postgis-2.0-scripts.templates:1001
+msgid ""
+"Of course, databases that are already using PostGIS 2.0 will continue to "
+"work. Note, however, that with this upgrade it's no longer possible to "
+"create version 2.0 of the extension PostGIS. Instead, 'CREATE EXTENSION "
+"postgis;' will now give you version 2.1. Note that this also affects backups."
+msgstr ""
diff --git a/debian/postgresql-generic-postgis-2.0-scripts.templates
b/debian/postgresql-generic-postgis-2.0-scripts.templates
new file mode 100644
index 0000000..0ad36ac
--- /dev/null
+++ b/debian/postgresql-generic-postgis-2.0-scripts.templates
@@ -0,0 +1,18 @@
+Template: postgis/pg_@PGVERSION@_postgis_2.0_deprecated
+Type: note
+# Translators, note that @PGVERSION@ will automatically get replaced.
+_Description: PostGIS 2.0 has been deprecated - please migrate your databases
+ The package postgresql-@PGVERSION@-postgis-2.0-scripts is installed on
+ this system, which means you likely use the PostGIS extension in some
+ databases.
+ .
+ Debian is now shipping PostGIS version 2.1 and dropped support for 2.0,
+ meaning bug or security fixes will no longer be provided for the older
+ one. Thus it is strongly recommended to migrate all databases to PostGIS
+ 2.1 as soon as possible.
+ .
+ Of course, databases that are already using PostGIS 2.0 will continue to
+ work. Note, however, that with this upgrade it's no longer possible to
+ create version 2.0 of the extension PostGIS. Instead, 'CREATE EXTENSION
+ postgis;' will now give you version 2.1. Note that this also affects
+ backups.
diff --git a/debian/postgresql-generic-postgis-2.0-scripts.templates.in
b/debian/postgresql-generic-postgis-2.0-scripts.templates.in
deleted file mode 100644
index 5f62b64..0000000
--- a/debian/postgresql-generic-postgis-2.0-scripts.templates.in
+++ /dev/null
@@ -1,18 +0,0 @@
-Template: postgis/pg_@PGVERSION@_postgis_2.0_deprecated
-Type: note
-Description: PostGIS 2.0 has been deprecated - please migrate your databases
- The package postgresql-@PGVERSION@-postgis-2.0-scripts is installed on this
- system, which means you likely use the PostGIS extension in some
- databases.
- .
- Debian is now shipping PostGIS version 2.1 and dropped support for
- 2.0, meaning bug or security fixes will no longer be provided for the
- older one. Thus it is strongly recommended to migrate all databases
- to PostGIS 2.1 as soon as possible.
- .
- Of course, databases that are already using PostGIS 2.0 will continue
- to work. Note, however, that with this upgrade it's no longer
- possible to create version 2.0 of the extension PostGIS. Instead,
- 'CREATE EXTENSION postgis;' will now give you version 2.1. Note that
- this also affects backups.
-
diff --git a/debian/rules b/debian/rules
index a482daf..e222090 100755
--- a/debian/rules
+++ b/debian/rules
@@ -201,7 +201,6 @@ clean: debian/control
# Cleanup auto-generated packaging control files
rm -f $(CURDIR)/debian/postgresql-*-postgis-2.1.install
rm -f $(CURDIR)/debian/postgresql-*-postgis-scripts.install
- rm -f $(CURDIR)/debian/postgresql-*-postgis-2.0-scripts.templates
rm -f $(CURDIR)/debian/postgresql-*-postgis-2.0-scripts.postinst
rm -f $(CURDIR)/debian/postgresql-*-postgis-2.0-scripts.config
rm -f loader/cunit/cu_tester
@@ -254,6 +253,17 @@ install-indep: build-indep
$(CURDIR)/debian/postgresql-$$PGVER-postgis-scripts/usr/share/postgresql/$$PGVER/extension;
\
done)
+# Generate debconf templates base on the generic translatable
+# template, but replace @PGVERSION@ with the correct Postgres
+# verison for each -scripts package.
+ (set -e; \
+ for PGVER in $(OTHER_POSTGRES_VERSIONS) $(NEWEST_POSTGRES_VERSION); do \
+ mkdir -p
$(CURDIR)/debian/postgresql-$$PGVER-postgis-2.0-scripts/DEBIAN; \
+ po2debconf
$(CURDIR)/debian/postgresql-generic-postgis-2.0-scripts.templates \
+ | sed -e "s/@PGVERSION@/$$PGVER/" \
+ >
$(CURDIR)/debian/postgresql-$$PGVER-postgis-2.0-scripts/DEBIAN/templates; \
+ done)
+
mh_installjar -v -plibpostgis-java -l java/jdbc/pom.xml
java/jdbc/target/postgis-jdbc-$(POSTGIS_VERSION).jar
mh_installpoms -v -plibpostgis-java
@@ -291,9 +301,6 @@ install-arch: build-arch
cat
$(CURDIR)/debian/postgresql-generic-postgis-2.0-scripts.postinst.in \
| sed -e "s/@PGVERSION@/$$PGVER/" \
>
$(CURDIR)/debian/postgresql-$$PGVER-postgis-2.0-scripts.postinst; \
- cat
$(CURDIR)/debian/postgresql-generic-postgis-2.0-scripts.templates.in \
- | sed -e "s/@PGVERSION@/$$PGVER/" \
- >
$(CURDIR)/debian/postgresql-$$PGVER-postgis-2.0-scripts.templates; \
cat
$(CURDIR)/debian/postgresql-generic-postgis-2.0-scripts.config.in \
| sed -e "s/@PGVERSION@/$$PGVER/" \
>
$(CURDIR)/debian/postgresql-$$PGVER-postgis-2.0-scripts.config; \
diff --git a/doc/Makefile b/doc/Makefile
index 673bf74..1f5a4d1 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -30,10 +30,10 @@ POSTGIS_MICRO_VERSION=2
INSTALL=/usr/bin/install -c
INSTALL_DATA=${INSTALL} -m 644
-XSLTPROC=/opt/local/bin/xsltproc
-XSLBASE=
-XMLLINT=/opt/local/bin/xmllint
-PERL=/opt/local/bin/perl
+XSLTPROC=/usr/bin/xsltproc
+XSLBASE=/usr/share/xml/docbook/stylesheet/nwalsh
+XMLLINT=/usr/bin/xmllint
+PERL=/usr/bin/perl
# To allow network access use:
#
@@ -63,10 +63,10 @@ HTML_DOCBOOK_XSL=$(XSLBASE)/html/docbook.xsl
CHUNK_HTML_DOCBOOK_XSL=$(XSLBASE)/html/chunk.xsl
# DBLatex's dblatex script for PDF generation from DocBook
-DBLATEX=
+DBLATEX=/usr/bin/dblatex
# Imagemagick's convert utility program for generated images used in the
documentation
-IMAGEMAGICK=/opt/local/bin/convert
+IMAGEMAGICK=/usr/bin/convert
# Gettext for translated documentation
MSGMERGE=msgmerge
@@ -78,9 +78,9 @@ XML2POT=xml2pot
DBTOEPUB=dbtoepub
# Directories for postgresql subdirectories
-PGSQL_DOCDIR=/opt/pgsql/9.2/share/doc
-PGSQL_MANDIR=/opt/pgsql/9.2/share/man
-PGSQL_SHAREDIR=/opt/pgsql/9.2/share
+PGSQL_DOCDIR=/usr/share/doc/postgresql-doc-9.3
+PGSQL_MANDIR=/usr/share/postgresql/9.3/man
+PGSQL_SHAREDIR=/usr/share/postgresql/9.3
# If XSLTPROC or XSLBASE were not found during configure, we cannot
# build the documentation
diff --git a/doc/html/image_src/Makefile b/doc/html/image_src/Makefile
index 1b3d271..5025391 100644
--- a/doc/html/image_src/Makefile
+++ b/doc/html/image_src/Makefile
@@ -10,11 +10,11 @@
# *
# **********************************************************************
-CC=gcc
-CFLAGS=-g -O2 -Wall -Wmissing-prototypes -I/usr/local/include
+CC=x86_64-linux-gnu-gcc
+CFLAGS=-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat
-Werror=format-security -Wall -Wmissing-prototypes
-CUNIT_LDFLAGS=
-CUNIT_CPPFLAGS= -I../../../liblwgeom
+CUNIT_LDFLAGS=-Wl,-z,relro -lcunit
+CUNIT_CPPFLAGS=-D_FORTIFY_SOURCE=2 -I../../../liblwgeom
IMAGES= \
../images/de9im01.png \
diff --git a/java/jdbc/Makefile b/java/jdbc/Makefile
index 9711a16..dd4f5f9 100644
--- a/java/jdbc/Makefile
+++ b/java/jdbc/Makefile
@@ -10,7 +10,7 @@
# *
# **********************************************************************
-ANT=/opt/local/bin/ant
+ANT=/usr/bin/ant
all: build
diff --git a/libtool b/libtool
index 7e3ac41..e0ff6aa 100755
--- a/libtool
+++ b/libtool
@@ -1,8 +1,8 @@
-#! /bin/sh
+#! /bin/bash
# libtool - Provide generalized library-building support services.
# Generated automatically by config.status ()
-# Libtool was configured on host Butterfly.local:
+# Libtool was configured on host argodan:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -53,10 +53,10 @@ build_old_libs=yes
pic_mode=default
# Whether or not to optimize for fast installation.
-fast_install=needless
+fast_install=yes
# Shell to use when invoking shell scripts.
-SHELL="/bin/sh"
+SHELL="/bin/bash"
# An echo program that protects backslashes.
ECHO="printf %s\\n"
@@ -65,38 +65,38 @@ ECHO="printf %s\\n"
PATH_SEPARATOR=":"
# The host system.
-host_alias=
-host=x86_64-apple-darwin13.1.0
-host_os=darwin13.1.0
+host_alias=x86_64-linux-gnu
+host=x86_64-pc-linux-gnu
+host_os=linux-gnu
# The build system.
-build_alias=
-build=x86_64-apple-darwin13.1.0
-build_os=darwin13.1.0
+build_alias=x86_64-linux-gnu
+build=x86_64-pc-linux-gnu
+build_os=linux-gnu
# A sed program that does not truncate output.
-SED="/usr/bin/sed"
+SED="/bin/sed"
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
Xsed="$SED -e 1s/^X//"
# A grep program that handles long lines.
-GREP="/usr/bin/grep"
+GREP="/bin/grep"
# An ERE matcher.
-EGREP="/usr/bin/grep -E"
+EGREP="/bin/grep -E"
# A literal string matcher.
-FGREP="/usr/bin/grep -F"
+FGREP="/bin/grep -F"
# A BSD- or MS-compatible name lister.
-NM="/usr/bin/nm"
+NM="/usr/bin/nm -B"
# Whether we need soft or hard links.
LN_S="ln -s"
# What is the maximum length of a command?
-max_cmd_len=196608
+max_cmd_len=3458764513820540925
# Object file suffix (normally "o").
objext=o
@@ -120,7 +120,7 @@ to_host_file_cmd=func_convert_file_noop
to_tool_file_cmd=func_convert_file_noop
# An object symbol dumper.
-OBJDUMP="false"
+OBJDUMP="objdump"
# Method to check whether dependent libraries are shared objects.
deplibs_check_method="pass_all"
@@ -147,7 +147,7 @@ AR="ar"
AR_FLAGS="cru"
# How to feed a file listing to the archiver.
-archiver_list_spec=""
+archiver_list_spec="@"
# A symbol stripping program.
STRIP="strip"
@@ -158,28 +158,28 @@ old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB
\$tool_oldlib"
old_postuninstall_cmds=""
# Whether to use a lock for old archive extraction.
-lock_old_archive_extraction=yes
+lock_old_archive_extraction=no
# A C compiler.
-LTCC="gcc"
+LTCC="x86_64-linux-gnu-gcc"
# LTCC compiler flags.
-LTCFLAGS="-g -O2"
+LTCFLAGS="-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat
-Werror=format-security"
# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BCDEGRST][BCDEGRST]*\\)[ ][
]*_\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 _\\2 \\2/p' | sed '/ __gnu_lto/d'"
+global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[
][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p' | sed '/ __gnu_lto/d'"
# Transform the output of nm in a proper C declaration.
-global_symbol_to_cdecl="sed -n -e 's/^T .* \\(.*\\)\$/extern int \\1();/p' -e
's/^[BCDEGRST]* .* \\(.*\\)\$/extern char \\1;/p'"
+global_symbol_to_cdecl="sed -n -e 's/^T .* \\(.*\\)\$/extern int \\1();/p' -e
's/^[ABCDGIRSTW]* .* \\(.*\\)\$/extern char \\1;/p'"
# Transform the output of nm in a C name address pair.
-global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/
{\\\"\\1\\\", (void *) 0},/p' -e 's/^[BCDEGRST]* \\([^ ]*\\) \\([^ ]*\\)\$/
{\"\\2\", (void *) \\&\\2},/p'"
+global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/
{\\\"\\1\\\", (void *) 0},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\([^ ]*\\)\$/
{\"\\2\", (void *) \\&\\2},/p'"
# Transform the output of nm in a C name address pair when lib prefix is
needed.
-global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/
{\\\"\\1\\\", (void *) 0},/p' -e 's/^[BCDEGRST]* \\([^ ]*\\) \\(lib[^ ]*\\)\$/
{\"\\2\", (void *) \\&\\2},/p' -e 's/^[BCDEGRST]* \\([^ ]*\\) \\([^ ]*\\)\$/
{\"lib\\2\", (void *) \\&\\2},/p'"
+global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/
{\\\"\\1\\\", (void *) 0},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\(lib[^
]*\\)\$/ {\"\\2\", (void *) \\&\\2},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\([^
]*\\)\$/ {\"lib\\2\", (void *) \\&\\2},/p'"
# Specify filename containing input files for $NM.
-nm_file_list_spec=""
+nm_file_list_spec="@"
# The root where to search for dependent libraries,and in which our libraries
should be installed.
lt_sysroot=
@@ -197,32 +197,32 @@ need_locks="no"
MANIFEST_TOOL=":"
# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-DSYMUTIL="dsymutil"
+DSYMUTIL=""
# Tool to change global to local symbols on Mac OS X.
-NMEDIT="nmedit"
+NMEDIT=""
# Tool to manipulate fat objects and archives on Mac OS X.
-LIPO="lipo"
+LIPO=""
# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-OTOOL="otool"
+OTOOL=""
# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-OTOOL64=":"
+OTOOL64=""
# Old archive suffix (normally "a").
libext=a
# Shared library suffix (normally ".so").
-shrext_cmds="\`test .\$module = .yes && echo .so || echo .dylib\`"
+shrext_cmds=".so"
# The commands to extract the exported symbol list from a shared archive.
extract_expsyms_cmds=""
# Variables whose values should be saved in libtool wrapper scripts and
# restored at link time.
-variables_saved_for_relink="PATH DYLD_LIBRARY_PATH GCC_EXEC_PREFIX
COMPILER_PATH LIBRARY_PATH"
+variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX
COMPILER_PATH LIBRARY_PATH"
# Do we need the "lib" prefix for modules?
need_lib_prefix=no
@@ -231,26 +231,26 @@ need_lib_prefix=no
need_version=no
# Library versioning type.
-version_type=darwin
+version_type=linux
# Shared library runtime path variable.
-runpath_var=
+runpath_var=LD_RUN_PATH
# Shared library path variable.
-shlibpath_var=DYLD_LIBRARY_PATH
+shlibpath_var=LD_LIBRARY_PATH
# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=yes
+shlibpath_overrides_runpath=no
# Format of library name prefix.
libname_spec="lib\$name"
# List of archive names. First name is the real one, the rest are links.
# The last name is the one that the linker finds with -lNAME
-library_names_spec="\${libname}\${release}\${major}\$shared_ext
\${libname}\$shared_ext"
+library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix
\${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}"
# The coded name of the library, if different from the real name.
-soname_spec="\${libname}\${release}\${major}\$shared_ext"
+soname_spec="\${libname}\${release}\${shared_ext}\$major"
# Permission mode override for installation of shared libraries.
install_override_mode=""
@@ -262,20 +262,20 @@ postinstall_cmds=""
postuninstall_cmds=""
# Commands used to finish a libtool library installation in a directory.
-finish_cmds=""
+finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
# As "finish_cmds", except a single script fragment to be evaled but
# not shown.
finish_eval=""
# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=no
+hardcode_into_libs=yes
# Compile-time system search path for libraries.
-sys_lib_search_path_spec="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/5.1
/usr/local/lib"
+sys_lib_search_path_spec="/usr/lib/gcc/x86_64-linux-gnu/4.8
/usr/lib/x86_64-linux-gnu /usr/lib /lib/x86_64-linux-gnu /lib "
# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec="/usr/local/lib /lib /usr/lib"
+sys_lib_dlsearch_path_spec="/lib /usr/lib /lib/i386-linux-gnu
/usr/lib/i386-linux-gnu /lib/i486-linux-gnu /usr/lib/i486-linux-gnu
/usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu /lib32
/usr/lib32 "
# Whether dlopen is supported.
dlopen_support=unknown
@@ -287,37 +287,37 @@ dlopen_self=unknown
dlopen_self_static=unknown
# Commands to strip libraries.
-old_striplib="strip -S"
-striplib="strip -x"
+old_striplib="strip --strip-debug"
+striplib="strip --strip-unneeded"
# The linker used to build libraries.
-LD="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld"
+LD="/usr/bin/ld -m elf_x86_64"
# How to create reloadable object files.
reload_flag=" -r"
-reload_cmds="\$LTCC \$LTCFLAGS -nostdlib \${wl}-r -o \$output\$reload_objs"
+reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
# Commands used to build an old-style archive.
old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib"
# A language specific compiler.
-CC="gcc"
+CC="x86_64-linux-gnu-gcc"
# Is the compiler the GNU compiler?
with_gcc=yes
# Compiler flag to turn off builtin functions.
-no_builtin_flag=" -fno-builtin -fno-rtti -fno-exceptions"
+no_builtin_flag=" -fno-builtin"
# Additional compiler flags for building library objects.
-pic_flag=" -fno-common -DPIC"
+pic_flag=" -fPIC -DPIC"
# How to pass a linker flag through the compiler.
wl="-Wl,"
# Compiler flag to prevent dynamic linking.
-link_static_flag=""
+link_static_flag="-static"
# Does compiler simultaneously support -c and -o options?
compiler_c_o="yes"
@@ -329,10 +329,10 @@ build_libtool_need_lc=no
allow_libtool_libs_with_static_runtimes=no
# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=""
+export_dynamic_flag_spec="\${wl}--export-dynamic"
# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec="\`for conv in \$convenience\\\"\\\"; do test -n
\\\"\$conv\\\" && new_convenience=\\\"\$new_convenience
\${wl}-force_load,\$conv\\\"; done; func_echo_all \\\"\$new_convenience\\\"\`"
+whole_archive_flag_spec="\${wl}--whole-archive\$convenience
\${wl}--no-whole-archive"
# Whether the compiler copes with passing no objects directly.
compiler_needs_object="no"
@@ -344,26 +344,29 @@ old_archive_from_new_cmds=""
old_archive_from_expsyms_cmds=""
# Commands used to build a shared archive.
-archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs
\$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring
\$single_module"
-archive_expsym_cmds="sed 's,^,_,' < \$export_symbols >
\$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib
\$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags
-install_name \$rpath/\$soname \$verstring \$single_module
\${wl}-exported_symbols_list,\$output_objdir/\${libname}-symbols.expsym"
+archive_cmds="\$CC -shared \$pic_flag \$libobjs \$deplibs \$compiler_flags
\${wl}-soname \$wl\$soname -o \$lib"
+archive_expsym_cmds="echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~
+ cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >>
\$output_objdir/\$libname.ver~
+ echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~
+ \$CC -shared \$pic_flag \$libobjs \$deplibs \$compiler_flags
\${wl}-soname \$wl\$soname \${wl}-version-script
\${wl}\$output_objdir/\$libname.ver -o \$lib"
# Commands used to build a loadable module if different from building
# a shared archive.
-module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs
\$compiler_flags"
-module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols >
\$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib
-bundle \$libobjs \$deplibs \$compiler_flags
\${wl}-exported_symbols_list,\$output_objdir/\${libname}-symbols.expsym"
+module_cmds=""
+module_expsym_cmds=""
# Whether we are building with GNU ld or not.
-with_gnu_ld="no"
+with_gnu_ld="yes"
# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag="\${wl}-undefined \${wl}dynamic_lookup"
+allow_undefined_flag=""
# Flag that enforces no undefined symbols.
no_undefined_flag=""
# Flag to hardcode $libdir into a binary during linking.
# This must work even if $libdir does not exist
-hardcode_libdir_flag_spec=""
+hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir"
# Whether we need a single "-rpath" flag with a separated argument.
hardcode_libdir_separator=""
@@ -389,14 +392,14 @@ hardcode_shlibpath_var=unsupported
# Set to "yes" if building a shared library automatically hardcodes DIR
# into the library and all subsequent libraries and executables linked
# against it.
-hardcode_automatic=yes
+hardcode_automatic=no
# Set to yes if linker adds runtime paths of dependent libraries
# to runtime path list.
inherit_rpath=no
# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=yes
+link_all_deplibs=unknown
# Set to "yes" if exported symbols are required.
always_export_symbols=no
@@ -1274,7 +1277,7 @@ exec_cmd=
# Append VALUE to the end of shell variable VAR.
func_append ()
{
-eval "${1}+=\${2}"
+ eval "${1}+=\${2}"
} # Extended-shell func_append implementation
# func_append_quoted var value
@@ -1290,7 +1293,7 @@ func_append_quoted ()
# func_arith arithmetic-term...
func_arith ()
{
-func_arith_result=$(( $* ))
+ func_arith_result=$(( $* ))
} # Extended-shell func_arith implementation
@@ -1298,7 +1301,7 @@ func_arith_result=$(( $* ))
# STRING may not start with a hyphen.
func_len ()
{
-func_len_result=${#1}
+ func_len_result=${#1}
} # Extended-shell func_len implementation
@@ -1315,7 +1318,7 @@ func_lo2o ()
# func_xform libobj-or-source
func_xform ()
{
-func_xform_result=${1%.*}.lo
+ func_xform_result=${1%.*}.lo
} # Extended-shell func_xform implementation
@@ -10091,17 +10094,17 @@ build_old_libs=`case $build_libtool_libs in yes) echo
no;; *) echo yes;; esac`
# ### BEGIN LIBTOOL TAG CONFIG: CXX
# The linker used to build libraries.
-LD="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld"
+LD="/usr/bin/ld -m elf_x86_64"
# How to create reloadable object files.
reload_flag=" -r"
-reload_cmds="\$LTCC \$LTCFLAGS -nostdlib \${wl}-r -o \$output\$reload_objs"
+reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
# Commands used to build an old-style archive.
old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib"
# A language specific compiler.
-CC="g++"
+CC="x86_64-linux-gnu-g++"
# Is the compiler the GNU compiler?
with_gcc=yes
@@ -10110,13 +10113,13 @@ with_gcc=yes
no_builtin_flag=" -fno-builtin"
# Additional compiler flags for building library objects.
-pic_flag=" -fno-common -DPIC"
+pic_flag=" -fPIC -DPIC"
# How to pass a linker flag through the compiler.
wl="-Wl,"
# Compiler flag to prevent dynamic linking.
-link_static_flag=""
+link_static_flag="-static"
# Does compiler simultaneously support -c and -o options?
compiler_c_o="yes"
@@ -10128,10 +10131,10 @@ build_libtool_need_lc=no
allow_libtool_libs_with_static_runtimes=no
# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=""
+export_dynamic_flag_spec="\${wl}--export-dynamic"
# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec="\`for conv in \$convenience\\\"\\\"; do test -n
\\\"\$conv\\\" && new_convenience=\\\"\$new_convenience
\${wl}-force_load,\$conv\\\"; done; func_echo_all \\\"\$new_convenience\\\"\`"
+whole_archive_flag_spec="\${wl}--whole-archive\$convenience
\${wl}--no-whole-archive"
# Whether the compiler copes with passing no objects directly.
compiler_needs_object="no"
@@ -10143,26 +10146,26 @@ old_archive_from_new_cmds=""
old_archive_from_expsyms_cmds=""
# Commands used to build a shared archive.
-archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs
\$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring
\$single_module"
-archive_expsym_cmds="sed 's,^,_,' < \$export_symbols >
\$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib
\$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags
-install_name \$rpath/\$soname \$verstring \$single_module
\${wl}-exported_symbols_list,\$output_objdir/\${libname}-symbols.expsym"
+archive_cmds="\$CC \$pic_flag -shared -nostdlib \$predep_objects \$libobjs
\$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname -o
\$lib"
+archive_expsym_cmds="\$CC \$pic_flag -shared -nostdlib \$predep_objects
\$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname
\$wl\$soname \${wl}-retain-symbols-file \$wl\$export_symbols -o \$lib"
# Commands used to build a loadable module if different from building
# a shared archive.
-module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs
\$compiler_flags"
-module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols >
\$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib
-bundle \$libobjs \$deplibs \$compiler_flags
\${wl}-exported_symbols_list,\$output_objdir/\${libname}-symbols.expsym"
+module_cmds=""
+module_expsym_cmds=""
# Whether we are building with GNU ld or not.
-with_gnu_ld="no"
+with_gnu_ld="yes"
# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag="\${wl}-undefined \${wl}dynamic_lookup"
+allow_undefined_flag=""
# Flag that enforces no undefined symbols.
no_undefined_flag=""
# Flag to hardcode $libdir into a binary during linking.
# This must work even if $libdir does not exist
-hardcode_libdir_flag_spec=""
+hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir"
# Whether we need a single "-rpath" flag with a separated argument.
hardcode_libdir_separator=""
@@ -10188,14 +10191,14 @@ hardcode_shlibpath_var=unsupported
# Set to "yes" if building a shared library automatically hardcodes DIR
# into the library and all subsequent libraries and executables linked
# against it.
-hardcode_automatic=yes
+hardcode_automatic=no
# Set to yes if linker adds runtime paths of dependent libraries
# to runtime path list.
inherit_rpath=no
# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=yes
+link_all_deplibs=unknown
# Set to "yes" if exported symbols are required.
always_export_symbols=no
@@ -10222,17 +10225,17 @@ file_list_spec=""
hardcode_action=immediate
# The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs=""
+compiler_lib_search_dirs="/usr/lib/gcc/x86_64-linux-gnu/4.8
/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../x86_64-linux-gnu
/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../lib /lib/x86_64-linux-gnu
/lib/../lib /usr/lib/x86_64-linux-gnu /usr/lib/../lib
/usr/lib/gcc/x86_64-linux-gnu/4.8/../../.."
# Dependencies to place before and after the objects being linked to
# create a shared library.
-predep_objects=""
-postdep_objects=""
+predep_objects="/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../x86_64-linux-gnu/crti.o
/usr/lib/gcc/x86_64-linux-gnu/4.8/crtbeginS.o"
+postdep_objects="/usr/lib/gcc/x86_64-linux-gnu/4.8/crtendS.o
/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../x86_64-linux-gnu/crtn.o"
predeps=""
-postdeps=""
+postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s"
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=""
+compiler_lib_search_path="-L/usr/lib/gcc/x86_64-linux-gnu/4.8
-L/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../x86_64-linux-gnu
-L/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../lib -L/lib/x86_64-linux-gnu
-L/lib/../lib -L/usr/lib/x86_64-linux-gnu -L/usr/lib/../lib
-L/usr/lib/gcc/x86_64-linux-gnu/4.8/../../.."
# ### END LIBTOOL TAG CONFIG: CXX
diff --git a/topology/test/Makefile b/topology/test/Makefile
index 7a7cf9e..59e509c 100644
--- a/topology/test/Makefile
+++ b/topology/test/Makefile
@@ -1,7 +1,7 @@
DATABASE=postgis_topo_regress
PSQL=psql
-PERL=/opt/local/bin/perl
+PERL=/usr/bin/perl
GEOS_NUMERIC_VERSION=30402
all:
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/postgis.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
