[Pkg-haskell-commits] darcs: haskell-edison-core: Use ghc instead of ghc6
Marco Silva
marcot at debian.org
Sat Jan 15 15:25:57 UTC 2011
Sat Jan 15 15:05:53 UTC 2011 Marco Silva <marcot at debian.org>
* Use ghc instead of ghc6
Ignore-this: 98d22e8c38e82716ca23f7e101060b0f
M ./changelog -16 +22
M ./control -17 +17
Sat Jan 15 15:05:53 UTC 2011 Marco Silva <marcot at debian.org>
* Use ghc instead of ghc6
Ignore-this: 98d22e8c38e82716ca23f7e101060b0f
diff -rN -u old-haskell-edison-core/changelog new-haskell-edison-core/changelog
--- old-haskell-edison-core/changelog 2011-01-15 15:25:57.034167029 +0000
+++ new-haskell-edison-core/changelog 2011-01-15 15:25:57.046167661 +0000
@@ -1,3 +1,9 @@
+haskell-edison-core (1.2.1.3-6) UNRELEASED; urgency=low
+
+ * Use ghc instead of ghc
+
+ -- Marco Silva <marcot at debian.org> Sat, 15 Jan 2011 12:40:56 -0200
+
haskell-edison-core (1.2.1.3-5) unstable; urgency=low
* control: Use versioned Replaces: and Conflicts:
@@ -131,20 +137,20 @@
* debian/control:
- Update XS-Vcs-* fields as the packages has moved to the pkg-haskell
subversion archive.
- - Add libghc6-mtl-prof and libghc6-quickcheck-prof to Build-Depends as
- libghc6-mtl-dev and libghc6-quickcheck-dev have split of their
+ - Add libghc-mtl-prof and libghc-quickcheck-prof to Build-Depends as
+ libghc-mtl-dev and libghc-quickcheck-dev have split of their
profiling libraries into seperate packages.
- * debian/{ghc6.in,rules}:
+ * debian/{ghc.in,rules}:
- Add handling of noopt in DEB_BUILD_OPTIONS enviroment variable.
* debian/{mk-haskell-depends,rules}:
- Small cleanups.
* Generate links to other API documentation packages:
- debian/control:
- + Add libghc6-base-doc, libghc6-haskell98-doc, libghc6-mtl-doc and
- libghc6-quickcheck-doc to the Build-Depends-Indep so haddock can
+ + Add libghc-base-doc, libghc-haskell98-doc, libghc-mtl-doc and
+ libghc-quickcheck-doc to the Build-Depends-Indep so haddock can
link to the names in other packages.
- + Add libghc6-base-doc, libghc6-haskell98-doc, libghc6-mtl-doc and
- libghc6-quickcheck-doc to the Recommends of haskell-edison-doc.
+ + Add libghc-base-doc, libghc-haskell98-doc, libghc-mtl-doc and
+ libghc-quickcheck-doc to the Recommends of haskell-edison-doc.
- debian/patches/20_add-haddock-file.dpatch:
+ Add the appropriate --read-interface and --use-package options so
haddock will link to names in other packages.
@@ -195,11 +201,11 @@
haskell-edison (1.2.0.1-4) unstable; urgency=low
* debian/control:
- - Bump Build-Depends on ghc6 as Edison needs a new Cabal version.
- - Add ghc6-prof to the Build-Depends.
- - Let libghc6-edison-api-dev and libghc6-edison-core-dev provide
- libghc6-edison-api-prof and libghc6-edison-core-prof.
- * debian/{ghc6.in,ghc-pkg6.in}:
+ - Bump Build-Depends on ghc as Edison needs a new Cabal version.
+ - Add ghc-prof to the Build-Depends.
+ - Let libghc-edison-api-dev and libghc-edison-core-dev provide
+ libghc-edison-api-prof and libghc-edison-core-prof.
+ * debian/{ghc.in,ghc-pkg6.in}:
- Exit on errors and show the commands executed.
* debian/patches/20_add-haddock-file: generate haddock interface file
when generating API documentation.
@@ -216,20 +222,20 @@
haskell-edison (1.2.0.1-3) unstable; urgency=low
- * Stop using update-haskell-control and $ghc6_* variables, as it is not
+ * Stop using update-haskell-control and $ghc_* variables, as it is not
necessary and not using it simplifies the work for porters and for me.
* debian/copyright:
- include email from upstream with more information about the exact
licensing.
* debian/control.in:
- - add libghc6-mtl-dev and libghc6-quickcheck-dev to Build-Depends.
+ - add libghc-mtl-dev and libghc-quickcheck-dev to Build-Depends.
- replace ${ghc:Depends} with ${haskell:Depends}
- update maintainer email address.
* debian/rules:
- copy the actual package.conf file in which all installed packages
are registered.
- - remove debian/ghc6 and debian/ghc-pkg6 on clean.
- - replace debian/mk-ghc6-vars script with debian/mk-haskell-depends
+ - remove debian/ghc and debian/ghc-pkg6 on clean.
+ - replace debian/mk-ghc-vars script with debian/mk-haskell-depends
script which determines all dependencies by using the installed
package description file used by ghc-pkg.
diff -rN -u old-haskell-edison-core/control new-haskell-edison-core/control
--- old-haskell-edison-core/control 2011-01-15 15:25:57.034167029 +0000
+++ new-haskell-edison-core/control 2011-01-15 15:25:57.038167240 +0000
@@ -6,33 +6,33 @@
Build-Depends: cdbs
, debhelper (>= 7)
, haskell-devscripts (>= 0.7)
- , ghc6
- , ghc6-prof
- , ghc6-doc
- , libghc6-mtl-dev
- , libghc6-mtl-prof
- , libghc6-mtl-doc
- , libghc6-edison-api-dev (>= 1.2.1)
- , libghc6-edison-api-dev (<< 1.2.2)
- , libghc6-edison-api-prof
+ , ghc
+ , ghc-prof
+ , ghc-doc
+ , libghc-mtl-dev
+ , libghc-mtl-prof
+ , libghc-mtl-doc
+ , libghc-edison-api-dev (>= 1.2.1)
+ , libghc-edison-api-dev (<< 1.2.2)
+ , libghc-edison-api-prof
, haskell-edison-api-doc
- , libghc6-quickcheck1-dev
- , libghc6-quickcheck1-prof
- , libghc6-quickcheck1-doc
+ , libghc-quickcheck1-dev
+ , libghc-quickcheck1-prof
+ , libghc-quickcheck1-doc
, cpphs
Standards-Version: 3.8.4
Homepage: http://www.cs.princeton.edu/~rdockins/edison/home/
Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-edison-core
Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-edison-core
-Package: libghc6-edison-core-dev
+Package: libghc-edison-core-dev
Architecture: any
Depends: ${haskell:Depends}, ${shlibs:Depends}, ${misc:Depends}
Suggests: ${haskell:Suggests}
Provides: ${haskell:Provides}
Description: Haskell library of efficent, purely-functional data structures
Some concrete implementations of the abstract interface of the Edison
- library for Haskell for use with ghc6.
+ library for Haskell for use with ghc.
.
Edison is a library of purely function data structures for Haskell
originally written by Chris Okasaki. Conceptually, it consists of two
@@ -44,14 +44,14 @@
.
This package contains the concrete implementations.
-Package: libghc6-edison-core-prof
+Package: libghc-edison-core-prof
Architecture: any
Depends: ${haskell:Depends}, ${shlibs:Depends}, ${misc:Depends}
Suggests: ${haskell:Suggests}
Provides: ${haskell:Provides}
Description: Haskell library of data structures; profiling libraries
Some concrete implementations of the abstract interface of the Edison
- library for Haskell for use with ghc6.
+ library for Haskell for use with ghc.
.
Edison is a library of purely function data structures for Haskell
originally written by Chris Okasaki. Conceptually, it consists of two
@@ -63,7 +63,7 @@
.
This package contains the concrete implementations.
-Package: libghc6-edison-core-doc
+Package: libghc-edison-core-doc
Replaces: haskell-edison-core-doc (<< 1.2.1.3-4)
Conflicts: haskell-edison-core-doc (<< 1.2.1.3-4)
Provides: haskell-edison-core-doc
More information about the Pkg-haskell-commits
mailing list