[postgis] 07/08: Consistently format pipes.
Bas Couwenberg
sebastic at debian.org
Sat Oct 8 21:43:03 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch modern-packaging
in repository postgis.
commit 2de2ce360762ea63bf20d2341e1b1ac6bd0a3e3e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Oct 8 22:23:29 2016 +0200
Consistently format pipes.
---
debian/rules | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/debian/rules b/debian/rules
index f1d75c4..a70e07f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,10 +22,10 @@ debian/control: debian/control.in debian/pgversions
(set -e; \
VERSIONS=`pg_buildext supported-versions $(CURDIR)` || exit $$?; \
NEWEST_VERSION=`pg_buildext supported-versions $(CURDIR) | tail -1` || exit $$?; \
- grep-dctrl -vP PGVERSION $< | \
- sed -e "s:NEWEST_PGVERSION:$$NEWEST_VERSION:" > $@.pgxs_tmp; \
+ grep-dctrl -vP PGVERSION $< \
+ | sed -e "s:NEWEST_PGVERSION:$$NEWEST_VERSION:" > $@.pgxs_tmp; \
for v in $$VERSIONS; do \
- 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)
@@ -62,9 +62,9 @@ endif
# Upstream version (including ~rcN) for symbols version
UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
-MAJOR_VERSION = $(shell grep ^POSTGIS_MAJOR_VERSION Version.config|cut -d= -f2)
-MINOR_VERSION = $(shell grep ^POSTGIS_MINOR_VERSION Version.config|cut -d= -f2)
-MICRO_VERSION = $(shell grep ^POSTGIS_MICRO_VERSION Version.config|cut -d= -f2)
+MAJOR_VERSION = $(shell grep ^POSTGIS_MAJOR_VERSION Version.config | cut -d= -f2)
+MINOR_VERSION = $(shell grep ^POSTGIS_MINOR_VERSION Version.config | cut -d= -f2)
+MICRO_VERSION = $(shell grep ^POSTGIS_MICRO_VERSION Version.config | cut -d= -f2)
POSTGIS_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
ifeq ($(POSTGIS_VERSION),..)
$(error Cannot detect Postgis version, fix debian/rules)
@@ -81,12 +81,12 @@ endif
# For the Postgres APT repository, we want to support multiple
# Postgres versions. However, docs and the JDBC jar only need to be
# built once - in the main directory.
-NEWEST_POSTGRES_VERSION = $(shell pg_buildext supported-versions $(CURDIR)|tail -1)
+NEWEST_POSTGRES_VERSION = $(shell pg_buildext supported-versions $(CURDIR) | tail -1)
ifeq ($(NEWEST_POSTGRES_VERSION),)
$(error Cannot detect Postgres version, check debian/pgversions and pg_buildext)
endif
-OTHER_POSTGRES_VERSIONS = $(shell pg_buildext supported-versions $(CURDIR)\
+OTHER_POSTGRES_VERSIONS = $(shell pg_buildext supported-versions $(CURDIR) \
| grep -v "$(NEWEST_POSTGRES_VERSION)")
COMMON_CONFIGURE_ARGS = --host=$(DEB_HOST_GNU_TYPE) \
@@ -139,7 +139,7 @@ override_dh_auto_configure:
(set -e; \
for PGVER in $(OTHER_POSTGRES_VERSIONS); do \
mkdir $(CURDIR)/debian/build-$$PGVER; \
- for FILE in `ls $(CURDIR)|grep -v debian`; do \
+ for FILE in `ls $(CURDIR) | grep -v debian`; do \
cp -a $$FILE $(CURDIR)/debian/build-$$PGVER; \
done; \
done)
--
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