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

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


Sat Jan 15 15:05:52 UTC 2011  Marco Silva <marcot at debian.org>
  * Use ghc instead of ghc6
  Ignore-this: b8e3c11a84064a2cf23f6a238245766d

     ./libghc6-debian-doc.doc-base -> ./libghc-debian-doc.doc-base
    M ./changelog -1 +7
    M ./control -32 +32
    M ./haskell-debian-utils.install -4 +4
    M ./libghc-debian-doc.doc-base -4 +4

Sat Jan 15 15:05:52 UTC 2011  Marco Silva <marcot at debian.org>
  * Use ghc instead of ghc6
  Ignore-this: b8e3c11a84064a2cf23f6a238245766d
diff -rN -u old-haskell-debian/changelog new-haskell-debian/changelog
--- old-haskell-debian/changelog	2011-01-15 15:24:12.540658920 +0000
+++ new-haskell-debian/changelog	2011-01-15 15:24:12.548659341 +0000
@@ -1,3 +1,9 @@
+haskell-debian (3.47-4) UNRELEASED; urgency=low
+
+  * Use ghc instead of ghc
+
+ -- Marco Silva <marcot at debian.org>  Sat, 15 Jan 2011 12:40:54 -0200
+
 haskell-debian (3.47-3) unstable; urgency=low
 
   * Re-add dont-build-tests.patch, lost in the previous upload 
@@ -10,7 +16,7 @@
   * debian/control: Fix lintian warnings.
   * Add man pages for apt-get-build-depends, cabal-debian, debian-report and
     fakechanges.
-  * Add libghc6-debian-doc.doc-base.
+  * Add libghc-debian-doc.doc-base.
   * Move installation of binaries and man pages from rules file to new file
     haskell-debian-utils.install.
 
diff -rN -u old-haskell-debian/control new-haskell-debian/control
--- old-haskell-debian/control	2011-01-15 15:24:12.540658920 +0000
+++ new-haskell-debian/control	2011-01-15 15:24:12.548659341 +0000
@@ -6,42 +6,42 @@
 Build-Depends: debhelper (>= 7)
   , cdbs
   , haskell-devscripts (>= 0.7)
-  , ghc6
-  , ghc6-prof
-  , libghc6-mtl-dev
-  , libghc6-mtl-prof
-  , libghc6-parsec2-dev
-  , libghc6-parsec2-prof
-  , libghc6-regex-compat-dev
-  , libghc6-regex-compat-prof
-  , libghc6-regex-tdfa-dev (>= 1.1.3)
-  , libghc6-regex-tdfa-prof
-  , libghc6-bzlib-dev (>= 0.5.0.0-4)
-  , libghc6-bzlib-prof
-  , libghc6-haxml-dev (<< 1:1.14)
-  , libghc6-haxml-prof
-  , libghc6-unixutils-dev
-  , libghc6-unixutils-prof
-  , libghc6-zlib-dev
-  , libghc6-zlib-prof
-  , libghc6-network-dev
-  , libghc6-network-prof
-Build-Depends-Indep: ghc6-doc
-  , libghc6-mtl-doc
-  , libghc6-parsec2-doc
-  , libghc6-regex-compat-doc
-  , libghc6-regex-tdfa-doc
-  , libghc6-bzlib-doc
+  , ghc
+  , ghc-prof
+  , libghc-mtl-dev
+  , libghc-mtl-prof
+  , libghc-parsec2-dev
+  , libghc-parsec2-prof
+  , libghc-regex-compat-dev
+  , libghc-regex-compat-prof
+  , libghc-regex-tdfa-dev (>= 1.1.3)
+  , libghc-regex-tdfa-prof
+  , libghc-bzlib-dev (>= 0.5.0.0-4)
+  , libghc-bzlib-prof
+  , libghc-haxml-dev (<< 1:1.14)
+  , libghc-haxml-prof
+  , libghc-unixutils-dev
+  , libghc-unixutils-prof
+  , libghc-zlib-dev
+  , libghc-zlib-prof
+  , libghc-network-dev
+  , libghc-network-prof
+Build-Depends-Indep: ghc-doc
+  , libghc-mtl-doc
+  , libghc-parsec2-doc
+  , libghc-regex-compat-doc
+  , libghc-regex-tdfa-doc
+  , libghc-bzlib-doc
   , haxml-doc
