diff --git a/debian/changelog b/debian/changelog index cf13c76..424d706 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,12 @@ orafce (3.0.6-1) UNRELEASED; urgency=medium * New upstream release + + Updated bison support (closes: #710633) + + Fixes extension loading (closes: #705408) * Point watch file at https://github.com/orafce/orafce/releases + * Support all PostgreSQL versions (closes: #731515) + * Add autopkgtest support + * Add myself to Uploaders -- Christoph Berg Mon, 17 Feb 2014 11:44:07 +0100 diff --git a/debian/control b/debian/control index 70362e1..55e9c36 100644 --- a/debian/control +++ b/debian/control @@ -2,16 +2,18 @@ Section: database Priority: optional Maintainer: Peter Eisentraut -Build-Depends: bison, debhelper (>= 8), flex, postgresql-server-dev-all (>= 119~) -Standards-Version: 3.9.2 +Uploaders: Christoph Berg +Build-Depends: bison, debhelper (>= 8), flex, postgresql-server-dev-all (>= 153~) +Standards-Version: 3.9.5 Homepage: http://orafce.projects.postgresql.org/ Vcs-Svn: svn://svn.debian.org/pkg-postgresql/trunk/orafce/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-postgresql/trunk/orafce/ +XS-Testsuite: autopkgtest -Package: postgresql-9.1-orafce +Package: postgresql-9.3-orafce Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, postgresql-9.1 -Description: Oracle support functions for PostgreSQL 9.1 +Depends: ${misc:Depends}, ${shlibs:Depends}, postgresql-9.3 +Description: Oracle support functions for PostgreSQL 9.3 This project implements some functions for compatibility with Oracle. The functionality was verified on Oracle 10g, and the module is useful for production work. diff --git a/debian/control.in b/debian/control.in index 8effcce..0086c25 100644 --- a/debian/control.in +++ b/debian/control.in @@ -2,11 +2,13 @@ Section: database Priority: optional Maintainer: Peter Eisentraut -Build-Depends: bison, debhelper (>= 8), flex, postgresql-server-dev-all (>= 128~) -Standards-Version: 3.9.2 +Uploaders: Christoph Berg +Build-Depends: bison, debhelper (>= 8), flex, postgresql-server-dev-all (>= 153~) +Standards-Version: 3.9.5 Homepage: http://orafce.projects.postgresql.org/ Vcs-Svn: svn://svn.debian.org/pkg-postgresql/trunk/orafce/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-postgresql/trunk/orafce/ +XS-Testsuite: autopkgtest Package: postgresql-PGVERSION-orafce Architecture: any diff --git a/debian/patches/bison-flex-missing.patch b/debian/patches/bison-flex-missing.patch deleted file mode 100644 index fa085c2..0000000 --- a/debian/patches/bison-flex-missing.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fix in case pgxs.mk does not define BISON or FLEX - ---- a/Makefile -+++ b/Makefile -@@ -41,6 +41,9 @@ endif - LIBS := $(filter-out -lxml2, $(LIBS)) - LIBS := $(filter-out -lxslt, $(LIBS)) - -+BISON = bison -+FLEX = flex -+ - plvlex.o: sqlparse.o - - sqlparse.o: $(srcdir)/sqlscan.c diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 9145c35..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -vpath-build.patch -bison-flex-missing.patch diff --git a/debian/patches/vpath-build.patch b/debian/patches/vpath-build.patch deleted file mode 100644 index b10b928..0000000 --- a/debian/patches/vpath-build.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix vpath build - ---- a/Makefile -+++ b/Makefile -@@ -37,6 +37,8 @@ SHLIB_LINK += -L$(libdir)/gettextlib - endif - endif - -+override CPPFLAGS += -I.. -+ - # remove dependency to libxml2 and libxslt - LIBS := $(filter-out -lxml2, $(LIBS)) - LIBS := $(filter-out -lxslt, $(LIBS)) -@@ -76,6 +78,6 @@ ifndef MAJORVERSION - MAJORVERSION := $(basename $(VERSION)) - endif - --orafunc.sql.in: -- cat orafunc-common.sql orafunc-$(MAJORVERSION).sql > orafunc.sql.in -+orafunc.sql.in: orafunc-common.sql orafunc-$(MAJORVERSION).sql -+ cat $^ > $@ - diff --git a/debian/pgversions b/debian/pgversions index da8d6e5..0702cb5 100644 --- a/debian/pgversions +++ b/debian/pgversions @@ -1,5 +1 @@ -8.2 -8.3 -8.4 -9.0 -9.1 +all diff --git a/debian/rules b/debian/rules index cf39a4d..15893e8 100755 --- a/debian/rules +++ b/debian/rules @@ -1,25 +1,15 @@ #!/usr/bin/make -f include /usr/share/postgresql-common/pgxs_debian_control.mk -clean: debian/control -.PHONY: debian/control - -supported_versions := $(shell pg_buildext supported-versions) %: dh $@ override_dh_auto_build: - +pg_buildext build $(CURDIR) build-%v - for v in $(supported_versions); do ln -s -t build-$$v $(addprefix ../,uninstall_orafunc.sql orafce--3.0.sql orafce--unpackaged--3.0.sql orafce.control README.orafunc COPYRIGHT.orafunc INSTALL.orafunc); done override_dh_auto_install: - +pg_buildext install $(CURDIR) build-%v postgresql-%v-orafce + +pg_buildext loop postgresql-%v-orafce rm -r $(CURDIR)/debian/*/usr/share/doc/postgresql-doc-* -override_dh_auto_clean: - +pg_buildext clean $(CURDIR) build-%v - rm -rf build-?.? - override_dh_installdocs: - dh_installdocs -A INSTALL.orafunc README.orafunc + dh_installdocs -A INSTALL.orafunc README.asciidoc diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 0000000..8eb1c67 --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,3 @@ +Depends: @, postgresql-server-dev-all, locales-all +Tests: installcheck +Restrictions: allow-stderr diff --git a/debian/tests/installcheck b/debian/tests/installcheck new file mode 100755 index 0000000..f390b06 --- /dev/null +++ b/debian/tests/installcheck @@ -0,0 +1,15 @@ +#!/bin/sh + +# to_multi_byte needs English, and UTF-8 +export LC_ALL=en_US.utf8 + +set -e +for v in $(pg_buildext supported-versions); do + case $v in + # older versions fail on concat, ignore that + # ERROR: function concat(unknown, unknown) does not exist + 8*|9.0) FAIL="exit 0" ;; + *) FAIL="exit 1" ;; + esac + pg_buildext installcheck-$v || $FAIL +done