agda: update d/control & detail in changelog

3 files changed, 183 insertions, 119 deletions

diff --git a/p/agda/debian/changelog b/p/agda/debian/changelog
index af5708154..0fc250718 100644
--- a/p/agda/debian/changelog
+++ b/p/agda/debian/changelog
@@ -1,8 +1,23 @@
 agda (2.5.1-1) UNRELEASED; urgency=medium
 
   * Package new upstream version.
+    - Build dependency bounds updated to match Agda.cabal.
+    - New build dependencies:
+      - ghc-prof
+      - libghc-edison-core-*
+      - libghc-edison-api-*
+      - libghc-monadplus-*
+      - libghc-transformers-*
+      - libghc-*-prof for each libghc-*-dev
+    - Dropped build dependencies:
+      - ghc-ghci
   * Install Emacs mode with dh_elpa.
+    - New binary package elpa-agda2-mode.
+    - agda-mode now a transitional dummy package.
   * Add myself as an uploader.
+  * Update Vcs-* for merge into DHG_packages.git
+  * Run wrap-and-sort -abst
+  * Bump standards version to 3.9.8 (no changes required).
 
  -- Sean Whitton <spwhitton@spwhitton.name>  Wed, 08 Jun 2016 20:58:23 +0900
 
diff --git a/p/agda/debian/control b/p/agda/debian/control
index fab243f32..1f0c2498c 100644
--- a/p/agda/debian/control
+++ b/p/agda/debian/control
@@ -1,83 +1,114 @@
 Source: agda
+Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
+Uploaders:
+ Iain Lane <laney@debian.org>,
+ Kiwamu Okabe <kiwamu@debian.or.jp>,
+ Sean Whitton <spwhitton@spwhitton.name>,
 Priority: extra
 Section: haskell
-Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
-Uploaders: Iain Lane <laney@debian.org>, Kiwamu Okabe <kiwamu@debian.or.jp>, Sean Whitton <spwhitton@spwhitton.name>
-Build-Depends: debhelper (>= 9),
-               haskell-devscripts (>= 0.8.15~),
-               cdbs (>> 0.4.58),
-               ghc (>= 7.6),
-               ghc-ghci,
-               libghc-boxes-dev (>= 0.1.3),
-               libghc-boxes-dev (<< 0.2),
-               libghc-data-hash-dev (>= 0.2.0.0),
-               libghc-data-hash-dev (<< 0.3.0.0),
-               libghc-edit-distance-dev (>= 0.2.1.2),
-               libghc-edit-distance-dev (<< 0.3),
-               libghc-equivalence-dev (>= 0.2.5),
-               libghc-equivalence-dev (<< 0.4),
-               libghc-geniplate-mirror-dev (>= 0.6.0.6),
-               libghc-geniplate-mirror-dev (<< 0.8),
-               libghc-hashable-dev (>= 1.2.1.0),
-               libghc-hashable-dev (<< 1.3),
-               libghc-hashtables-dev (>= 1.2.0.2),
-               libghc-hashtables-dev (<< 1.3),
-               libghc-mtl-dev (>= 2.2.1),
-               libghc-mtl-dev (<< 2.3),
-               libghc-parallel-dev (<< 3.3),
-               libghc-unordered-containers-dev (>= 0.2.5.0),
-               libghc-unordered-containers-dev (<< 0.3),
-               libghc-zlib-dev (>= 0.4.0.1),
-               libghc-zlib-dev (<< 0.7),
-               libghc-strict-dev (>= 0.3.2),
-               libghc-strict-dev (<< 0.4),
-               libghc-src-exts-dev (>= 1.16.0.1),
-               libghc-src-exts-dev (<< 1.18),
-               libghc-text-dev (>= 0.11.3.1),
-               libghc-text-dev (<< 1.3),
-               libghc-transformers-compat-dev (>= 0.3.3.3),
-               libghc-transformers-compat-dev (<< 0.5),
-               libghc-quickcheck2-dev (>= 2.8),
-               libghc-quickcheck2-dev (<< 2.9),
-               cpphs (>= 1.19),
-               cpphs (<< 1.20),
-               happy (>= 1.19.4),
-               happy (<< 2),
-               alex (>= 3.1.0),
-               alex (<< 3.2),
-               libncurses5-dev
-Build-Depends-Indep: ghc-doc,
-                     libghc-boxes-doc,
-                     libghc-data-hash-doc,
-                     libghc-edit-distance-doc,
-                     libghc-equivalence-doc,
-                     libghc-geniplate-mirror-doc,
-                     libghc-hashable-doc,
-                     libghc-hashtables-doc,
-                     libghc-mtl-doc,
-                     libghc-parallel-doc,
-                     libghc-text-doc,
-                     libghc-unordered-containers-doc,
-                     libghc-zlib-doc,
-                     libghc-strict-doc,
-                     libghc-src-exts-doc,
-                     libghc-transformers-compat-doc,
-                     libghc-quickcheck2-doc,
-Standards-Version: 3.9.4
-Vcs-Browser: http://git.debian.org/?p=pkg-haskell/agda.git;a=summary
-Vcs-Git: git://git.debian.org/git/pkg-haskell/agda.git
+Build-Depends:
+ alex,
+ cdbs,
+ cpphs (>= 1.19),
+ debhelper (>= 9),
+ ghc,
+ ghc-prof,
+ happy,
+ haskell-devscripts (>= 0.9),
+ libghc-boxes-dev (<< 0.2),
+ libghc-boxes-dev (>= 0.1.3),
+ libghc-boxes-prof,
+ libghc-data-hash-dev (<< 0.3),
+ libghc-data-hash-dev (>= 0.2.0.0),
+ libghc-data-hash-prof,
+ libghc-edison-api-dev (<< 1.4),
+ libghc-edison-api-dev (>= 1.3),
+ libghc-edison-api-prof,
+ libghc-edison-core-dev (<< 1.3.2),
+ libghc-edison-core-dev (>= 1.3.1.1),
+ libghc-edison-core-prof,
+ libghc-edit-distance-dev (<< 0.3),
+ libghc-edit-distance-dev (>= 0.2.1.2),
+ libghc-edit-distance-prof,
+ libghc-equivalence-dev (<< 0.4),
+ libghc-equivalence-dev (>= 0.2.5),
+ libghc-equivalence-prof,
+ libghc-filemanip-dev (<< 0.4),
+ libghc-filemanip-dev (>= 0.3.6.3),
+ libghc-geniplate-mirror-dev (<< 0.8),
+ libghc-geniplate-mirror-dev (>= 0.6.0.6),
+ libghc-geniplate-mirror-prof,
+ libghc-hashable-dev (<< 1.3),
+ libghc-hashable-dev (>= 1.2.1.0),
+ libghc-hashable-prof,
+ libghc-hashtables-dev,
+ libghc-hashtables-prof,
+ libghc-monadplus-dev (<< 1.5),
+ libghc-monadplus-dev (>= 1.4),
+ libghc-monadplus-prof,
+ libghc-mtl-dev,
+ libghc-mtl-prof,
+ libghc-parallel-dev (<< 3.3),
+ libghc-parallel-dev (>= 3.2.0.4),
+ libghc-parallel-prof,
+ libghc-quickcheck2-dev (<< 2.9),
+ libghc-quickcheck2-dev (>= 2.8.2),
+ libghc-quickcheck2-prof,
+ libghc-src-exts-dev (<< 1.18),
+ libghc-src-exts-dev (>= 1.16.0.1),
+ libghc-src-exts-prof,
+ libghc-strict-dev (<< 0.4),
+ libghc-strict-dev (>= 0.3.2),
+ libghc-strict-prof,
+ libghc-transformers-compat-dev (<< 0.6),
+ libghc-transformers-compat-dev (>= 0.3.3.3),
+ libghc-transformers-compat-prof,
+ libghc-transformers-dev,
+ libghc-transformers-prof,
+ libghc-unordered-containers-dev (<< 0.3),
+ libghc-unordered-containers-dev (>= 0.2.5.0),
+ libghc-unordered-containers-prof,
+ libghc-zlib-dev (<< 0.7),
+ libghc-zlib-dev (>= 0.4.0.1),
+ libghc-zlib-prof,
+ libncurses5-dev,
+Build-Depends-Indep:
+ ghc-doc,
+ libghc-boxes-doc,
+ libghc-data-hash-doc,
+ libghc-edison-api-doc,
+ libghc-edison-core-doc,
+ libghc-edit-distance-doc,
+ libghc-equivalence-doc,
+ libghc-geniplate-mirror-doc,
+ libghc-hashable-doc,
+ libghc-hashtables-doc,
+ libghc-monadplus-doc,
+ libghc-mtl-doc,
+ libghc-parallel-doc,
+ libghc-quickcheck2-doc,
+ libghc-src-exts-doc,
+ libghc-strict-doc,
+ libghc-transformers-compat-doc,
+ libghc-transformers-doc,
+ libghc-unordered-containers-doc,
+ libghc-zlib-doc,
+Standards-Version: 3.9.8
 Homepage: http://wiki.portal.chalmers.se/agda/
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/haskell-agda
+Vcs-Git: git://git.debian.org/git/pkg-haskell/DHG_packages.git
 
