From f8fd344d9f82614bbaed19300a65c5f55d33335a Mon Sep 17 00:00:00 2001 From: Benjamin Guillon Date: Thu, 4 Jun 2015 09:51:03 +0200 Subject: [PATCH 1/3] Updated makefile for deb creation Added the ability to fetch the installed postgresql version when building the deb package so that install paths are correct. --- Makefile | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index e4e48e30..52dc4a9b 100644 --- a/Makefile +++ b/Makefile @@ -67,16 +67,23 @@ clean: rm -f repmgr $(MAKE) -C sql clean +# Get correct version numbers and install paths, depending on your postgres version +PG_VERSION = $(shell pg_config --version | cut -d ' ' -f 2 | cut -d '.' -f 1,2) +REPMGR_VERSION = $(shell grep REPMGR_VERSION version.h | cut -d ' ' -f 3 | cut -d '"' -f 2) +PKGLIBDIR = $(shell pg_config --pkglibdir) +SHAREDIR = $(shell pg_config --sharedir) + deb: repmgrd repmgr - mkdir -p ./debian/usr/bin - cp repmgrd repmgr ./debian/usr/bin/ - mkdir -p ./debian/usr/share/postgresql/9.0/contrib/ - cp sql/repmgr_funcs.sql ./debian/usr/share/postgresql/9.0/contrib/ - cp sql/uninstall_repmgr_funcs.sql ./debian/usr/share/postgresql/9.0/contrib/ - mkdir -p ./debian/usr/lib/postgresql/9.0/lib/ - cp sql/repmgr_funcs.so ./debian/usr/lib/postgresql/9.0/lib/ - dpkg-deb --build debian - mv debian.deb ../postgresql-repmgr-9.0_1.0.0.deb - rm -rf ./debian/usr + mkdir -p ./debian/usr/bin + cp repmgrd repmgr ./debian/usr/bin/ + mkdir -p ./debian$(SHAREDIR)/contrib/ + cp sql/repmgr_funcs.sql ./debian$(SHAREDIR)/contrib/ + cp sql/uninstall_repmgr_funcs.sql ./debian$(SHAREDIR)/contrib/ + mkdir -p ./debian$(PKGLIBDIR)/ + cp sql/repmgr_funcs.so ./debian$(PKGLIBDIR)/ + dpkg-deb --build debian + mv debian.deb ../postgresql-repmgr-$(PG_VERSION)_$(REPMGR_VERSION).deb + rm -rf ./debian/usr + From cd7a3215dffec053a18a52d26bd1ca4ec6b7cf61 Mon Sep 17 00:00:00 2001 From: Benjamin Guillon Date: Thu, 4 Jun 2015 11:25:45 +0200 Subject: [PATCH 2/3] Fixed tabs/spaces issues caused by lazy copy/paster in github web UI when creating the PR. --- Makefile | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 52dc4a9b..0652eb4f 100644 --- a/Makefile +++ b/Makefile @@ -74,16 +74,14 @@ PKGLIBDIR = $(shell pg_config --pkglibdir) SHAREDIR = $(shell pg_config --sharedir) deb: repmgrd repmgr - mkdir -p ./debian/usr/bin - cp repmgrd repmgr ./debian/usr/bin/ - mkdir -p ./debian$(SHAREDIR)/contrib/ - cp sql/repmgr_funcs.sql ./debian$(SHAREDIR)/contrib/ - cp sql/uninstall_repmgr_funcs.sql ./debian$(SHAREDIR)/contrib/ - mkdir -p ./debian$(PKGLIBDIR)/ - cp sql/repmgr_funcs.so ./debian$(PKGLIBDIR)/ - dpkg-deb --build debian - mv debian.deb ../postgresql-repmgr-$(PG_VERSION)_$(REPMGR_VERSION).deb - rm -rf ./debian/usr - - + mkdir -p ./debian/usr/bin + cp repmgrd repmgr ./debian/usr/bin/ + mkdir -p ./debian$(SHAREDIR)/contrib/ + cp sql/repmgr_funcs.sql ./debian$(SHAREDIR)/contrib/ + cp sql/uninstall_repmgr_funcs.sql ./debian$(SHAREDIR)/contrib/ + mkdir -p ./debian$(PKGLIBDIR)/ + cp sql/repmgr_funcs.so ./debian$(PKGLIBDIR)/ + dpkg-deb --build debian + mv debian.deb ../postgresql-repmgr-$(PG_VERSION)_$(REPMGR_VERSION).deb + rm -rf ./debian/usr From 899d789699c02c6f3f0b7988527e139e5d43a001 Mon Sep 17 00:00:00 2001 From: Benjamin Guillon Date: Thu, 4 Jun 2015 11:26:36 +0200 Subject: [PATCH 3/3] Fixed version number and package dependencies in deb control file. --- debian/DEBIAN/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/DEBIAN/control b/debian/DEBIAN/control index b0d776db..6a7b12b0 100644 --- a/debian/DEBIAN/control +++ b/debian/DEBIAN/control @@ -1,9 +1,9 @@ Package: repmgr-auto -Version: 2.0beta2 +Version: v3.0.1 Section: database Priority: optional Architecture: all -Depends: rsync, postgresql-9.0 | postgresql-9.1 | postgresql-9.2 | postgresql-9.3 | postgresql-9.4 +Depends: rsync, postgresql-9.3 | postgresql-9.4 Maintainer: Jaime Casanova Description: PostgreSQL replication setup, magament and monitoring has two main executables