From: Cédric Villemain <cedric@2ndquadrant.fr>
Date: Thu, 15 Sep 2016 12:40:45 +0000 (+0200)
Subject: Merge branch 'debian'
X-Git-Tag: 1.2~4
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=af9d776ca5b8d75f5cfd08dde904733e482e7d7e;p=pgfincore.git

Merge branch 'debian'

Conflicts:
	debian/changelog
---

af9d776ca5b8d75f5cfd08dde904733e482e7d7e
diff --cc debian/changelog
index d413bf0,397d1cc..6a72631
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
 +pgfincore (1.2-1) unstable; urgency=medium
 +
 +  * New upstream release 1.2.
 +
 + -- Cédric Villemain <cedric@villemain.org>  Thu, 15 Sep 2016 13:13:14 CEST 2016
 +
+ pgfincore (1.1.2-4) unstable; urgency=medium
+ 
+   * Build for PostgreSQL 9.5. (Closes: #811134)
+   * Bump Standards-Version to 3.9.6 (no changes needed).
+   * debian/control.in: Drop obsolete XS-Testsuite: field.
+ 
+  -- Martin Pitt <mpitt@debian.org>  Sat, 16 Jan 2016 11:50:19 +0100
+ 
  pgfincore (1.1.2-3) unstable; urgency=medium
  
    * Upload to unstable for 9.4.