Source: pgsql-asn1oid Version: 0.0.20100818-3 Severity: serious Tags: patch
Hi Simon, the default PostgreSQL version in Jessie is now 9.4. Attached is a patch that ports pgsql-asn1oid to postgresql-server-dev-all and pg_buildext, so the source package will automatically produce binaries for the current supported version(s). This will also enable its inclusion on apt.postgresql.org. I've taken the liberty to rename the binary package from libpgsql-9.3-asn1oid to postgresql-9.4-asn1oid to match the naming schema of the other PostgreSQL modules. If you don't like that part, just change it in debian/control.in. I'm also adding a very basic regression test support so we can check if the module passes a smoke test. The changes are in a single "Makefile" patch, possibly you could just merge it into a new upstream tarball. Christoph -- [email protected] | http://www.df7cb.de/
Control files: lines which differ (wdiff format)
------------------------------------------------
Build-Depends: debhelper (>= 7.0.50~), [-postgresql-server-dev-9.3-] {+postgresql-server-dev-all (>= 153~)+}
Depends: ${shlibs:Depends}, ${misc:Depends}, [-postgresql-9.3-] {+postgresql-9.4+}
This package has been compiled for PostgreSQL [-9.3.-] {+9.4.+}
Package: [-libpgsql-9.3-asn1oid-] {+postgresql-9.4-asn1oid+}
diff -Nru pgsql-asn1oid-0.0.20100818/debian/changelog pgsql-asn1oid-0.0.20100818/debian/changelog
--- pgsql-asn1oid-0.0.20100818/debian/changelog 2013-12-11 10:39:16.000000000 +0100
+++ pgsql-asn1oid-0.0.20100818/debian/changelog 2014-08-07 19:19:05.000000000 +0200
@@ -1,3 +1,11 @@
+pgsql-asn1oid (0.0.20100818-3.1) UNRELEASED; urgency=medium
+
+ * Port to use pg_buildext and move to PostgreSQL 9.4 for jessie.
+ * Rename binary package to postgresql-9.4-asn1oid.
+ * Add regression tests.
+
+ -- Christoph Berg <[email protected]> Thu, 07 Aug 2014 18:47:18 +0200
+
pgsql-asn1oid (0.0.20100818-3) unstable; urgency=low
* Update to PostgreSQL 9.3 (Closes: #731913)
diff -Nru pgsql-asn1oid-0.0.20100818/debian/control pgsql-asn1oid-0.0.20100818/debian/control
--- pgsql-asn1oid-0.0.20100818/debian/control 2013-12-11 10:35:50.000000000 +0100
+++ pgsql-asn1oid-0.0.20100818/debian/control 2014-08-07 19:22:47.000000000 +0200
@@ -2,14 +2,15 @@
Section: database
Priority: optional
Maintainer: Simon Richter <[email protected]>
-Build-Depends: debhelper (>= 7.0.50~), postgresql-server-dev-9.3
+Build-Depends: debhelper (>= 7.0.50~), postgresql-server-dev-all (>= 153~)
Standards-Version: 3.9.3
-Package: libpgsql-9.3-asn1oid
+Package: postgresql-9.4-asn1oid
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, postgresql-9.3
+Depends: ${shlibs:Depends}, ${misc:Depends}, postgresql-9.4
Description: ASN.1 OID data type for PostgreSQL
This plugin provides the necessary support functions to store ASN.1 OIDs in
a PostgreSQL database.
.
- This package has been compiled for PostgreSQL 9.3.
+ This package has been compiled for PostgreSQL 9.4.
+
diff -Nru pgsql-asn1oid-0.0.20100818/debian/control.in pgsql-asn1oid-0.0.20100818/debian/control.in
--- pgsql-asn1oid-0.0.20100818/debian/control.in 1970-01-01 01:00:00.000000000 +0100
+++ pgsql-asn1oid-0.0.20100818/debian/control.in 2014-08-07 18:51:24.000000000 +0200
@@ -0,0 +1,15 @@
+Source: pgsql-asn1oid
+Section: database
+Priority: optional
+Maintainer: Simon Richter <[email protected]>
+Build-Depends: debhelper (>= 7.0.50~), postgresql-server-dev-all (>= 153~)
+Standards-Version: 3.9.3
+
+Package: postgresql-PGVERSION-asn1oid
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, postgresql-PGVERSION
+Description: ASN.1 OID data type for PostgreSQL
+ This plugin provides the necessary support functions to store ASN.1 OIDs in
+ a PostgreSQL database.
+ .
+ This package has been compiled for PostgreSQL PGVERSION.
diff -Nru pgsql-asn1oid-0.0.20100818/debian/libpgsql-9.3-asn1oid.docs pgsql-asn1oid-0.0.20100818/debian/libpgsql-9.3-asn1oid.docs
--- pgsql-asn1oid-0.0.20100818/debian/libpgsql-9.3-asn1oid.docs 2010-08-18 17:35:01.000000000 +0200
+++ pgsql-asn1oid-0.0.20100818/debian/libpgsql-9.3-asn1oid.docs 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-asn1oid.sql
diff -Nru pgsql-asn1oid-0.0.20100818/debian/patches/Makefile pgsql-asn1oid-0.0.20100818/debian/patches/Makefile
--- pgsql-asn1oid-0.0.20100818/debian/patches/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ pgsql-asn1oid-0.0.20100818/debian/patches/Makefile 2014-08-07 19:22:21.000000000 +0200
@@ -0,0 +1,106 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,8 @@
+ MODULES = asn1oid
++DATA = asn1oid.sql
++REGRESS = init asn1oid
+
+-PGCONFIG = pg_config
+-
+-PGXS = $(shell $(PGCONFIG) --pgxs)
++PG_CONFIG := pg_config
++PGXS := $(shell $(PG_CONFIG) --pgxs)
+
+ include $(PGXS)
+--- a/asn1oid.sql
++++ b/asn1oid.sql
+@@ -3,13 +3,13 @@ CREATE FUNCTION asn1oid_input (cstring)
+ RETURNS asn1oid
+ IMMUTABLE
+ STRICT
+- LANGUAGE 'C'
++ LANGUAGE C
+ AS 'asn1oid.so','asn1oid_input';
+ CREATE FUNCTION asn1oid_output (asn1oid)
+ RETURNS cstring
+ IMMUTABLE
+ STRICT
+- LANGUAGE 'C'
++ LANGUAGE C
+ AS 'asn1oid.so','asn1oid_output';
+ CREATE TYPE asn1oid (
+ INPUT = asn1oid_input,
+@@ -18,43 +18,43 @@ CREATE FUNCTION asn1oid_eq (asn1oid, asn
+ RETURNS bool
+ IMMUTABLE
+ STRICT
+- LANGUAGE 'C'
++ LANGUAGE C
+ AS 'asn1oid.so','asn1oid_eq';
+ CREATE FUNCTION asn1oid_ne (asn1oid, asn1oid)
+ RETURNS bool
+ IMMUTABLE
+ STRICT
+- LANGUAGE 'C'
++ LANGUAGE C
+ AS 'asn1oid.so','asn1oid_ne';
+ CREATE FUNCTION asn1oid_lt (asn1oid, asn1oid)
+ RETURNS bool
+ IMMUTABLE
+ STRICT
+- LANGUAGE 'C'
++ LANGUAGE C
+ AS 'asn1oid.so','asn1oid_lt';
+ CREATE FUNCTION asn1oid_gt (asn1oid, asn1oid)
+ RETURNS bool
+ IMMUTABLE
+ STRICT
+- LANGUAGE 'C'
++ LANGUAGE C
+ AS 'asn1oid.so','asn1oid_gt';
+ CREATE FUNCTION asn1oid_le (asn1oid, asn1oid)
+ RETURNS bool
+ IMMUTABLE
+ STRICT
+- LANGUAGE 'C'
++ LANGUAGE C
+ AS 'asn1oid.so','asn1oid_le';
+ CREATE FUNCTION asn1oid_ge (asn1oid, asn1oid)
+ RETURNS bool
+ IMMUTABLE
+ STRICT
+- LANGUAGE 'C'
++ LANGUAGE C
+ AS 'asn1oid.so','asn1oid_ge';
+ CREATE FUNCTION asn1oid_cmp (asn1oid, asn1oid)
+ RETURNS int4
+ IMMUTABLE
+ STRICT
+- AS 'asn1oid.so','asn1oid_cmp' LANGUAGE 'C';
++ AS 'asn1oid.so','asn1oid_cmp' LANGUAGE C;
+ CREATE OPERATOR = (
+ LEFTARG = asn1oid,
+ RIGHTARG = asn1oid,
+--- /dev/null
++++ b/expected/asn1oid.out
+@@ -0,0 +1,6 @@
++SELECT '1.2.3'::asn1oid;
++ asn1oid
++---------
++ 1.2.3
++(1 row)
++
+--- /dev/null
++++ b/expected/init.out
+@@ -0,0 +1 @@
++\set ECHO off
+--- /dev/null
++++ b/sql/asn1oid.sql
+@@ -0,0 +1 @@
++SELECT '1.2.3'::asn1oid;
+--- /dev/null
++++ b/sql/init.sql
+@@ -0,0 +1,3 @@
++\set ECHO off
++set client_min_messages = warning;
++\i asn1oid.sql
diff -Nru pgsql-asn1oid-0.0.20100818/debian/patches/series pgsql-asn1oid-0.0.20100818/debian/patches/series
--- pgsql-asn1oid-0.0.20100818/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ pgsql-asn1oid-0.0.20100818/debian/patches/series 2014-08-07 18:54:41.000000000 +0200
@@ -0,0 +1 @@
+Makefile
diff -Nru pgsql-asn1oid-0.0.20100818/debian/pgversions pgsql-asn1oid-0.0.20100818/debian/pgversions
--- pgsql-asn1oid-0.0.20100818/debian/pgversions 1970-01-01 01:00:00.000000000 +0100
+++ pgsql-asn1oid-0.0.20100818/debian/pgversions 2014-08-07 18:52:23.000000000 +0200
@@ -0,0 +1 @@
+all
diff -Nru pgsql-asn1oid-0.0.20100818/debian/rules pgsql-asn1oid-0.0.20100818/debian/rules
--- pgsql-asn1oid-0.0.20100818/debian/rules 2010-08-18 17:32:33.000000000 +0200
+++ pgsql-asn1oid-0.0.20100818/debian/rules 2014-08-07 18:53:21.000000000 +0200
@@ -1,4 +1,18 @@
#!/usr/bin/make -f
+include /usr/share/postgresql-common/pgxs_debian_control.mk
+
+override_dh_auto_build:
+ +pg_buildext build build-%v
+
+override_dh_auto_test:
+ # nothing to do here, see debian/tests/* instead
+
+override_dh_auto_install:
+ +pg_buildext install build-%v postgresql-%v-asn1oid
+
+override_dh_auto_clean:
+ +pg_buildext clean build-%v
+
%:
dh $@
diff -Nru pgsql-asn1oid-0.0.20100818/debian/tests/control pgsql-asn1oid-0.0.20100818/debian/tests/control
--- pgsql-asn1oid-0.0.20100818/debian/tests/control 1970-01-01 01:00:00.000000000 +0100
+++ pgsql-asn1oid-0.0.20100818/debian/tests/control 2014-08-07 19:21:28.000000000 +0200
@@ -0,0 +1,3 @@
+Depends: @, postgresql-server-dev-all
+Tests: installcheck
+Restrictions: allow-stderr
diff -Nru pgsql-asn1oid-0.0.20100818/debian/tests/installcheck pgsql-asn1oid-0.0.20100818/debian/tests/installcheck
--- pgsql-asn1oid-0.0.20100818/debian/tests/installcheck 1970-01-01 01:00:00.000000000 +0100
+++ pgsql-asn1oid-0.0.20100818/debian/tests/installcheck 2014-08-07 19:21:28.000000000 +0200
@@ -0,0 +1,2 @@
+#!/bin/sh
+pg_buildext installcheck
signature.asc
Description: Digital signature
