diff options
| author | Colin Watson <cjwatson@debian.org> | 2014-01-08 15:56:40 +0400 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2014-01-08 15:56:40 +0400 |
| commit | c0aeb29ef371352d5d1d4b7f84978ca4d3ade65a (patch) | |
| tree | 174263f5a8f2261b51838a136707e1bc0608fbb0 /p/haskell-pandoc-citeproc | |
| parent | b5cff80bc55ca63046ad51e7b4fe24713dfde0c8 (diff) | |
| download | DHG_packages-c0aeb29ef371352d5d1d4b7f84978ca4d3ade65a.tar.gz | |
haskell-pandoc-citeproc: * Fix data file handling (closes: #734155):
- Install chicago-author-date.csl in libghc-pandoc-citeproc-data.
- Make libghc-pandoc-citeproc-dev and pandoc-citeproc depend on
libghc-pandoc-citeproc-data.
- Fix paths of locale files to match what Text.CSL.Data expects.
Diffstat (limited to 'p/haskell-pandoc-citeproc')
| -rw-r--r-- | p/haskell-pandoc-citeproc/debian/changelog | 10 | ||||
| -rw-r--r-- | p/haskell-pandoc-citeproc/debian/control | 6 | ||||
| -rw-r--r-- | p/haskell-pandoc-citeproc/debian/libghc-pandoc-citeproc-data.dirs | 2 | ||||
| -rwxr-xr-x | p/haskell-pandoc-citeproc/debian/rules | 4 |
4 files changed, 19 insertions, 3 deletions
diff --git a/p/haskell-pandoc-citeproc/debian/changelog b/p/haskell-pandoc-citeproc/debian/changelog index e6b2eccc3..902fe971e 100644 --- a/p/haskell-pandoc-citeproc/debian/changelog +++ b/p/haskell-pandoc-citeproc/debian/changelog @@ -1,3 +1,13 @@ +haskell-pandoc-citeproc (0.2-3) UNRELEASED; urgency=medium + + * Fix data file handling (closes: #734155): + - Install chicago-author-date.csl in libghc-pandoc-citeproc-data. + - Make libghc-pandoc-citeproc-dev and pandoc-citeproc depend on + libghc-pandoc-citeproc-data. + - Fix paths of locale files to match what Text.CSL.Data expects. + + -- Colin Watson <cjwatson@debian.org> Wed, 08 Jan 2014 11:18:59 +0000 + haskell-pandoc-citeproc (0.2-2) unstable; urgency=medium * Run tests under C.UTF-8. diff --git a/p/haskell-pandoc-citeproc/debian/control b/p/haskell-pandoc-citeproc/debian/control index 7f5dd3e47..4bef5016c 100644 --- a/p/haskell-pandoc-citeproc/debian/control +++ b/p/haskell-pandoc-citeproc/debian/control @@ -70,6 +70,7 @@ Architecture: any Depends: ${haskell:Depends} , ${shlibs:Depends} , ${misc:Depends} + , libghc-pandoc-citeproc-data (>= ${source:Version}) Recommends: ${haskell:Recommends} Suggests: ${haskell:Suggests} Provides: ${haskell:Provides} @@ -123,7 +124,10 @@ Description: Pandoc support for Citation Style Language - data files Package: pandoc-citeproc Architecture: any -Depends: ${haskell:Depends}, ${misc:Depends}, ${shlibs:Depends} +Depends: ${haskell:Depends} + , ${misc:Depends} + , ${shlibs:Depends} + , libghc-pandoc-citeproc-data (>= ${source:Version}) Suggests: ${haskell:Suggests} Recommends: ${haskell:Recommends} Description: Pandoc support for Citation Style Language - tools diff --git a/p/haskell-pandoc-citeproc/debian/libghc-pandoc-citeproc-data.dirs b/p/haskell-pandoc-citeproc/debian/libghc-pandoc-citeproc-data.dirs index dd222dbfa..b05f5dab2 100644 --- a/p/haskell-pandoc-citeproc/debian/libghc-pandoc-citeproc-data.dirs +++ b/p/haskell-pandoc-citeproc/debian/libghc-pandoc-citeproc-data.dirs @@ -1 +1 @@ -usr/share +usr/share/pandoc-citeproc diff --git a/p/haskell-pandoc-citeproc/debian/rules b/p/haskell-pandoc-citeproc/debian/rules index 245a8a3c7..3927557c4 100755 --- a/p/haskell-pandoc-citeproc/debian/rules +++ b/p/haskell-pandoc-citeproc/debian/rules @@ -12,7 +12,9 @@ DEB_SETUP_GHC_CONFIGURE_ARGS = -fbibutils -funicode_collation check-ghc-stamp: export LC_ALL := C.UTF-8 install/libghc-pandoc-citeproc-data:: debian/tmp-inst-ghc - cp -a debian/tmp-inst-ghc/usr/share/pandoc-citeproc/locales debian/libghc-pandoc-citeproc-data/usr/share/pandoc-citeproc + cp -a debian/tmp-inst-ghc/usr/share/pandoc-citeproc/chicago-author-date.csl \ + debian/tmp-inst-ghc/usr/share/pandoc-citeproc/locales \ + debian/libghc-pandoc-citeproc-data/usr/share/pandoc-citeproc/ install/pandoc-citeproc:: debian/tmp-inst-ghc cp debian/tmp-inst-ghc/usr/bin/* debian/pandoc-citeproc/usr/bin |