[Pkg-haskell-commits] darcs: haskell-pandoc-citeproc: * Fix data file handling (closes: #734155):

[Colin Watson]

Wed Jan  8 11:56:40 UTC 2014  Colin Watson <cjwatson at debian.org>
  * * 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.

    M ./changelog +10
    M ./control -1 +5
    M ./libghc-pandoc-citeproc-data.dirs -1 +1
    M ./rules -1 +3

Wed Jan  8 11:56:40 UTC 2014  Colin Watson <cjwatson at debian.org>
  * * 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.
diff -rN -u old-haskell-pandoc-citeproc/changelog new-haskell-pandoc-citeproc/changelog
--- old-haskell-pandoc-citeproc/changelog	2014-01-08 12:15:36.568174152 +0000
+++ new-haskell-pandoc-citeproc/changelog	2014-01-08 12:15:36.580174150 +0000
@@ -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 at 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 -rN -u old-haskell-pandoc-citeproc/control new-haskell-pandoc-citeproc/control
--- old-haskell-pandoc-citeproc/control	2014-01-08 12:15:36.568174152 +0000
+++ new-haskell-pandoc-citeproc/control	2014-01-08 12:15:36.572174151 +0000
@@ -70,6 +70,7 @@
 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 @@
 
 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 -rN -u old-haskell-pandoc-citeproc/libghc-pandoc-citeproc-data.dirs new-haskell-pandoc-citeproc/libghc-pandoc-citeproc-data.dirs
--- old-haskell-pandoc-citeproc/libghc-pandoc-citeproc-data.dirs	2014-01-08 12:15:36.568174152 +0000
+++ new-haskell-pandoc-citeproc/libghc-pandoc-citeproc-data.dirs	2014-01-08 12:15:36.576174150 +0000
@@ -1 +1 @@
-usr/share
+usr/share/pandoc-citeproc
diff -rN -u old-haskell-pandoc-citeproc/rules new-haskell-pandoc-citeproc/rules
--- old-haskell-pandoc-citeproc/rules	2014-01-08 12:15:36.568174152 +0000
+++ new-haskell-pandoc-citeproc/rules	2014-01-08 12:15:36.580174150 +0000
@@ -12,7 +12,9 @@
 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