-Package: libghc-agda-dev
-Architecture: any
-Section: haskell
-Depends: ${shlibs:Depends},
-         ${haskell:Depends},
-         ${misc:Depends},
-Recommends: ${haskell:Recommends}
-Suggests: ${haskell:Suggests}
-Provides: ${haskell:Provides}
-Description: dependently typed functional programming language${haskell:ShortBlurb}
+Package: agda
+Architecture: all
+Section: misc
+Depends:
+ agda-bin,
+ agda-mode,
+ agda-stdlib,
+ agda-stdlib-doc,
+ libghc-agda-dev,
+ ${misc:Depends},
+Description: dependently typed functional programming language
  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
  not just types. It also has parameterised modules, mixfix operators, Unicode
@@ -90,18 +121,23 @@ Description: dependently typed functional programming language${haskell:ShortBlu
  Martin-Löf. It has many similarities with other proof assistants based on
  dependent types, such as Coq, Epigram and NuPRL.
  .
- ${haskell:Blurb}
+ This is a meta package which provides Agda's emacs mode, executable, standard
+ library and its documentation.
 
-Package: libghc-agda-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}, ${haskell:Depends}
-Recommends: ${haskell:Recommends}
-Suggests: ${haskell:Suggests}
-Replaces: haskell-agda-doc
-Conflicts: haskell-agda-doc (<< 2.2.6-5)
-Provides: haskell-agda-doc
-Description: dependently typed functional programming language${haskell:ShortBlurb}
+Package: agda-bin
+Architecture: any
+Depends:
+ ${haskell:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ libghc-agda-dev (<< ${source:Upstream-Version}+~),
+ libghc-agda-dev (>= ${source:Upstream-Version}),
+ ${haskell:Recommends},
+Suggests:
+ agda-mode,
+ ${haskell:Suggests},
+Description: commandline interface to Agda
  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
  not just types. It also has parameterised modules, mixfix operators, Unicode
@@ -114,19 +150,22 @@ Description: dependently typed functional programming language${haskell:ShortBlu
  Martin-Löf. It has many similarities with other proof assistants based on
  dependent types, such as Coq, Epigram and NuPRL.
  .
- ${haskell:Blurb}
+ This package provides a command-line program for type-checking and compiling
+ Agda programs. The program can also generate hyperlinked, highlighted HTML
+ files from Agda sources.
 
 Package: agda-mode
 Architecture: all
 Section: misc
-Depends: ${shlibs:Depends},
-         ${haskell:Depends},
-         ${misc:Depends},
-         emacs | emacsen,
-         agda-bin (>= ${source:Version}),
-         agda-bin (<< ${source:Version}.1~),
-         libghc-agda-dev (>= ${source:Version}),
-         libghc-agda-dev (<< ${source:Version}.1~)
+Depends:
+ agda-bin (<< ${source:Version}.1~),
+ agda-bin (>= ${source:Version}),
+ emacs | emacsen,
+ libghc-agda-dev (<< ${source:Version}.1~),
+ libghc-agda-dev (>= ${source:Version}),
+ ${haskell:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends},
 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
@@ -144,16 +183,20 @@ Description: dependently typed functional programming language — emacs mode
  mode is the preferred way to write Agda code, and offers features such as
  iterative development, refinement, case analysis and so on.
 
-Package: agda
-Architecture: all
-Section: misc
-Depends: ${misc:Depends},
-         libghc-agda-dev,
-         agda-bin,
-         agda-mode,
-         agda-stdlib,
-         agda-stdlib-doc
-Description: dependently typed functional programming language
+Package: libghc-agda-dev
+Architecture: any
+Section: haskell
+Depends:
+ ${haskell:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ ${haskell:Recommends},
+Suggests:
+ ${haskell:Suggests},
+Provides:
+ ${haskell:Provides},
+Description: dependently typed functional programming language${haskell:ShortBlurb}
  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
  not just types. It also has parameterised modules, mixfix operators, Unicode
@@ -166,17 +209,25 @@ Description: dependently typed functional programming language
  Martin-Löf. It has many similarities with other proof assistants based on
  dependent types, such as Coq, Epigram and NuPRL.
  .
- This is a meta package which provides Agda's emacs mode, executable, standard
- library and its documentation.
+ ${haskell:Blurb}
 
-Package: agda-bin
-Architecture: any
-Depends: ${shlibs:Depends}, ${haskell:Depends}, ${misc:Depends}
-Recommends: ${haskell:Recommends},
-            libghc-agda-dev (>= ${source:Upstream-Version}),
-            libghc-agda-dev (<< ${source:Upstream-Version}+~)
-Suggests: ${haskell:Suggests}, agda-mode
-Description: commandline interface to Agda
+Package: libghc-agda-doc
+Architecture: all
+Section: doc
+Depends:
+ ${haskell:Depends},
+ ${misc:Depends},
+Recommends:
+ ${haskell:Recommends},
+Suggests:
+ ${haskell:Suggests},
+Conflicts:
+ haskell-agda-doc (<< 2.2.6-5),
+Provides:
+ haskell-agda-doc,
+Replaces:
+ haskell-agda-doc,
+Description: dependently typed functional programming language${haskell:ShortBlurb}
  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
  not just types. It also has parameterised modules, mixfix operators, Unicode
@@ -189,6 +240,4 @@ Description: commandline interface to Agda
  Martin-Löf. It has many similarities with other proof assistants based on
  dependent types, such as Coq, Epigram and NuPRL.
  .
- This package provides a command-line program for type-checking and compiling
- Agda programs. The program can also generate hyperlinked, highlighted HTML
- files from Agda sources. 
+ ${haskell:Blurb}
diff --git a/p/agda/debian/copyright b/p/agda/debian/copyright
index 7c28dc0a5..e24bcf4e8 100644
--- a/p/agda/debian/copyright
+++ b/p/agda/debian/copyright
@@ -53,7 +53,7 @@ License: Other
   .
   - Neither name of the University nor the names of its contributors may be
   used to endorse or promote products derived from this software without
-  specific prior written permission. 
+  specific prior written permission.
   .
   THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
   GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,