[DHG_packages] 08/34: gtk2hs-buildtools: Bump bounds for newer directory

Ilias Tsitsimpis iliastsi-guest at moszumanska.debian.org
Fri Jan 27 09:46:46 UTC 2017 

This is an automated email from the git hooks/post-receive script.

iliastsi-guest pushed a commit to branch ghc-8.0.2
in repository DHG_packages.

commit ff4b0dcd23a2b2f9081fb13ed838c155605ce3f5
Author: Ilias Tsitsimpis <i.tsitsimpis at gmail.com>
Date:   Wed Jan 25 21:20:09 2017 +0200

    gtk2hs-buildtools: Bump bounds for newer directory
---
 p/gtk2hs-buildtools/debian/changelog               |  6 +++++
 .../debian/patches/BangPatterns.patch              | 20 ++++++++--------
 p/gtk2hs-buildtools/debian/patches/manpages.patch  | 28 +++++++++++-----------
 .../debian/patches/newer-directory.patch           | 18 ++++++++++++++
 p/gtk2hs-buildtools/debian/patches/series          |  1 +
 5 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/p/gtk2hs-buildtools/debian/changelog b/p/gtk2hs-buildtools/debian/changelog
index cb5f6a7..b392665 100644
--- a/p/gtk2hs-buildtools/debian/changelog
+++ b/p/gtk2hs-buildtools/debian/changelog
@@ -1,3 +1,9 @@
+gtk2hs-buildtools (0.13.2.1-6) unstable; urgency=medium
+
+  * Bump bounds for newer directory, shipped with ghc-8.0.2.
+
+ -- Ilias Tsitsimpis <i.tsitsimpis at gmail.com>  Wed, 25 Jan 2017 19:03:24 +0200
+
 gtk2hs-buildtools (0.13.2.1-5) unstable; urgency=medium
 
   * Fix FTBFS when architecture independent binary packages
diff --git a/p/gtk2hs-buildtools/debian/patches/BangPatterns.patch b/p/gtk2hs-buildtools/debian/patches/BangPatterns.patch
index 08d435f..3126dce 100644
--- a/p/gtk2hs-buildtools/debian/patches/BangPatterns.patch
+++ b/p/gtk2hs-buildtools/debian/patches/BangPatterns.patch
@@ -1,23 +1,23 @@
 Description: The generated code has BangPatterns, newer ghc wants this mentioned explicitly
 Author: Joachim Breitner <nomeata at debian.org>
 Bug-Debian: http://bugs.debian.org/628302
-Index: gtk2hs-buildtools-0.12.1/c2hs/c/CLexer.x
+Index: b/c2hs/c/CLexer.x
 ===================================================================
---- gtk2hs-buildtools-0.12.1.orig/c2hs/c/CLexer.x	2011-09-12 13:44:10.000000000 +0200
-+++ gtk2hs-buildtools-0.12.1/c2hs/c/CLexer.x	2012-02-24 22:47:58.000000000 +0100
+--- a/c2hs/c/CLexer.x
++++ b/c2hs/c/CLexer.x
 @@ -63,6 +63,7 @@
  --