-  , libghc6-unixutils-doc
-  , libghc6-zlib-doc
-  , libghc6-network-doc
+  , libghc-unixutils-doc
+  , libghc-zlib-doc
+  , libghc-network-doc
 Standards-Version: 3.8.4
 Homepage: http://hackage.haskell.org/package/debian
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-debian
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-debian
 
-Package: libghc6-debian-dev
+Package: libghc-debian-dev
 Architecture: any
 Depends: ${haskell:Depends}
   , ${shlibs:Depends}
@@ -61,7 +61,7 @@
  .
  This package contains the libraries compiled for GHC 6.
 
-Package: libghc6-debian-prof
+Package: libghc-debian-prof
 Architecture: any
 Depends: ${haskell:Depends}
   , ${shlibs:Depends}
@@ -82,7 +82,7 @@
  .
  This package contains the profiling libraries compiled for GHC 6.
 
-Package: libghc6-debian-doc
+Package: libghc-debian-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}, ${haskell:Depends}
diff -rN -u old-haskell-debian/haskell-debian-utils.install new-haskell-debian/haskell-debian-utils.install
--- old-haskell-debian/haskell-debian-utils.install	2011-01-15 15:24:12.540658920 +0000
+++ new-haskell-debian/haskell-debian-utils.install	2011-01-15 15:24:12.544659130 +0000
@@ -1,4 +1,4 @@
-dist-ghc6/build/apt-get-build-depends/apt-get-build-depends		usr/bin/
-dist-ghc6/build/cabal-debian/cabal-debian						usr/bin/
-dist-ghc6/build/debian-report/debian-report						usr/bin/
-dist-ghc6/build/fakechanges/fakechanges							usr/bin/
+dist-ghc/build/apt-get-build-depends/apt-get-build-depends		usr/bin/
+dist-ghc/build/cabal-debian/cabal-debian						usr/bin/
+dist-ghc/build/debian-report/debian-report						usr/bin/
+dist-ghc/build/fakechanges/fakechanges							usr/bin/
diff -rN -u old-haskell-debian/libghc6-debian-doc.doc-base new-haskell-debian/libghc6-debian-doc.doc-base
--- old-haskell-debian/libghc6-debian-doc.doc-base	2011-01-15 15:24:12.540658920 +0000
+++ new-haskell-debian/libghc6-debian-doc.doc-base	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-Document: libghc6-debian-doc
-Title: Manual for the Haskell Debian library
-Abstract:  This library includes modules covering almost every aspect of the
- Debian packaging system, including low level data types such as version
- numbers and dependency relations, on up to the types necessary for computing
- and installing build dependencies, building source and binary packages,
- and inserting them into a repository.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libghc6-debian-doc/html/doc-index.html
-Files: /usr/share/doc/libghc6-debian-doc/html/*.html
- /usr/share/doc/libghc6-debian-doc/html/src/*.html
diff -rN -u old-haskell-debian/libghc-debian-doc.doc-base new-haskell-debian/libghc-debian-doc.doc-base
--- old-haskell-debian/libghc-debian-doc.doc-base	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-debian/libghc-debian-doc.doc-base	2011-01-15 15:24:12.544659130 +0000
@@ -0,0 +1,13 @@
+Document: libghc-debian-doc
+Title: Manual for the Haskell Debian library
+Abstract:  This library includes modules covering almost every aspect of the
+ Debian packaging system, including low level data types such as version
+ numbers and dependency relations, on up to the types necessary for computing
+ and installing build dependencies, building source and binary packages,
+ and inserting them into a repository.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libghc-debian-doc/html/doc-index.html
+Files: /usr/share/doc/libghc-debian-doc/html/*.html
+ /usr/share/doc/libghc-debian-doc/html/src/*.html





More information about the Pkg-haskell-commits mailing list