persistent-postgresql: Upgrading from 2.2.2 to 2.6

3 files changed, 41 insertions, 24 deletions

diff --git a/p/haskell-persistent-postgresql/debian/changelog b/p/haskell-persistent-postgresql/debian/changelog
index dd924f9bd..9adb1541d 100644
--- a/p/haskell-persistent-postgresql/debian/changelog
+++ b/p/haskell-persistent-postgresql/debian/changelog
@@ -1,8 +1,8 @@
-haskell-persistent-postgresql (2.2.2-2) UNRELEASED; urgency=medium
+haskell-persistent-postgresql (2.6-1) experimental; urgency=medium
 
-  * Fix VCS fields
+  * New upstream version.
 
- -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 02 Jun 2016 19:12:54 +0200
+ -- Clint Adams <clint@debian.org>  Fri, 07 Oct 2016 21:43:57 -0400
 
 haskell-persistent-postgresql (2.2.2-1) unstable; urgency=medium
 
diff --git a/p/haskell-persistent-postgresql/debian/control b/p/haskell-persistent-postgresql/debian/control
index a0422578b..57caa057c 100644
--- a/p/haskell-persistent-postgresql/debian/control
+++ b/p/haskell-persistent-postgresql/debian/control
@@ -1,13 +1,15 @@
 Source: haskell-persistent-postgresql
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
-Uploaders: Clint Adams <clint@debian.org>
+Uploaders:
+ Clint Adams <clint@debian.org>,
 Priority: extra
 Section: haskell
-Build-Depends: debhelper (>= 9),
- haskell-devscripts (>= 0.10),
+Build-Depends:
  cdbs,
- ghc,
+ debhelper (>= 9),
+ ghc (>= 8),
  ghc-prof,
+ haskell-devscripts (>= 0.10),
  libghc-aeson-dev (>= 0.6.2),
  libghc-aeson-prof,
  libghc-blaze-builder-dev,
@@ -18,20 +20,23 @@ Build-Depends: debhelper (>= 9),
  libghc-monad-control-prof,
  libghc-monad-logger-dev (>= 0.3.4),
  libghc-monad-logger-prof,
- libghc-persistent-dev (>= 2.2),
  libghc-persistent-dev (<< 3),
+ libghc-persistent-dev (>= 2.6),
  libghc-persistent-prof,
- libghc-postgresql-libpq-dev (>= 0.6.1),
  libghc-postgresql-libpq-dev (<< 0.10),
+ libghc-postgresql-libpq-dev (>= 0.6.1),
  libghc-postgresql-libpq-prof,
- libghc-postgresql-simple-dev (>= 0.4.0),
  libghc-postgresql-simple-dev (<< 0.6),
+ libghc-postgresql-simple-dev (>= 0.4.0),
  libghc-postgresql-simple-prof,
+ libghc-resource-pool-dev,
+ libghc-resource-pool-prof,
  libghc-resourcet-dev (>= 1.1),
  libghc-resourcet-prof,
  libghc-text-dev (>= 0.7),
  libghc-text-prof,
-Build-Depends-Indep: ghc-doc,
+Build-Depends-Indep:
+ ghc-doc,
  libghc-aeson-doc,
  libghc-blaze-builder-doc,
  libghc-conduit-doc,
@@ -40,21 +45,26 @@ Build-Depends-Indep: ghc-doc,
  libghc-persistent-doc,
  libghc-postgresql-libpq-doc,
  libghc-postgresql-simple-doc,
+ libghc-resource-pool-doc,
  libghc-resourcet-doc,
  libghc-text-doc,
 Standards-Version: 3.9.8
 Homepage: http://www.yesodweb.com/book/persistent
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/haskell-persistent-postgresql
 Vcs-Git: https://anonscm.debian.org/git/pkg-haskell/DHG_packages.git
 
 Package: libghc-persistent-postgresql-dev
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends:
  ${haskell:Depends},
  ${misc:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
-Provides: ${haskell:Provides},
+ ${shlibs:Depends},
+Recommends:
+ ${haskell:Recommends},
+Suggests:
+ ${haskell:Suggests},
+Provides:
+ ${haskell:Provides},
 Description: backend for the persistent library using PostgreSQL
  Based on the postgresql-simple package
  .
@@ -65,11 +75,15 @@ Description: backend for the persistent library using PostgreSQL
 
 Package: libghc-persistent-postgresql-prof
 Architecture: any
-Depends: ${haskell:Depends},
+Depends:
+ ${haskell:Depends},
  ${misc:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
-Provides: ${haskell:Provides},
+Recommends:
+ ${haskell:Recommends},
+Suggests:
+ ${haskell:Suggests},
+Provides:
+ ${haskell:Provides},
 Description: backend for the persistent library using PostgreSQL; profiling libraries
  Based on the postgresql-simple package
  .
@@ -81,10 +95,13 @@ Description: backend for the persistent library using PostgreSQL; profiling libr
 Package: libghc-persistent-postgresql-doc
 Architecture: all
 Section: doc
-Depends: ${haskell:Depends},
+Depends:
+ ${haskell:Depends},
  ${misc:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
+Recommends:
+ ${haskell:Recommends},
+Suggests:
+ ${haskell:Suggests},
 Description: backend for the persistent library using PostgreSQL; documentation
  Based on the postgresql-simple package
  .
diff --git a/p/haskell-persistent-postgresql/debian/copyright b/p/haskell-persistent-postgresql/debian/copyright
index 5cfb8ed5a..e05ba5bde 100644
--- a/p/haskell-persistent-postgresql/debian/copyright
+++ b/p/haskell-persistent-postgresql/debian/copyright
@@ -29,4 +29,4 @@ License: MIT
  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.