-
+ 
  {
 +{-# LANGUAGE BangPatterns #-}
-
+ 
  module CLexer (lexC, parseError) where
-
-@@ -229,6 +230,7 @@
-
-
+ 
+@@ -229,6 +230,7 @@ L\"($instr|@charesc)*\"			{ token CTokSL
+ 
+ 
  {
 +{-# LANGUAGE BangPatterns #-}
-
+ 
  -- We use the odd looking list of string patterns here rather than normal
  -- string literals since GHC converts the latter into a sequence of string
diff --git a/p/gtk2hs-buildtools/debian/patches/manpages.patch b/p/gtk2hs-buildtools/debian/patches/manpages.patch
index 4071edb..4ce711c 100644
--- a/p/gtk2hs-buildtools/debian/patches/manpages.patch
+++ b/p/gtk2hs-buildtools/debian/patches/manpages.patch
@@ -6,13 +6,13 @@ Forwarded:
  http://sourceforge.net/mailarchive/message.php?msg_name=1274874328-sup-8367%40zezinho
 Author: Marco Túlio Gontijo e Silva <marcot at debian.org>
 Last-Update: 2010-05-26
-Index: gtk2hs-buildtools-0.9/Setup.hs
+Index: b/Setup.hs
 ===================================================================
---- gtk2hs-buildtools-0.9.orig/Setup.hs	2010-05-26 10:11:38.000000000 -0300
-+++ gtk2hs-buildtools-0.9/Setup.hs	2010-05-26 10:13:46.000000000 -0300
+--- a/Setup.hs
++++ b/Setup.hs
 @@ -1,6 +1,42 @@
  module Main (main) where
-
+ 
 -import Distribution.Simple
 +-- Cabal
 +import Distribution.PackageDescription (PackageDescription)
@@ -26,7 +26,7 @@ Index: gtk2hs-buildtools-0.9/Setup.hs
 +import Distribution.Simple.UserHooks (UserHooks (..))
 +import Distribution.Simple.Utils (copyFiles)
 +import System.FilePath ((</>))
-
+ 
  main :: IO ()
 -main = defaultMain
 +main
@@ -55,10 +55,10 @@ Index: gtk2hs-buildtools-0.9/Setup.hs
 +installManpages pkg lbi verbosity copy
 +  = copyFiles verbosity (mandir (absoluteInstallDirs pkg lbi copy) </> "man1")
 +    $ zip (repeat manDir) manpages
-Index: gtk2hs-buildtools-0.9/man/gtk2hsC2hs.1
+Index: b/man/gtk2hsC2hs.1
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gtk2hs-buildtools-0.9/man/gtk2hsC2hs.1	2010-05-26 09:04:20.000000000 -0300
+--- /dev/null
++++ b/man/gtk2hsC2hs.1
 @@ -0,0 +1,158 @@
 +.\" Hey Emacs! This file is -*- nroff -*- source.
 +.\"
@@ -218,10 +218,10 @@ Index: gtk2hs-buildtools-0.9/man/gtk2hsC2hs.1
 +The \fBc2hs\fR(1) was written by Michael Weber
 +<michael.weber at post.rwth-aachen.de> for the Debian GNU/Linux system (but may be
 +used by others).
-Index: gtk2hs-buildtools-0.9/man/gtk2hsHookGenerator.1
+Index: b/man/gtk2hsHookGenerator.1
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gtk2hs-buildtools-0.9/man/gtk2hsHookGenerator.1	2010-05-26 09:04:20.000000000 -0300
+--- /dev/null
++++ b/man/gtk2hsHookGenerator.1
 @@ -0,0 +1,62 @@
 +.\" Hey Emacs! This file is -*- nroff -*- source.
 +.\"
@@ -285,10 +285,10 @@ Index: gtk2hs-buildtools-0.9/man/gtk2hsHookGenerator.1
 +This page was addapted from the \fBgtk2hsC2hs\fR(1) manpage, by Marco Túlio
 +Gontijo e Silva <marcot at debian.org> for the Debian GNU/Linux system (but may be
 +used by others).
-Index: gtk2hs-buildtools-0.9/man/gtk2hsTypeGen.1
+Index: b/man/gtk2hsTypeGen.1
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gtk2hs-buildtools-0.9/man/gtk2hsTypeGen.1	2010-05-26 09:04:20.000000000 -0300
+--- /dev/null
++++ b/man/gtk2hsTypeGen.1
 @@ -0,0 +1,88 @@
 +.\" Hey Emacs! This file is -*- nroff -*- source.
 +.\"
diff --git a/p/gtk2hs-buildtools/debian/patches/newer-directory.patch b/p/gtk2hs-buildtools/debian/patches/newer-directory.patch
new file mode 100644
index 0000000..83f998b
--- /dev/null
+++ b/p/gtk2hs-buildtools/debian/patches/newer-directory.patch
@@ -0,0 +1,18 @@
+Description: Bump bounds for newer directory
+ Bump bounds for directory 1.3.0.0, shipped with ghc-8.0.2.
+Author: Ilias Tsitsimpis <i.tsitsimpis at gmail.com>
+Origin: no
+
+Index: b/gtk2hs-buildtools.cabal
+===================================================================
+--- a/gtk2hs-buildtools.cabal
++++ b/gtk2hs-buildtools.cabal
+@@ -42,7 +42,7 @@ Library
+                          filepath, random,
+                          Cabal >= 1.24.0.0 && < 1.25,
+                          filepath >= 1.3.0.0 && < 1.5,
+-                         directory >= 1.2.0.0 && < 1.3,
++                         directory >= 1.2.0.0 && < 1.4,
+                          containers >= 0.5.5.1 && < 0.6
+         if impl(ghc >= 7.7)
+           build-depends: hashtables
diff --git a/p/gtk2hs-buildtools/debian/patches/series b/p/gtk2hs-buildtools/debian/patches/series
index dc98721..a911fb2 100644
--- a/p/gtk2hs-buildtools/debian/patches/series
+++ b/p/gtk2hs-buildtools/debian/patches/series
@@ -1,2 +1,3 @@
 manpages.patch
 BangPatterns.patch
+newer-directory.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git

More information about the Pkg-haskell-commits mailing list