[SCM] postgis branch, master, updated. upstream/2.0.1-87-g7202c7e

[Markus Wanner]

The following commit has been merged in the master branch:
commit 7202c7e1029f89efde8292b8c4b3ea085edb0d47
Merge: f3a8f80f4f835c4b30fd807103100dab50a73234 0a553086a7d525b0beda6594c887a9a38bc972ec
Author: Markus Wanner <markus at bluegap.ch>
Date:   Tue Sep 10 21:56:40 2013 +0200

    Merge branch 'master' of git://anonscm.debian.org/pkg-grass/postgis

diff --combined debian/rules
index 7bb1f40,51ae5f6..28c06d1
--- a/debian/rules
+++ b/debian/rules
@@@ -19,7 -19,7 +19,7 @@@ DPKG_EXPORT_BUILDFLAGS = 
  include /usr/share/dpkg/buildflags.mk
  
  CHECK = check
- ifneq (,$(findstring nocheck,$(DEB_BUILLD_OPTIONS)))
+ ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
  	CHECK =
  endif
  
@@@ -36,7 -36,8 +36,7 @@@ debian/control: debian/control.in debia
  		sed -e "s:NEWEST_PGVERSION:$$NEWEST_VERSION:" > $@.pgxs_tmp; \
  	for v in $$VERSIONS; \
          do                                         \
 -		grep -q "^$$v" debian/pgversions   \
 -		&& grep-dctrl -P PGVERSION $<      \
 +		grep-dctrl -P PGVERSION $<      \
  		| sed -e "s:PGVERSION:$$v:" >> $@.pgxs_tmp; \
  	done; \
  	mv $@.pgxs_tmp $@) || (rm -f $@.pgxs_tmp; exit 1)
@@@ -249,7 -250,7 +249,7 @@@ install-arch: build-arc
  			PGSQL_DOCDIR=/usr/share/doc \
  			PGSQL_MANDIR=/usr/share/man
  
 -#	Auto-create required .install file for the current Postgres version.
 +#	Auto-create required .install file for each Postgres major version
  	(set -e; \
  	for PGVER in $(OTHER_POSTGRES_VERSIONS) $(NEWEST_POSTGRES_VERSION); do \
  		cat $(CURDIR)/debian/postgresql-generic-postgis-2.1.install.in \
@@@ -260,12 -261,6 +260,12 @@@
  			> $(CURDIR)/debian/postgresql-$$PGVER-postgis-2.1-scripts.install; \
  	done)
  
 +#	Copy binaries from the NEWEST_POSTGRES_VERSION build to the
 +#	'postgis' binary package.
 +	mkdir -p $(CURDIR)/debian/postgis/usr/bin
 +	cp -r $(CURDIR)/debian/tmp/usr/lib/postgresql/$(NEWEST_POSTGRES_VERSION)/bin/* \
 +		$(CURDIR)/debian/postgis/usr/bin/
 +
  	dh_install -s
  
  check: build-arch-stamp

-- 
PostGIS for PostgreSQL