[Pkg-haskell-commits] darcs: haskell-edison-core: Correct sed s/ghc6/ghc in changelog entries

[Marco Silva]

Sun Jan 16 13:54:27 UTC 2011  Marco Silva <marcot at debian.org>
  * Correct sed s/ghc6/ghc in changelog entries
  Ignore-this: c2306561adc455ab85d1fdf9e037724d

    M ./changelog -17 +17

Sun Jan 16 13:54:27 UTC 2011  Marco Silva <marcot at debian.org>
  * Correct sed s/ghc6/ghc in changelog entries
  Ignore-this: c2306561adc455ab85d1fdf9e037724d
diff -rN -u old-haskell-edison-core/changelog new-haskell-edison-core/changelog
--- old-haskell-edison-core/changelog	2011-01-16 14:17:37.752579422 +0000
+++ new-haskell-edison-core/changelog	2011-01-16 14:17:37.756579633 +0000
@@ -1,6 +1,6 @@
 haskell-edison-core (1.2.1.3-6) UNRELEASED; urgency=low
 
-  * Use ghc instead of ghc
+  * Use ghc instead of ghc6
 
  -- Marco Silva <marcot at debian.org>  Sat, 15 Jan 2011 12:40:56 -0200
 
@@ -137,20 +137,20 @@
   * debian/control:
     - Update XS-Vcs-* fields as the packages has moved to the pkg-haskell
       subversion archive.
-    - Add libghc-mtl-prof and libghc-quickcheck-prof to Build-Depends as
-      libghc-mtl-dev and libghc-quickcheck-dev have split of their
+    - Add libghc6-mtl-prof and libghc6-quickcheck-prof to Build-Depends as
+      libghc6-mtl-dev and libghc6-quickcheck-dev have split of their
       profiling libraries into seperate packages.
-  * debian/{ghc.in,rules}:
+  * debian/{ghc6.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 libghc-base-doc, libghc-haskell98-doc, libghc-mtl-doc and
-        libghc-quickcheck-doc to the Build-Depends-Indep so haddock can
+      + Add libghc6-base-doc, libghc6-haskell98-doc, libghc6-mtl-doc and
+        libghc6-quickcheck-doc to the Build-Depends-Indep so haddock can
         link to the names in other packages.
-      + Add libghc-base-doc, libghc-haskell98-doc, libghc-mtl-doc and
-        libghc-quickcheck-doc to the Recommends of haskell-edison-doc.
+      + Add libghc6-base-doc, libghc6-haskell98-doc, libghc6-mtl-doc and
+        libghc6-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.
@@ -201,11 +201,11 @@
 haskell-edison (1.2.0.1-4) unstable; urgency=low
 
   * debian/control: 
-    - 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}: 
+    - 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}: 
     - Exit on errors and show the commands executed.
   * debian/patches/20_add-haddock-file: generate haddock interface file
     when generating API documentation.
@@ -222,20 +222,20 @@
 
 haskell-edison (1.2.0.1-3) unstable; urgency=low
 
-  * Stop using update-haskell-control and $ghc_* variables, as it is not
+  * Stop using update-haskell-control and $ghc6_* 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 libghc-mtl-dev and libghc-quickcheck-dev to Build-Depends.
+    - add libghc6-mtl-dev and libghc6-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/ghc and debian/ghc-pkg6 on clean.
-    - replace debian/mk-ghc-vars script with debian/mk-haskell-depends
+    - remove debian/ghc6 and debian/ghc-pkg6 on clean.
+    - replace debian/mk-ghc6-vars script with debian/mk-haskell-depends
       script which determines all dependencies by using the installed
       package description file used by ghc-pkg.