diff -Nru pgmemcache-2.0.6/debian/changelog pgmemcache-2.0.6/debian/changelog --- pgmemcache-2.0.6/debian/changelog 2012-03-13 18:01:49.000000000 +0000 +++ pgmemcache-2.0.6/debian/changelog 2013-09-15 14:08:44.000000000 +0000 @@ -1,3 +1,13 @@ +pgmemcache (2.0.6-2) unstable; urgency=low + + * [74b3c34] Install files in debian/rules instead of using one static + .install file per PostgreSQL version + * [89341af] Update debian/pgversions to include recent PostgreSQL releases + * [42ae7f7] Canonicalize Vcs-* fields in debian/control + * [e25b4d2] Bump Standards-Version to 3.9.4 + + -- Marco Nenciarini Sun, 15 Sep 2013 16:06:29 +0200 + pgmemcache (2.0.6-1.1) unstable; urgency=low * Non-maintainer upload. diff -Nru pgmemcache-2.0.6/debian/control pgmemcache-2.0.6/debian/control --- pgmemcache-2.0.6/debian/control 2012-03-13 18:02:30.000000000 +0000 +++ pgmemcache-2.0.6/debian/control 2013-09-15 14:10:05.000000000 +0000 @@ -2,15 +2,15 @@ Section: database Priority: extra Maintainer: Marco Nenciarini -Build-Depends: debhelper (>= 8), postgresql-server-dev-all (>= 118), libmemcached-dev (>= 1), libsasl2-dev -Standards-Version: 3.9.2 +Build-Depends: debhelper (>= 8), postgresql-server-dev-all (>= 148~), libmemcached-dev (>= 1), libsasl2-dev +Standards-Version: 3.9.4 Homepage: http://pgfoundry.org/projects/pgmemcache/ -Vcs-Git: git://git.debian.org/pkg-postgresql/pgmemcache.git -Vcs-Browser: http://git.debian.org/?p=pkg-postgresql/pgmemcache.git;a=summary +Vcs-Git: git://anonscm.debian.org/pkg-postgresql/pgmemcache.gi +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-postgresql/pgmemcache.git;a=summary -Package: postgresql-9.1-pgmemcache +Package: postgresql-9.3-pgmemcache Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, postgresql-9.1 +Depends: ${shlibs:Depends}, ${misc:Depends}, postgresql-9.3 Description: PostgreSQL interface to memcached pgmemcache is an extension for PostgreSQL that provides an API to memcached through user-defined functions. diff -Nru pgmemcache-2.0.6/debian/control.in pgmemcache-2.0.6/debian/control.in --- pgmemcache-2.0.6/debian/control.in 2012-03-13 18:01:14.000000000 +0000 +++ pgmemcache-2.0.6/debian/control.in 2013-09-15 14:08:44.000000000 +0000 @@ -2,11 +2,11 @@ Section: database Priority: extra Maintainer: Marco Nenciarini -Build-Depends: debhelper (>= 8), postgresql-server-dev-all (>= 118), libmemcached-dev (>= 1), libsasl2-dev -Standards-Version: 3.9.2 +Build-Depends: debhelper (>= 8), postgresql-server-dev-all (>= 148~), libmemcached-dev (>= 1), libsasl2-dev +Standards-Version: 3.9.4 Homepage: http://pgfoundry.org/projects/pgmemcache/ -Vcs-Git: git://git.debian.org/pkg-postgresql/pgmemcache.git -Vcs-Browser: http://git.debian.org/?p=pkg-postgresql/pgmemcache.git;a=summary +Vcs-Git: git://anonscm.debian.org/pkg-postgresql/pgmemcache.gi +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-postgresql/pgmemcache.git;a=summary Package: postgresql-PGVERSION-pgmemcache Architecture: any diff -Nru pgmemcache-2.0.6/debian/patches/9.1-extension.patch pgmemcache-2.0.6/debian/patches/9.1-extension.patch --- pgmemcache-2.0.6/debian/patches/9.1-extension.patch 2011-10-05 14:35:51.000000000 +0000 +++ pgmemcache-2.0.6/debian/patches/9.1-extension.patch 2013-09-15 14:08:44.000000000 +0000 @@ -3,10 +3,10 @@ Subject: 9.1-extension --- - Makefile | 19 ++++++++++++++++++- - pgmemcache--unpackaged--2.0.6.sql | 36 ++++++++++++++++++++++++++++++++++++ - pgmemcache.control | 5 +++++ - 3 files changed, 59 insertions(+), 1 deletions(-) + Makefile | 19 ++++++++++++++++++- + pgmemcache--unpackaged--2.0.6.sql | 36 ++++++++++++++++++++++++++++++++++++ + pgmemcache.control | 5 +++++ + 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 pgmemcache--unpackaged--2.0.6.sql create mode 100644 pgmemcache.control @@ -97,4 +97,3 @@ +default_version = '2.0.6' +module_pathname = '$libdir/pgmemcache' +relocatable = true --- diff -Nru pgmemcache-2.0.6/debian/patches/libmemcached-1.0.patch pgmemcache-2.0.6/debian/patches/libmemcached-1.0.patch --- pgmemcache-2.0.6/debian/patches/libmemcached-1.0.patch 2012-03-13 17:59:43.000000000 +0000 +++ pgmemcache-2.0.6/debian/patches/libmemcached-1.0.patch 2013-09-15 14:08:44.000000000 +0000 @@ -1,6 +1,19 @@ +From: Michael Fladischer +Date: Sun, 15 Sep 2013 15:26:11 +0200 +Subject: libmemcached-1.0 + +Fix for the libmemcached-1.0 API issue reported in +http://bugs.debian.org/658405 +--- + pgmemcache.c | 2 ++ + pgmemcache.h | 4 +--- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/pgmemcache.c b/pgmemcache.c +index dfdc92a..807fd35 100644 --- a/pgmemcache.c +++ b/pgmemcache.c -@@ -28,6 +28,7 @@ +@@ -28,6 +28,7 @@ static char *memcache_default_behavior = ""; static char *memcache_sasl_authentication_username = ""; static char *memcache_sasl_authentication_password = ""; @@ -8,7 +21,7 @@ static sasl_callback_t sasl_callbacks[] = { { SASL_CB_USER, &get_sasl_username, NULL}, -@@ -35,6 +36,7 @@ +@@ -35,6 +36,7 @@ static sasl_callback_t sasl_callbacks[] = { SASL_CB_PASS, &get_sasl_password, NULL}, { SASL_CB_LIST_END, NULL, NULL} }; @@ -16,6 +29,8 @@ void _PG_init(void) { +diff --git a/pgmemcache.h b/pgmemcache.h +index 79868ff..92d3415 100644 --- a/pgmemcache.h +++ b/pgmemcache.h @@ -23,10 +23,8 @@ diff -Nru pgmemcache-2.0.6/debian/pgversions pgmemcache-2.0.6/debian/pgversions --- pgmemcache-2.0.6/debian/pgversions 2011-10-05 14:35:51.000000000 +0000 +++ pgmemcache-2.0.6/debian/pgversions 2013-09-15 14:08:44.000000000 +0000 @@ -1,3 +1 @@ -8.4 -9.0 -9.1 +8.4+ diff -Nru pgmemcache-2.0.6/debian/postgresql-8.4-pgmemcache.dirs pgmemcache-2.0.6/debian/postgresql-8.4-pgmemcache.dirs --- pgmemcache-2.0.6/debian/postgresql-8.4-pgmemcache.dirs 2011-10-05 14:35:51.000000000 +0000 +++ pgmemcache-2.0.6/debian/postgresql-8.4-pgmemcache.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/lib/postgresql/8.4/lib -usr/share/postgresql/8.4/contrib diff -Nru pgmemcache-2.0.6/debian/postgresql-8.4-pgmemcache.install pgmemcache-2.0.6/debian/postgresql-8.4-pgmemcache.install --- pgmemcache-2.0.6/debian/postgresql-8.4-pgmemcache.install 2011-10-05 14:35:51.000000000 +0000 +++ pgmemcache-2.0.6/debian/postgresql-8.4-pgmemcache.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -debian/pgmemcache-8.4/pgmemcache.so usr/lib/postgresql/8.4/lib -pgmemcache.sql usr/share/postgresql/8.4/contrib -uninstall_pgmemcache.sql usr/share/postgresql/8.4/contrib diff -Nru pgmemcache-2.0.6/debian/postgresql-9.0-pgmemcache.dirs pgmemcache-2.0.6/debian/postgresql-9.0-pgmemcache.dirs --- pgmemcache-2.0.6/debian/postgresql-9.0-pgmemcache.dirs 2011-10-05 14:35:51.000000000 +0000 +++ pgmemcache-2.0.6/debian/postgresql-9.0-pgmemcache.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/lib/postgresql/9.0/lib -usr/share/postgresql/9.0/contrib diff -Nru pgmemcache-2.0.6/debian/postgresql-9.0-pgmemcache.install pgmemcache-2.0.6/debian/postgresql-9.0-pgmemcache.install --- pgmemcache-2.0.6/debian/postgresql-9.0-pgmemcache.install 2011-10-05 14:35:51.000000000 +0000 +++ pgmemcache-2.0.6/debian/postgresql-9.0-pgmemcache.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -debian/pgmemcache-9.0/pgmemcache.so usr/lib/postgresql/9.0/lib -pgmemcache.sql usr/share/postgresql/9.0/contrib -uninstall_pgmemcache.sql usr/share/postgresql/9.0/contrib diff -Nru pgmemcache-2.0.6/debian/postgresql-9.1-pgmemcache.dirs pgmemcache-2.0.6/debian/postgresql-9.1-pgmemcache.dirs --- pgmemcache-2.0.6/debian/postgresql-9.1-pgmemcache.dirs 2011-10-05 14:35:51.000000000 +0000 +++ pgmemcache-2.0.6/debian/postgresql-9.1-pgmemcache.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/lib/postgresql/9.1/lib -usr/share/postgresql/9.1/extension diff -Nru pgmemcache-2.0.6/debian/postgresql-9.1-pgmemcache.install pgmemcache-2.0.6/debian/postgresql-9.1-pgmemcache.install --- pgmemcache-2.0.6/debian/postgresql-9.1-pgmemcache.install 2011-10-05 14:35:51.000000000 +0000 +++ pgmemcache-2.0.6/debian/postgresql-9.1-pgmemcache.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -debian/pgmemcache-9.1/pgmemcache.so usr/lib/postgresql/9.1/lib -debian/pgmemcache-9.1/pgmemcache*.sql usr/share/postgresql/9.1/extension -pgmemcache--unpackaged--2.0.6.sql usr/share/postgresql/9.1/extension -pgmemcache.control /usr/share/postgresql/9.1/extension diff -Nru pgmemcache-2.0.6/debian/rules pgmemcache-2.0.6/debian/rules --- pgmemcache-2.0.6/debian/rules 2011-10-05 14:35:51.000000000 +0000 +++ pgmemcache-2.0.6/debian/rules 2013-09-15 14:08:44.000000000 +0000 @@ -21,7 +21,22 @@ override_dh_auto_install: for v in `pg_buildext supported-versions $(SRCDIR)`; do \ - dh_install -ppostgresql-$$v-pgmemcache; \ + TARGET=$(CURDIR)/debian/postgresql-$$v-pgmemcache ; \ + mkdir -p $$TARGET/usr/lib/postgresql/$$v/lib ; \ + install -m 644 $(CURDIR)/debian/pgmemcache-$$v/pgmemcache.so $$TARGET/usr/lib/postgresql/$$v/lib ; \ + case $$v in \ + 8.*|9.0) \ + mkdir -p $$TARGET/usr/share/postgresql/$$v/contrib ; \ + install -m 644 $(CURDIR)/pgmemcache.sql $$TARGET/usr/share/postgresql/$$v/contrib ; \ + install -m 644 $(CURDIR)/uninstall_pgmemcache.sql $$TARGET/usr/share/postgresql/$$v/contrib ; \ + ;; \ + *) \ + mkdir -p $$TARGET/usr/share/postgresql/$$v/extension ; \ + install -m 644 $(CURDIR)/debian/pgmemcache-$$v/pgmemcache*.sql $$TARGET/usr/share/postgresql/$$v/extension ; \ + install -m 644 $(CURDIR)/pgmemcache--unpackaged--2.0.6.sql $$TARGET/usr/share/postgresql/$$v/extension ; \ + install -m 644 $(CURDIR)/pgmemcache.control $$TARGET/usr/share/postgresql/$$v/extension ; \ + ;; \ + esac \ done %: