Commit fd75c35f authored by Clint Adams's avatar Clint Adams

hs-bibutils: refresh patches

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