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

[Marco Silva]

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

    M ./changelog -2 +8
    M ./control -14 +14
    M ./rules -5 +5

Sat Jan 15 15:06:21 UTC 2011  Marco Silva <marcot at debian.org>
  * Use ghc instead of ghc6
  Ignore-this: 600b1b73b68560a46401806b05b0b739
diff -rN -u old-highlighting-kate/changelog new-highlighting-kate/changelog
--- old-highlighting-kate/changelog	2011-01-15 16:22:35.529297703 +0000
+++ new-highlighting-kate/changelog	2011-01-15 16:22:35.533297914 +0000
@@ -1,3 +1,9 @@
+highlighting-kate (0.2.7.1-2) UNRELEASED; urgency=low
+
+  * Use ghc instead of ghc
+
+ -- Marco Silva <marcot at debian.org>  Sat, 15 Jan 2011 12:41:39 -0200
+
 highlighting-kate (0.2.7.1-1) unstable; urgency=low
 
   * Priority: extra
@@ -82,14 +88,14 @@
 
 highlighting-kate (0.2.1-3) unstable; urgency=low
 
-  * Brown paper bag release.  Add libghc6-parsec-prof to Build-Depends.
+  * Brown paper bag release.  Add libghc-parsec-prof to Build-Depends.
     Closes: #467589
 
  -- Recai Oktaş <roktas at debian.org>  Fri, 29 Feb 2008 00:09:00 +0200
 
 highlighting-kate (0.2.1-2) unstable; urgency=low
 
-  * Add libghc6-parsec-dev to Build-Depends.  Closes: #467589
+  * Add libghc-parsec-dev to Build-Depends.  Closes: #467589
 
  -- Recai Oktaş <roktas at debian.org>  Wed, 27 Feb 2008 21:37:43 +0200
 
diff -rN -u old-highlighting-kate/control new-highlighting-kate/control
--- old-highlighting-kate/control	2011-01-15 16:22:35.525297492 +0000
+++ new-highlighting-kate/control	2011-01-15 16:22:35.533297914 +0000
@@ -6,24 +6,24 @@
 Build-Depends: cdbs
  , debhelper (>= 7)
  , haskell-devscripts (>= 0.7)
- , ghc6 
- , ghc6-prof
- , ghc6-doc
- , libghc6-parsec2-dev 
- , libghc6-parsec2-prof
- , libghc6-parsec2-doc
- , libghc6-xhtml-dev 
- , libghc6-xhtml-prof
- , libghc6-xhtml-doc
- , libghc6-pcre-light-dev 
- , libghc6-pcre-light-prof
+ , ghc 
+ , ghc-prof
+ , ghc-doc
+ , libghc-parsec2-dev 
+ , libghc-parsec2-prof
+ , libghc-parsec2-doc
+ , libghc-xhtml-dev 
+ , libghc-xhtml-prof
+ , libghc-xhtml-doc
+ , libghc-pcre-light-dev 
+ , libghc-pcre-light-prof
  , haskell-pcre-light-doc
 Standards-Version: 3.9.1
 Homepage: http://johnmacfarlane.net/highlighting-kate
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/highlighting-kate
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/highlighting-kate
 
-Package: libghc6-highlighting-kate-dev
+Package: libghc-highlighting-kate-dev
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${haskell:Depends}
 Recommends: ${haskell:Recommends}
@@ -46,7 +46,7 @@
  This package provides a library for the Haskell programming language.  See
  http://www.haskell.org/ for more information on Haskell.
 
-Package: libghc6-highlighting-kate-prof
+Package: libghc-highlighting-kate-prof
 Architecture: any
 Depends: ${haskell:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Recommends: ${haskell:Recommends}
@@ -69,7 +69,7 @@
  This package provides a library for the Haskell programming language, compiled
  for profiling.  See http://www.haskell.org/ for more information on Haskell.
 
-Package: libghc6-highlighting-kate-doc
+Package: libghc-highlighting-kate-doc
 Section: doc
 Depends: ${misc:Depends}, ${haskell:Depends}
 Recommends: ${haskell:Recommends}
diff -rN -u old-highlighting-kate/rules new-highlighting-kate/rules
--- old-highlighting-kate/rules	2011-01-15 16:22:35.525297492 +0000
+++ new-highlighting-kate/rules	2011-01-15 16:22:35.529297703 +0000
@@ -7,19 +7,19 @@
 # This rule is copied from /usr/share/cdbs/1/class/hlibrary.mk to cater for the
 # non-standard documentation package name
 
-build/$(CABAL_PACKAGE)-doc:: dist-ghc6 build-haddock-stamp
+build/$(CABAL_PACKAGE)-doc:: dist-ghc build-haddock-stamp
 
 
-install/$(CABAL_PACKAGE)-doc:: debian/tmp-inst-ghc6
-	mv dist-ghc6 dist
+install/$(CABAL_PACKAGE)-doc:: debian/tmp-inst-ghc
+	mv dist-ghc dist
 	mkdir -p debian/$(notdir $@)/$(DEB_HADDOCK_HTML_DIR)
-	cd debian/tmp-inst-ghc6/ ; find ./$(DEB_HADDOCK_HTML_DIR)/ \
+	cd debian/tmp-inst-ghc/ ; find ./$(DEB_HADDOCK_HTML_DIR)/ \
 		! -name "*.haddock" -exec install -Dm 644 '{}' \
 		../$(notdir $@)/'{}' ';'
 	mkdir -p debian/$(notdir $@)/$(DEB_HADDOCK_DIR)/../desc/
 	grep -E '^(haddock-|name|version)' dist/installed-pkg-config > \
 		debian/$(notdir $@)/$(DEB_HADDOCK_DIR)/../desc/$(notdir $@)
 	dh_haskell_depends -p$(notdir $@)
-	mv dist dist-ghc6
+	mv dist dist-ghc