[Pkg-haskell-commits] [SCM] Packaging for Agda branch, master, updated. debian/2.2.8-1-14-g51b3624

Iain Lane laney at ubuntu.com
Tue Apr 12 16:10:44 UTC 2011


The following commit has been merged in the master branch:
commit ee8a4bc5c15fb3a10fbaa1e9e8f2badbd0cf54ad
Author: Iain Lane <laney at ubuntu.com>
Date:   Fri Apr 8 11:02:20 2011 +0100

    GHC6 → GHC, for GHC 7 transition

diff --git a/debian/agda-mode.install b/debian/agda-mode.install
index 83fd23e..ebd1321 100644
--- a/debian/agda-mode.install
+++ b/debian/agda-mode.install
@@ -1,2 +1,2 @@
-debian/tmp-inst-ghc6/usr/share/libghc6-agda-dev/emacs-mode/* usr/share/emacs/site-lisp/agda
+debian/tmp-inst-ghc/usr/share/libghc-agda-dev/emacs-mode/* usr/share/emacs/site-lisp/agda
 debian/50agda.el etc/emacs/site-start.d/
diff --git a/debian/control b/debian/control
index c36574a..908b4d3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,54 +4,54 @@ Section: haskell
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
 Uploaders: Iain Lane <laney at ubuntu.com>
 Build-Depends: debhelper (>= 7.0),
-               haskell-devscripts (>= 0.7),
+               haskell-devscripts (>= 0.8),
                cdbs (>> 0.4.58),
-               ghc6,
-               libghc6-binary-dev (>= 0.4.4),
-               libghc6-binary-dev (<< 0.6),
-               libghc6-haskeline-dev (>= 0.3),
-               libghc6-haskeline-dev (<< 0.7),
-               libghc6-haskell-src-dev (>= 1.0.1.1),
-               libghc6-haskell-src-dev (<< 2),
-               libghc6-mtl-dev (>= 1.1),
-               libghc6-mtl-dev (<< 2),
-               libghc6-xhtml-dev (>= 3000.2),
-               libghc6-xhtml-dev (<< 3000.3),
-               libghc6-zlib-dev (>= 0.4.0.1),
-               libghc6-zlib-dev (<< 1),
-               libghc6-src-exts-dev (>=1.9.6),
-               libghc6-src-exts-dev (<< 1.10),
-               libghc6-quickcheck2-dev (>= 2.1.0.2),
-               libghc6-quickcheck2-dev (<< 2.5),
+               ghc,
+               libghc-binary-dev (>= 0.4.4),
+               libghc-binary-dev (<< 0.6),
+               libghc-haskeline-dev (>= 0.3),
+               libghc-haskeline-dev (<< 0.7),
+               libghc-haskell-src-dev (>= 1.0.1.1),
+               libghc-haskell-src-dev (<< 2),
+               libghc-mtl-dev (>= 1.1),
+               libghc-mtl-dev (<< 2),
+               libghc-xhtml-dev (>= 3000.2),
+               libghc-xhtml-dev (<< 3000.3),
+               libghc-zlib-dev (>= 0.4.0.1),
+               libghc-zlib-dev (<< 1),
+               libghc-src-exts-dev (>=1.9.6),
+               libghc-src-exts-dev (<< 1.10),
+               libghc-quickcheck2-dev (>= 2.1.0.2),
+               libghc-quickcheck2-dev (<< 2.5),
                happy (>= 1.15),
                happy (<< 2),
                alex (>= 2.0.1),
                alex (<< 3),
                libncurses5-dev
-Build-Depends-Indep: ghc6-doc,
-                     libghc6-binary-doc (>= 0.4.4),
-                     libghc6-binary-doc (<< 0.6),
-                     libghc6-haskeline-doc (>= 0.3),
-                     libghc6-haskeline-doc (<< 0.7),
-                     libghc6-haskell-src-doc (>= 1.0.1.1),
-                     libghc6-haskell-src-doc (<< 2),
-                     libghc6-mtl-doc (>= 1.1),
-                     libghc6-mtl-doc (<< 2),
-                     libghc6-terminfo-doc,
-                     libghc6-xhtml-doc (>= 3000.2),
-                     libghc6-xhtml-doc (<< 3000.3),
-                     libghc6-zlib-doc (>= 0.4.0.1),
-                     libghc6-zlib-doc (<< 1),
-                     libghc6-src-exts-doc (>=1.9.6),
-                     libghc6-src-exts-doc (<< 1.10),
-                     libghc6-quickcheck2-doc (>= 2.1.0.2),
-                     libghc6-quickcheck2-doc (<< 2.5),
+Build-Depends-Indep: ghc-doc,
+                     libghc-binary-doc (>= 0.4.4),
+                     libghc-binary-doc (<< 0.6),
+                     libghc-haskeline-doc (>= 0.3),
+                     libghc-haskeline-doc (<< 0.7),
+                     libghc-haskell-src-doc (>= 1.0.1.1),
+                     libghc-haskell-src-doc (<< 2),
+                     libghc-mtl-doc (>= 1.1),
+                     libghc-mtl-doc (<< 2),
+                     libghc-terminfo-doc,
+                     libghc-xhtml-doc (>= 3000.2),
+                     libghc-xhtml-doc (<< 3000.3),
+                     libghc-zlib-doc (>= 0.4.0.1),
+                     libghc-zlib-doc (<< 1),
+                     libghc-src-exts-doc (>=1.9.6),
+                     libghc-src-exts-doc (<< 1.10),
+                     libghc-quickcheck2-doc (>= 2.1.0.2),
+                     libghc-quickcheck2-doc (<< 2.5),
 Standards-Version: 3.9.1
 Vcs-Browser: http://git.debian.org/?p=pkg-haskell/agda.git;a=summary
 Vcs-Git: git://git.debian.org/git/pkg-haskell/agda.git
 Homepage: http://wiki.portal.chalmers.se/agda/
 
-Package: libghc6-agda-dev
+Package: libghc-agda-dev
 Architecture: any
 Section: haskell
 Depends: ${haskell:Depends},
@@ -74,7 +74,7 @@ Description: dependently typed functional programming language - development lib
  .
  This package contains the normal library files.
 
-Package: libghc6-agda-doc
+Package: libghc-agda-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}, ${haskell:Depends}
@@ -106,8 +106,8 @@ Depends: ${shlibs:Depends},
          ${misc:Depends},
          emacs | emacsen,
          haskell-mode,
-         libghc6-agda-dev (>= ${source:Version}),
-         libghc6-agda-dev (<< ${source:Version}.1~)
+         libghc-agda-dev (>= ${source:Version}),
+         libghc-agda-dev (<< ${source:Version}.1~)
 Description: dependently typed functional programming language — emacs mode
  Agda is a dependently typed functional programming language: It has inductive
  families, which are like Haskell's GADTs, but they can be indexed by values and
diff --git a/debian/libghc-agda-dev.install b/debian/libghc-agda-dev.install
new file mode 100644
index 0000000..739be1c
--- /dev/null
+++ b/debian/libghc-agda-dev.install
@@ -0,0 +1 @@
+debian/tmp-inst-ghc/usr/share/libghc-agda-dev/Agda.css usr/share/libghc-agda-dev/
diff --git a/debian/libghc6-agda-dev.install b/debian/libghc6-agda-dev.install
deleted file mode 100644
index 77e89fa..0000000
--- a/debian/libghc6-agda-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-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 5a70c25..4c1a67e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 DEB_BUILD_DEPENDENCIES = build-arch
 
-DEB_SETUP_GHC6_CONFIGURE_ARGS := --datadir='/usr/share' --datasubdir='libghc6-agda-dev'
+DEB_SETUP_GHC6_CONFIGURE_ARGS := --datadir='/usr/share' --datasubdir='libghc-agda-dev'
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk

-- 
Packaging for Agda



More information about the Pkg-haskell-commits mailing list