[Git][haskell-team/DHG_packages][master] cabal-debian: Upgrading from 4.36.2 to 4.38

[Ilias Tsitsimpis]

Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
e9f5b218 by Ilias Tsitsimpis at 2018-06-11T15:41:02+03:00
cabal-debian: Upgrading from 4.36.2 to 4.38

- - - - -


6 changed files:

- p/cabal-debian/debian/changelog
- p/cabal-debian/debian/compat
- p/cabal-debian/debian/control
- − p/cabal-debian/debian/patches/fix-utils-shlibs-depends
- − p/cabal-debian/debian/patches/series
- p/cabal-debian/debian/rules


Changes:

=====================================
p/cabal-debian/debian/changelog
=====================================
--- a/p/cabal-debian/debian/changelog
+++ b/p/cabal-debian/debian/changelog
@@ -1,8 +1,14 @@
-cabal-debian (4.36.2-2) UNRELEASED; urgency=medium
+cabal-debian (4.38-1) unstable; urgency=medium
 
+  [ Clint Adams ]
   * Set Rules-Requires-Root to no.
 
- -- Clint Adams <clint at debian.org>  Sun, 06 May 2018 22:09:09 -0400
+  [ Ilias Tsitsimpis ]
+  * New upstream release
+  * Bump debhelper compat level to 10
+  * Drop fix-utils-shlibs-depends patch, applied upstream
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Mon, 11 Jun 2018 15:20:11 +0300
 
 cabal-debian (4.36.2-1) unstable; urgency=medium
 


=====================================
p/cabal-debian/debian/compat
=====================================
--- a/p/cabal-debian/debian/compat
+++ b/p/cabal-debian/debian/compat
@@ -1 +1 @@
-9
+10


=====================================
p/cabal-debian/debian/control
=====================================
--- a/p/cabal-debian/debian/control
+++ b/p/cabal-debian/debian/control
@@ -6,14 +6,19 @@ Uploaders:
 Priority: optional
 Section: haskell
 Rules-Requires-Root: no
-Build-Depends:
+Build-Depends: debhelper (>= 10),
+ haskell-devscripts (>= 0.13),
  cdbs,
- debhelper (>= 10),
- ghc (>= 8),
+ ghc,
  ghc-prof,
- haskell-devscripts (>= 0.13),
- libghc-ansi-wl-pprint-dev (<< 0.7),
+ libghc-diff-dev (>= 0.3.1),
+ libghc-diff-prof,
+ libghc-hunit-dev,
+ libghc-hunit-prof,
+ libghc-unixutils-dev (>= 1.53),
+ libghc-unixutils-prof,
  libghc-ansi-wl-pprint-dev (>= 0.6),
+ libghc-ansi-wl-pprint-dev (<< 0.7),
  libghc-ansi-wl-pprint-prof,
  libghc-bifunctors-dev,
  libghc-bifunctors-prof,
@@ -21,14 +26,10 @@ Build-Depends:
  libghc-data-default-prof,
  libghc-debian-dev (>= 3.91),
  libghc-debian-prof,
- libghc-diff-dev (>= 0.3.1),
- libghc-diff-prof,
  libghc-exceptions-dev,
  libghc-exceptions-prof,
  libghc-hsemail-dev,
  libghc-hsemail-prof,
- libghc-hunit-dev,
- libghc-hunit-prof,
  libghc-lens-dev,
  libghc-lens-prof,
  libghc-memoize-dev (>= 0.7),
@@ -53,8 +54,6 @@ Build-Depends:
  libghc-syb-prof,
  libghc-text-dev,
  libghc-text-prof,
- libghc-unixutils-dev (>= 1.53),
- libghc-unixutils-prof,
  libghc-utf8-string-dev,
  libghc-utf8-string-prof,
 Standards-Version: 4.1.4
@@ -66,14 +65,10 @@ Package: cabal-debian
 Architecture: any
 Section: utils
 Depends:
- debhelper (>= 9),
  ${haskell:Depends},
  ${misc:Depends},
  ${shlibs:Depends},
-Recommends:
- apt-file,
-Conflicts:
- haskell-debian-utils (<< 3.59),
+Recommends: apt-file,
 Description: Create a debianization for a cabal package
  Tool for creating debianizations of Haskell packages based on the .cabal
  file.  If apt-file is installed it will use it to discover what is the


=====================================
p/cabal-debian/debian/patches/fix-utils-shlibs-depends deleted
=====================================
--- a/p/cabal-debian/debian/patches/fix-utils-shlibs-depends
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Debian/Debianize/Finalize.hs
-+++ b/src/Debian/Debianize/Finalize.hs
-@@ -432,6 +432,8 @@
-       B.depends %= (anyrel "${shlibs:Depends}" : )
-     when (typ == B.Utilities) $
-       B.depends %= (anyrel "${shlibs:Depends}" : )
-+    when (typ == B.Utilities) $
-+      B.depends %= (anyrel "${shlibs:Depends}" : )
-     B.depends    %= ([anyrel "${haskell:Depends}", anyrel "${misc:Depends}"] ++)
-     B.recommends %= (anyrel "${haskell:Recommends}" : )
-     B.suggests   %= (anyrel "${haskell:Suggests}" :)


=====================================
p/cabal-debian/debian/patches/series deleted
=====================================
--- a/p/cabal-debian/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-utils-shlibs-depends


=====================================
p/cabal-debian/debian/rules
=====================================
--- a/p/cabal-debian/debian/rules
+++ b/p/cabal-debian/debian/rules
@@ -2,8 +2,6 @@
 
 # DEB_ENABLE_TESTS = yes
 
-DEB_SETUP_GHC6_CONFIGURE_ARGS += -f-local-debian
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
 



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/e9f5b21898a14b36dd1d97c5983a1fb21ec7cd0b

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/e9f5b21898a14b36dd1d97c5983a1fb21ec7cd0b
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20180611/b0ac10bf/attachment-0001.html>