[Pkg-haskell-commits] darcs: haskell-http: Use ghc instead of ghc6

Marco Silva marcot at debian.org
Sat Jan 15 15:39:39 UTC 2011


Sat Jan 15 15:06:01 UTC 2011  Marco Silva <marcot at debian.org>
  * Use ghc instead of ghc6
  Ignore-this: 6ac4135bed51d12596ef58eee92607fa

    M ./changelog -13 +19
    M ./control -15 +15

Sat Jan 15 15:06:01 UTC 2011  Marco Silva <marcot at debian.org>
  * Use ghc instead of ghc6
  Ignore-this: 6ac4135bed51d12596ef58eee92607fa
diff -rN -u old-haskell-http/changelog new-haskell-http/changelog
--- old-haskell-http/changelog	2011-01-15 15:39:38.957495948 +0000
+++ new-haskell-http/changelog	2011-01-15 15:39:38.961496159 +0000
@@ -1,3 +1,9 @@
+haskell-http (40000009-3) UNRELEASED; urgency=low
+
+  * Use ghc instead of ghc
+
+ -- Marco Silva <marcot at debian.org>  Sat, 15 Jan 2011 12:41:11 -0200
+
 haskell-http (40000009-2) unstable; urgency=low
 
   * control: Use versioned Replaces: and Conflicts:
@@ -89,11 +95,11 @@
 
   * Update for GHC 6.8.2:
     - debian/patches/00list: disable 01-work-with-old-cabal patch.
-    - debian/control: Bump build dependency on ghc6 to 6.8.2 which ships
+    - debian/control: Bump build dependency on ghc to 6.8.2 which ships
       the new Cabal version needed to build this package.
   * debian/control:
     - Adjust Vcs-* fields to point to trunk.
-    - Change the section of libghc6-haxml-dev to libdevel as suggested by
+    - Change the section of libghc-haxml-dev to libdevel as suggested by
       lintian (dev-package-should-be-section-libdevel)
   * debian/haskell-http-doc.doc-base:
     - Cabal version 1.2 installs the generated documentation into a
@@ -153,10 +159,10 @@
     - Updated for the new location of upstream tarballs.
   * Generate links to other API documentation packages:
     - debian/control:
-      + Add libghc6-base-doc, libghc6-network-doc and libghc6-parsec-doc
+      + Add libghc-base-doc, libghc-network-doc and libghc-parsec-doc
         to the Build-Depends-Indep so haddock can link to names in other
         packages.
-      + Add libghc6-base-doc, libghc6-network-doc and libghc5-parsec-doc
+      + Add libghc-base-doc, libghc-network-doc and libghc5-parsec-doc
         to the Recommends of haskell-http-doc.
   
  -- Arjan Oosting <arjan at debian.org>  Mon, 28 May 2007 06:01:50 +0200
