Hi,

I can confirm that the upstream commit resolves the issue. The
attached patch backports it.

Thanks,

-- Andrew Starr-Bochicchio

   Ubuntu Developer <https://launchpad.net/~andrewsomething>
   Debian Developer <http://qa.debian.org/developer.php?login=asb>
   PGP/GPG Key ID: D53FDCB1
From 5a16c4afd05617763b584e79de21bb137978da7c Mon Sep 17 00:00:00 2001
From: Andrew Starr-Bochicchio <a...@debian.org>
Date: Mon, 16 Feb 2015 13:09:55 -0500
Subject: [PATCH] use_postgresql-9.4_on_jessie.patch: Backport upstream commit
 to correctly use postgresql 9.4 on Jessie (Closes: #777607).

---
 debian/changelog                                  |  8 ++++++
 debian/patches/series                             |  1 +
 debian/patches/use_postgresql-9.4_on_jessie.patch | 31 +++++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 debian/patches/series
 create mode 100644 debian/patches/use_postgresql-9.4_on_jessie.patch

diff --git a/debian/changelog b/debian/changelog
index 2e35323..5be8118 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+puppet-module-puppetlabs-postgresql (4.0.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * use_postgresql-9.4_on_jessie.patch: Backport upstream commit
+    to correctly use postgresql 9.4 on Jessie (Closes: #777607).
+
+ -- Andrew Starr-Bochicchio <a...@debian.org>  Mon, 16 Feb 2015 13:07:26 -0500
+
 puppet-module-puppetlabs-postgresql (4.0.0-1) unstable; urgency=medium
 
   * Imported upstream relase 4.0.0
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..479d051
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use_postgresql-9.4_on_jessie.patch
diff --git a/debian/patches/use_postgresql-9.4_on_jessie.patch b/debian/patches/use_postgresql-9.4_on_jessie.patch
new file mode 100644
index 0000000..1325c5c
--- /dev/null
+++ b/debian/patches/use_postgresql-9.4_on_jessie.patch
@@ -0,0 +1,31 @@
+From 9bb1c5e491463fe64beff663be156d6724b4e06e Mon Sep 17 00:00:00 2001
+From: Armin ranjbar <z...@zoup.org>
+Date: Fri, 21 Nov 2014 22:26:18 +0330
+Subject: [PATCH] Fixing autodetected version for Debian Jessie, which uses
+ postgresql 9.4
+
+---
+ manifests/globals.pp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+Index: puppet-module-puppetlabs-postgresql/manifests/globals.pp
+===================================================================
+--- puppet-module-puppetlabs-postgresql.orig/manifests/globals.pp	2015-02-16 13:06:53.515483692 -0500
++++ puppet-module-puppetlabs-postgresql/manifests/globals.pp	2015-02-16 13:06:53.511483620 -0500
+@@ -67,7 +67,7 @@
+       'Debian' => $::operatingsystemrelease ? {
+         /^6\./ => '8.4',
+         /^(wheezy|7\.)/ => '9.1',
+-        /^(jessie|8\.)/ => '9.3',
++        /^(jessie|8\.)/ => '9.4',
+         default => undef,
+       },
+       'Ubuntu' => $::operatingsystemrelease ? {
+@@ -102,6 +102,7 @@
+     '91'    => '1.5',
+     '9.2'   => '2.0',
+     '9.3'   => '2.1',
++    '9.4'   => '2.1',
+     default => undef,
+   }
+   $globals_postgis_version = pick($postgis_version, $default_postgis_version)
-- 
2.1.0

Reply via email to