Commit fd75c35f authored by Clint Adams's avatar Clint Adams

hs-bibutils: refresh patches

parent dddc983c
......@@ -3,22 +3,18 @@ Description: fix include paths
for in bibutils/
Author: Joachim Breitner <nomeata@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
--- a/src/Text/Bibutils.hsc
+++ b/src/Text/Bibutils.hsc
@@ -402,7 +402,7 @@
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"
-#include "bibutils.h"
+#include "bibutils/bibutils.h"
#{enum FormatOpt, FormatOpt
, bibout_finalcomma = BIBOUT_FINALCOMMA
@@ -441,8 +441,8 @@ newtype Charset = Charset { charset :: C
, bibout_finalcomma = BIBL_FORMAT_BIBOUT_FINALCOMMA
@@ -437,8 +437,8 @@
combineFormatOpts :: [FormatOpt] -> FormatOpt
combineFormatOpts = FormatOpt . foldr ((.|.) . unFormatOpt) 0
......
......@@ -6,80 +6,73 @@ Last-Update: 2011-08-13
The .cabal files instructs the compiler to use the embedded bibutils
library. This patch makes it use the Debian packaged one.
Index: hs-bibutils-5.5/hs-bibutils.cabal
===================================================================
--- hs-bibutils-5.5.orig/hs-bibutils.cabal 2015-05-23 21:53:27.774221614 +0200
+++ hs-bibutils-5.5/hs-bibutils.cabal 2015-05-23 21:53:33.062278578 +0200
@@ -29,42 +29,6 @@
maintainer: andrea.rossato@unitn.it
cabal-version: >= 1.4
--- a/hs-bibutils.cabal
+++ b/hs-bibutils.cabal
@@ -26,37 +26,6 @@
maintainer: Václav Haisman <vhaisman@gmail.com>
cabal-version: >= 1.16
build-type: Simple
-extra-source-files:
- bibutils/adsout.c bibutils/adsout.h bibutils/adsout_journals.c
- bibutils/bibcore.c bibutils/bibl.c bibutils/bibl.h
- bibutils/biblatexin.c bibutils/biblatexin.h
- bibutils/bibtexin.c bibutils/bibtexin.h bibutils/bibtexout.c
- bibutils/bibtexout.h bibutils/bibtextypes.c
- bibutils/bibutils.c bibutils/bibutils.h bibutils/bltypes.c
- bibutils/charsets.c bibutils/charsets.h bibutils/copacin.c
- bibutils/copacin.h bibutils/copactypes.c bibutils/doi.c
- bibutils/doi.h bibutils/ebiin.c bibutils/ebiin.h
- bibutils/endin.c bibutils/endin.h bibutils/endout.c
- bibutils/endout.h bibutils/endtypes.c bibutils/endxmlin.c
- bibutils/endxmlin.h bibutils/entities.c bibutils/entities.h
- bibutils/adsout.c bibutils/adsout_journals.c bibutils/bibcore.c
- bibutils/bibformats.h bibutils/biblatexin.c bibutils/bibl.c
- bibutils/bibl.h bibutils/bibtexin.c bibutils/bibtexout.c
- bibutils/bibtextypes.c bibutils/bibutils.c bibutils/bibutils.h
- bibutils/bltypes.c bibutils/charsets.c bibutils/charsets.h
- bibutils/copacin.c bibutils/copactypes.c bibutils/ebiin.c
- bibutils/endin.c bibutils/endout.c bibutils/endtypes.c
- bibutils/endxmlin.c bibutils/entities.c bibutils/entities.h
- bibutils/fields.c bibutils/fields.h bibutils/gb18030.c
- bibutils/gb18030.h bibutils/gb18030_enumeration.c
- bibutils/intlist.c bibutils/intlist.h bibutils/is_ws.c
- bibutils/is_ws.h bibutils/isiin.c bibutils/isiin.h
- bibutils/isiout.c bibutils/isiout.h bibutils/isitypes.c
- bibutils/gb18030_enumeration.c bibutils/gb18030.h bibutils/generic.c
- bibutils/generic.h bibutils/intlist.c bibutils/intlist.h
- bibutils/isiin.c bibutils/isiout.c bibutils/isitypes.c
- bibutils/iso639_1.c bibutils/iso639_1.h bibutils/iso639_2.c
- bibutils/iso639_2.h bibutils/iso639_3.c bibutils/iso639_3.h
- bibutils/latex.c bibutils/latex.h bibutils/list.c
- bibutils/list.h bibutils/marc.c bibutils/marc.h
- bibutils/medin.c bibutils/medin.h bibutils/modsin.c
- bibutils/modsin.h bibutils/modsout.c bibutils/modsout.h
- bibutils/modstypes.c bibutils/modstypes.h bibutils/name.c
- bibutils/name.h bibutils/newstr.c bibutils/newstr.h
- bibutils/newstr_conv.c bibutils/newstr_conv.h
- bibutils/reftypes.c bibutils/reftypes.h bibutils/risin.c
- bibutils/risin.h bibutils/risout.c bibutils/risout.h
- bibutils/is_ws.c bibutils/is_ws.h bibutils/latex.c bibutils/latex.h
- bibutils/marc.c bibutils/marc.h bibutils/medin.c bibutils/modsin.c
- bibutils/modsout.c bibutils/modstypes.c bibutils/modstypes.h
- bibutils/name.c bibutils/name.h bibutils/nbibin.c
- bibutils/nbibtypes.c bibutils/notes.c bibutils/notes.h
- bibutils/pages.c bibutils/pages.h bibutils/reftypes.c
- bibutils/reftypes.h bibutils/risin.c bibutils/risout.c
- bibutils/ristypes.c bibutils/serialno.c bibutils/serialno.h
- bibutils/strsearch.c bibutils/strsearch.h bibutils/title.c
- bibutils/title.h bibutils/unicode.c bibutils/unicode.h
- bibutils/utf8.c bibutils/utf8.h bibutils/vplist.c
- bibutils/vplist.h bibutils/wordin.c bibutils/wordin.h
- bibutils/wordout.c bibutils/wordout.h bibutils/xml.c
- bibutils/xml.h bibutils/xml_encoding.c bibutils/xml_encoding.h
- bibutils/slist.c bibutils/slist.h bibutils/str.c bibutils/str_conv.c
- bibutils/str_conv.h bibutils/str.h bibutils/strsearch.c
- bibutils/strsearch.h bibutils/title.c bibutils/title.h
- bibutils/unicode.c bibutils/unicode.h bibutils/url.c bibutils/url.h
- bibutils/utf8.c bibutils/utf8.h bibutils/vplist.c bibutils/vplist.h
- bibutils/wordin.c bibutils/wordout.c bibutils/xml.c
- bibutils/xml_encoding.c bibutils/xml_encoding.h bibutils/xml.h
- README.md ChangeLog.md
library
exposed-modules: Text.Bibutils
@@ -73,29 +37,9 @@
ghc-prof-options: -prof -auto-all
default-language: Haskell2010
@@ -66,29 +35,7 @@
hs-source-dirs: src
extensions: ForeignFunctionInterface
- include-dirs: bibutils
default-extensions: ForeignFunctionInterface
include-dirs: bibutils
- includes: bibutils.h
c-sources:
cbits/stub.c
- bibutils/adsout.c bibutils/adsout_journals.c
- bibutils/bibcore.c bibutils/bibl.c bibutils/biblatexin.c
- bibutils/bibtexin.c bibutils/bibtexout.c
- bibutils/bibtextypes.c bibutils/bibutils.c bibutils/bltypes.c
- bibutils/charsets.c bibutils/copacin.c bibutils/copactypes.c
- bibutils/doi.c bibutils/ebiin.c bibutils/endin.c
- c-sources:
- cbits/stub.c
- bibutils/adsout.c bibutils/bibcore.c
- bibutils/biblatexin.c bibutils/bibl.c bibutils/bibtexin.c
- bibutils/bibtexout.c bibutils/bibtextypes.c bibutils/bibutils.c
- bibutils/bltypes.c bibutils/charsets.c bibutils/copacin.c
- bibutils/copactypes.c bibutils/ebiin.c bibutils/endin.c
- bibutils/endout.c bibutils/endtypes.c bibutils/endxmlin.c
- bibutils/entities.c bibutils/fields.c bibutils/gb18030.c
- bibutils/intlist.c bibutils/is_ws.c bibutils/isiin.c
- bibutils/isiout.c bibutils/isitypes.c bibutils/iso639_1.c
- bibutils/iso639_2.c bibutils/iso639_3.c bibutils/latex.c
- bibutils/list.c bibutils/marc.c bibutils/medin.c
- bibutils/generic.c bibutils/intlist.c
- bibutils/isiin.c bibutils/isiout.c bibutils/isitypes.c
- bibutils/iso639_1.c bibutils/iso639_2.c bibutils/iso639_3.c
- bibutils/is_ws.c bibutils/latex.c bibutils/marc.c bibutils/medin.c
- bibutils/modsin.c bibutils/modsout.c bibutils/modstypes.c
- bibutils/name.c bibutils/newstr.c bibutils/newstr_conv.c
- bibutils/reftypes.c bibutils/risin.c bibutils/risout.c
- bibutils/ristypes.c bibutils/serialno.c bibutils/strsearch.c
- bibutils/title.c bibutils/unicode.c bibutils/utf8.c
- bibutils/vplist.c bibutils/wordin.c bibutils/wordout.c
- bibutils/xml.c bibutils/xml_encoding.c
- bibutils/name.c bibutils/nbibin.c bibutils/nbibtypes.c
- bibutils/notes.c bibutils/pages.c bibutils/reftypes.c
- bibutils/risin.c bibutils/risout.c bibutils/ristypes.c
- bibutils/serialno.c bibutils/slist.c bibutils/str.c
- bibutils/str_conv.c bibutils/strsearch.c bibutils/title.c
- bibutils/unicode.c bibutils/url.c bibutils/utf8.c bibutils/vplist.c
- bibutils/wordin.c bibutils/wordout.c bibutils/xml.c
- bibutils/xml_encoding.c
+ pkgconfig-depends: bibutils
if impl(ghc >= 6.10)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment