Skip to content

Commit

Permalink
deb cleanup
Browse files Browse the repository at this point in the history
* use installed pg_buildext
* use installed pgxs_debian_control.mk
* don't override 'clean' target in debian/rules
* 'make deb' forces control file regeneration

This reduces crap maintained locally.

It also does mean that to build against server-dev-X.Y package
that is not for Debians default Postgres version, following packages
need to be installed from PGDG (wiki.postgresql.org/wiki/Apt) repo:

  postgresql-client-common
  postgresql-common
  postgresql-server-dev-all
  • Loading branch information
markokr committed Jan 4, 2013
1 parent 01936d6 commit 60968a2
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 127 deletions.
2 changes: 2 additions & 0 deletions Makefile
Expand Up @@ -146,6 +146,8 @@ ack:
cp results/*.out test/expected/

deb:
rm -f debian/control
make -f debian/rules debian/control
debuild -uc -us -b

debclean:
Expand Down
111 changes: 0 additions & 111 deletions debian/pg_buildext

This file was deleted.

21 changes: 5 additions & 16 deletions debian/rules
Expand Up @@ -6,19 +6,11 @@
DEB_BUILD_OPTIONS := nostrip nocheck
export DEB_BUILD_OPTIONS

PG_BUILDEXT = ./debian/pg_buildext
PG_BUILDEXT = pg_buildext

debian/control-stamp: debian/control.in debian/pgversions debian/rules
grep-dctrl -vP PGVERSION debian/control.in > debian/control
for v in $$($(PG_BUILDEXT) supported-versions . ); \
do \
grep -q "^$$v" debian/pgversions \
&& grep-dctrl -P PGVERSION debian/control.in \
| sed -e "s:PGVERSION:$$v:" >> debian/control; \
done
touch $@
include /usr/share/postgresql-common/pgxs_debian_control.mk

clean: debian/control-stamp
override_dh_auto_clean:
for v in $$($(PG_BUILDEXT) supported-versions . ) ; do \
rm -rf debian/postgresql-plproxy-$${v}; \
done
Expand All @@ -34,13 +26,10 @@ override_dh_auto_install:
|| exit 1 ; \
done

build binary override_dh_auto_build: debian/control-stamp

build binary binary-arch binary-indep:
%:
dh $@

.PHONY: build binary binary-arch binary-indep clean
.PHONY: orig override_dh_auto_install override_dh_auto_clean override_dh_auto_build
.PHONY: orig realclean

PKGVERS = $(shell dpkg-parsechangelog | awk -F '[:-]' '/^Version:/ { print substr($$2, 2) }')
srcpkg = plproxy2_$(PKGVERS)
Expand Down

0 comments on commit 60968a2

Please sign in to comment.