@@ -185,12 +191,12 @@
 haskell-http (20060707-2) unstable; urgency=medium
 
   * Rebuild against latest GHC (Closes: #394656)
-  * 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/control: 
     - added XS-Vcs-Svn field pointing to Subversion archive which contains
       this package.
-    - added libghc6-network-dev to Build-Depends.
+    - added libghc-network-dev to Build-Depends.
     - added dctrl-tools to Build-Depends as it is needed by
       debian/mk-haskell-depends.
     - change maintainer email address.
@@ -221,11 +227,11 @@
     only touches the files in the debian directory.
   * Drop patch to README which is not installed anyway.
   * Remove the support for the old Network.URI module from the diff.gz as
-    ghc6 and hugs both have the new Network.URI module.
+    ghc and hugs both have the new Network.URI module.
   * debian/control.in:
     - remove duplicate build dependencies
-    - add versioned Build-Depends on ghc6 to get the latest version of Cabal.
-    - drop the Build-Depends on libghc6-cabal-dev.
+    - add versioned Build-Depends on ghc to get the latest version of Cabal.
+    - drop the Build-Depends on libghc-cabal-dev.
     - added ppc64 to Architectures line. (Closes: #375609)
     - add dpatch to Build-Depends.
   * debian/haskell-http-doc.docs: added. Install the API documentation.
@@ -248,7 +254,7 @@
     - remove configure and install targets, almost everything is done in
       the binary-arch and binary-indep targets.
   * debian/control.in:
-    - remove the versioned dependency on ghc6 version 6.4.2 as it is not
+    - remove the versioned dependency on ghc version 6.4.2 as it is not
       yet in the archive anyway.
     - Upgrade to Standards-Version 3.7.2. No changes needed.	
     - Use the new substitution variables source:Version and build depend
@@ -268,10 +274,10 @@
     - Cleanup the Build-Depends and Build-Depends-Indep
     - Add Homepage: http://www.haskell.org/http/ to the descriptions.
     - Properly escape ${haskell:Depends}.  
-    - Add versioned libghc6-cabal-dev and ghc6 to the Build-Depends to use
+    - Add versioned libghc-cabal-dev and ghc to the Build-Depends to use
       Cabal version 1.1.1 or later which introduces a new installation
       prefix for libraries.
-    libghc6-http-dev determinable.
+    libghc-http-dev determinable.
   * debian/compat: added and set debhelper compatability level to 5.
   * debian/copyright: updated.
   * debian/haskell-http-doc.dirs: added.
@@ -282,7 +288,7 @@
     - split the dh_haskell -a -i call two calls. Move all the architecture
       independent stuff to binary-indep and all the architecture dependent
       stuff to binary-arch. (Closes: #315333)
-    - remove the empty directory usr/lib/haskell-packages/ghc6/bin 
+    - remove the empty directory usr/lib/haskell-packages/ghc/bin 
       (Closes: #324718)
     - do not ignore errors on clean and remove redundant make clean call.
     - general cleanup.
diff -rN -u old-haskell-http/control new-haskell-http/control
--- old-haskell-http/control	2011-01-15 15:39:38.953495737 +0000
+++ new-haskell-http/control	2011-01-15 15:39:38.961496159 +0000
@@ -7,24 +7,24 @@
   debhelper (>= 7),
   haskell-devscripts (>= 0.7),
   cdbs (>> 0.4.58),
-  ghc6,
-  ghc6-prof,
-  ghc6-doc,
-  libghc6-mtl-dev,
-  libghc6-mtl-prof,
-  libghc6-mtl-doc,
-  libghc6-network-dev,
-  libghc6-network-prof,
-  libghc6-network-doc,
-  libghc6-parsec2-prof,
-  libghc6-parsec2-dev,
-  libghc6-parsec2-doc,
+  ghc,
+  ghc-prof,
+  ghc-doc,
+  libghc-mtl-dev,
+  libghc-mtl-prof,
+  libghc-mtl-doc,
+  libghc-network-dev,
+  libghc-network-prof,
+  libghc-network-doc,
+  libghc-parsec2-prof,
+  libghc-parsec2-dev,
+  libghc-parsec2-doc,
 Standards-Version: 3.8.4
 Homepage: http://projects.haskell.org/http/
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-http/
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-http
 
-Package: libghc6-http-dev
+Package: libghc-http-dev
 Architecture: any
 Depends: ${haskell:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Suggests: ${haskell:Suggests}
@@ -34,7 +34,7 @@
  .
  This package contains the libraries compiled for GHC 6.
 
-Package: libghc6-http-prof
+Package: libghc-http-prof
 Architecture: any
 Depends: ${haskell:Depends}, ${misc:Depends}
 Suggests: ${haskell:Suggests}
@@ -44,7 +44,7 @@
  .
  This package contains the profiling libraries compiled for GHC 6.
 
-Package: libghc6-http-doc
+Package: libghc-http-doc
 Replaces: haskell-http-doc (<< 40000006-4)
 Conflicts: haskell-http-doc (<< 40000006-4)
 Provides: haskell-http-doc





More information about the Pkg-haskell-commits mailing list