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

[Marco Silva]

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

    M ./changelog -2 +6
    M ./control -18 +18
    M ./rules -1 +1

Sat Jan 15 15:06:06 UTC 2011  Marco Silva <marcot at debian.org>
  * Use ghc instead of ghc6
  Ignore-this: c86bc35dcb5794ca30572bc95c10aa5d
diff -rN -u old-haskell-parsec2/changelog new-haskell-parsec2/changelog
--- old-haskell-parsec2/changelog	2011-01-15 16:06:24.846141243 +0000
+++ new-haskell-parsec2/changelog	2011-01-15 16:06:24.854141665 +0000
@@ -1,9 +1,13 @@
 haskell-parsec2 (2.1.0.1-3) UNRELEASED; urgency=low
 
+  [ Marco Túlio Gontijo e Silva ]
   * Use debian/compat 7.
   * debian/source/format: Use 3.0 (quilt).
   * debian/watch: Use regexp to match only for versions "2.*".
 
+  [ Marco Silva ]
+  * Use ghc instead of ghc
+
  -- Marco Túlio Gontijo e Silva <marcot at debian.org>  Thu, 18 Feb 2010 22:41:00 -0200
 
 haskell-parsec2 (2.1.0.1-2) unstable; urgency=low
@@ -47,7 +51,7 @@
   * Initial release.
   * Packaged the old version since 3.x is still regarded immature.
   * Set to provide, and replace and conflict with earlier versions of
-    libghc6-parsec-*.
-  * Moved .haddock file to avoid conflict with libghc6-parsec3-doc.
+    libghc-parsec-*.
+  * Moved .haddock file to avoid conflict with libghc-parsec3-doc.
 
  -- Kari Pahula <kaol at debian.org>  Sun, 31 May 2009 00:44:27 +0300
diff -rN -u old-haskell-parsec2/control new-haskell-parsec2/control
--- old-haskell-parsec2/control	2011-01-15 16:06:24.846141243 +0000
+++ new-haskell-parsec2/control	2011-01-15 16:06:24.854141665 +0000
@@ -6,21 +6,21 @@
 Standards-Version: 3.8.4
 Build-Depends: debhelper (>= 7),
  haskell-devscripts (>= 0.7),
- ghc6,
- ghc6-prof,
- ghc6-doc,
+ ghc,
+ ghc-prof,
+ ghc-doc,
  cdbs
 Homepage: http://legacy.cs.uu.nl/daan/parsec.html
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-parsec2
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-parsec2
 
-Package: libghc6-parsec2-dev
+Package: libghc-parsec2-dev
 Architecture: any
 Depends: ${haskell:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Suggests: libghc6-parsec2-prof, libghc6-parsec2-doc
-Provides: libghc6-parsec-dev, ${haskell:Provides}
-Conflicts: libghc6-parsec-dev (<< 3.0.0-5)
-Replaces: libghc6-parsec-dev (<< 3.0.0-5)
+Suggests: libghc-parsec2-prof, libghc-parsec2-doc
+Provides: libghc-parsec-dev, ${haskell:Provides}
+Conflicts: libghc-parsec-dev (<< 3.0.0-5)
+Replaces: libghc-parsec-dev (<< 3.0.0-5)
 Description: Haskell monadic parser combinator library for GHC
  This package provides a library for the Haskell programming language.
  .
@@ -28,12 +28,12 @@
  library.  It is simple, safe, well documented, has extensive libraries
  and good error messages, and is also fast.
 
-Package: libghc6-parsec2-prof
+Package: libghc-parsec2-prof
 Architecture: any
 Depends: ${haskell:Depends}, ${misc:Depends}
-Provides: libghc6-parsec-prof, ${haskell:Provides}
-Conflicts: libghc6-parsec-prof (<< 3.0.0-5)
-Replaces: libghc6-parsec-prof (<< 3.0.0-5)
+Provides: libghc-parsec-prof, ${haskell:Provides}
+Conflicts: libghc-parsec-prof (<< 3.0.0-5)
+Replaces: libghc-parsec-prof (<< 3.0.0-5)
 Description: Haskell monadic parser combinator library for GHC; profiling libraries
  This package provides a library for the Haskell programming language,
  compiled for profiling.
@@ -42,15 +42,15 @@
  library.  It is simple, safe, well documented, has extensive libraries
  and good error messages, and is also fast.
 
-Package: libghc6-parsec2-doc
+Package: libghc-parsec2-doc
 Section: doc
 Architecture: all
 Depends: ${haskell:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Recommends: ghc6-doc, libghc6-mtl-doc
-Suggests: libghc6-parsec2-dev
-Provides: libghc6-parsec-doc
-Conflicts: libghc6-parsec-doc (<< 3.0.0-5)
-Replaces: libghc6-parsec-doc (<< 3.0.0-5)
+Recommends: ghc-doc, libghc-mtl-doc
+Suggests: libghc-parsec2-dev
+Provides: libghc-parsec-doc
+Conflicts: libghc-parsec-doc (<< 3.0.0-5)
+Replaces: libghc-parsec-doc (<< 3.0.0-5)
 Description: Haskell monadic parser combinator library for GHC; documentation
  This package provides the documentation for a library for the Haskell
  programming language.
diff -rN -u old-haskell-parsec2/rules new-haskell-parsec2/rules
--- old-haskell-parsec2/rules	2011-01-15 16:06:24.846141243 +0000
+++ new-haskell-parsec2/rules	2011-01-15 16:06:24.854141665 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 DEB_CABAL_PACKAGE=parsec2
-DEB_HADDOCK_DIR=/usr/share/ghc6-doc/ghc-$(shell ghc --numeric-version)/haddock/parsec2/
+DEB_HADDOCK_DIR=/usr/share/ghc-doc/ghc-$(shell ghc --numeric-version)/haddock/parsec2/
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk