[Pkg-haskell-commits] [SCM] Packaging for Agda branch, master, updated. debian/2.2.6-1-4-g7e8012d

[Iain Lane]

The following commit has been merged in the master branch:
commit 7e8012df5060554b3f9040aff051e5cb3d035e88
Author: Iain Lane <laney at ubuntu.com>
Date:   Sat Jan 16 16:16:46 2010 +0000

    Use cabal to install data files in a more appropriate location

diff --git a/debian/agda-mode.install b/debian/agda-mode.install
index db48cfc..83fd23e 100644
--- a/debian/agda-mode.install
+++ b/debian/agda-mode.install
@@ -1,2 +1,2 @@
-src/data/emacs-mode/* usr/share/emacs/site-lisp/agda
+debian/tmp-inst-ghc6/usr/share/libghc6-agda-dev/emacs-mode/* usr/share/emacs/site-lisp/agda
 debian/50agda.el etc/emacs/site-start.d/
diff --git a/debian/libghc6-agda-dev.install b/debian/libghc6-agda-dev.install
index 6ce82f6..77e89fa 100644
--- a/debian/libghc6-agda-dev.install
+++ b/debian/libghc6-agda-dev.install
@@ -1 +1 @@
-src/data/Agda.css /usr/share/Agda-2.2.6/
+debian/tmp-inst-ghc6/usr/share/libghc6-agda-dev/Agda.css usr/share/libghc6-agda-dev/
diff --git a/debian/rules b/debian/rules
index d12631d..5a70c25 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,7 @@
 #!/usr/bin/make -f
 DEB_BUILD_DEPENDENCIES = build-arch
+
+DEB_SETUP_GHC6_CONFIGURE_ARGS := --datadir='/usr/share' --datasubdir='libghc6-agda-dev'
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk

-- 
Packaging for Agda