[Pkg-haskell-commits] darcs: haskell-hs-bibutils: Include files from bibutils where searched for by pkg-config

[Joachim Breitner]

Mon Sep 26 15:55:00 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Include files from bibutils where searched for by pkg-config
  Ignore-this: f64f3d277973b7ec0efa13ea0452a54d

    A ./patches/bibutils-include-path
    M ./patches/series +1
    A ./source/format

Mon Sep 26 15:55:00 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Include files from bibutils where searched for by pkg-config
  Ignore-this: f64f3d277973b7ec0efa13ea0452a54d
diff -rN -u old-haskell-hs-bibutils//patches/bibutils-include-path new-haskell-hs-bibutils//patches/bibutils-include-path
--- old-haskell-hs-bibutils//patches/bibutils-include-path	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hs-bibutils//patches/bibutils-include-path	2011-09-26 16:53:21.450351894 +0000
@@ -0,0 +1,31 @@
+Description: fix include paths
+ When using the pkg-config file of libbibutils, the includes are to be searched
+ for in bibutils/
+Author: Joachim Breitner <nomeata at debian.org>
+
+--- haskell-hs-bibutils-4.12.orig/src/Text/Bibutils.hsc
++++ haskell-hs-bibutils-4.12/src/Text/Bibutils.hsc
+@@ -403,9 +403,9 @@ newtype BiblioOut = BiblioOut { unBiblio
+ 
+ newtype FormatOpt = FormatOpt { unFormatOpt :: CInt }
+ 
+-#include "bibtexout.h"
+-#include "modsout.h"
+-#include "wordout.h"
++#include "bibutils/bibtexout.h"
++#include "bibutils/modsout.h"
++#include "bibutils/wordout.h"
+ 
+ #{enum FormatOpt, FormatOpt
+  , bibout_finalcomma = BIBOUT_FINALCOMMA
+@@ -441,8 +441,8 @@ newtype Charset = Charset { charset :: C
+ combineFormatOpts :: [FormatOpt] -> FormatOpt
+ combineFormatOpts = FormatOpt . foldr ((.|.) . unFormatOpt) 0
+ 
+-#include "bibutils.h"
+-#include "bibl.h"
++#include "bibutils/bibutils.h"
++#include "bibutils/bibl.h"
+ #let alignment t = "%lu", (unsigned long)offsetof(struct {char x__; t (y__); }, y__)
+ 
+ foreign import ccall unsafe "bibl_init"
diff -rN -u old-haskell-hs-bibutils//patches/series new-haskell-hs-bibutils//patches/series
--- old-haskell-hs-bibutils//patches/series	2011-09-26 16:53:21.438343575 +0000
+++ new-haskell-hs-bibutils//patches/series	2011-09-26 16:53:21.466337546 +0000
@@ -1 +1,2 @@
 fix_cabal.patch
+bibutils-include-path
diff -rN -u old-haskell-hs-bibutils//source/format new-haskell-hs-bibutils//source/format
--- old-haskell-hs-bibutils//source/format	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hs-bibutils//source/format	2011-09-26 16:53:21.450351894 +0000
@@ -0,0 +1 @@
+3.0 (quilt)