haskell-filestore: Use ghc instead of ghc6

5 files changed, 40 insertions, 33 deletions

diff --git a/p/haskell-filestore/debian/changelog b/p/haskell-filestore/debian/changelog
index 08f8c8299..beaab08c2 100644
--- a/p/haskell-filestore/debian/changelog
+++ b/p/haskell-filestore/debian/changelog
@@ -1,3 +1,9 @@
+haskell-filestore (0.3.4.2-2) UNRELEASED; urgency=low
+
+  * Use ghc instead of ghc
+
+ -- Marco Silva <marcot@debian.org>  Sat, 15 Jan 2011 12:40:58 -0200
+
 haskell-filestore (0.3.4.2-1) unstable; urgency=low
 
   * New upstream release
@@ -12,7 +18,7 @@ haskell-filestore (0.3.4.1-4) unstable; urgency=low
     + Removing examples, because they get installed to the data package.
   * Removing doc-base support, as for other Haskell packages.
   * Standards-Versions bumped to 3.9.1 (no changes required).
-  * Lintian override added for libghc6-filestore-data mistakenly detected
+  * Lintian override added for libghc-filestore-data mistakenly detected
     as a shared library package.
 
  -- Giovanni Mascellani <gio@debian.org>  Tue, 03 Aug 2010 10:50:41 +0200
@@ -24,7 +30,7 @@ haskell-filestore (0.3.4.1-3) unstable; urgency=low
 
   [ Joachim Breitner ]
   * Bump xml dependency
-  * Depend on libghc6-regex-posix-doc
+  * Depend on libghc-regex-posix-doc
 
  -- Joachim Breitner <nomeata@debian.org>  Thu, 24 Jun 2010 10:27:27 +0200
 
@@ -36,8 +42,8 @@ haskell-filestore (0.3.4.1-2) unstable; urgency=low
   * debian/control: Remove haddock from Build-Depends:, since it's now a
     Depends: of haskell-devscripts.
   * debian/control: Bump Standards-Version: to 3.8.4, no changes needed.
-  * debian/control: Remove uneeded Build-Depends: in libghc6-utf8-
-    string-* and libghc6-time-*.
+  * debian/control: Remove uneeded Build-Depends: in libghc-utf8-
+    string-* and libghc-time-*.
 
   [ Joachim Breitner ]
   * Bump haskell-devscripts dependency to 0.7
diff --git a/p/haskell-filestore/debian/control b/p/haskell-filestore/debian/control
index 90d9dbe2b..de97624f3 100644
--- a/p/haskell-filestore/debian/control
+++ b/p/haskell-filestore/debian/control
@@ -7,39 +7,39 @@ Build-Depends:
  debhelper (>= 7),
  haskell-devscripts (>= 0.7),
  cdbs,
- ghc6,
- ghc6-prof,
- ghc6-doc,
- libghc6-datetime-dev,
- libghc6-datetime-prof,
- libghc6-datetime-doc,
- libghc6-parsec2-dev,
- libghc6-parsec2-prof,
- libghc6-parsec2-doc,
- libghc6-regex-posix-dev,
- libghc6-regex-posix-prof,
- libghc6-regex-posix-doc,
- libghc6-xml-dev (>= 1.3.7),
- libghc6-xml-prof,
- libghc6-xml-doc,
- libghc6-split-dev,
- libghc6-split-prof,
- libghc6-split-doc,
- libghc6-diff-dev,
- libghc6-diff-prof,
- libghc6-diff-doc
+ ghc,
+ ghc-prof,
+ ghc-doc,
+ libghc-datetime-dev,
+ libghc-datetime-prof,
+ libghc-datetime-doc,
+ libghc-parsec2-dev,
+ libghc-parsec2-prof,
+ libghc-parsec2-doc,
+ libghc-regex-posix-dev,
+ libghc-regex-posix-prof,
+ libghc-regex-posix-doc,
+ libghc-xml-dev (>= 1.3.7),
+ libghc-xml-prof,
+ libghc-xml-doc,
+ libghc-split-dev,
+ libghc-split-prof,
+ libghc-split-doc,
+ libghc-diff-dev,
+ libghc-diff-prof,
+ libghc-diff-doc
 Standards-Version: 3.9.1
 Homepage: http://hackage.haskell.org/package/filestore
 Vcs-Darcs: http://darcs.debian.org/darcs/pkg-haskell/haskell-filestore
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-filestore
 
-Package: libghc6-filestore-dev
+Package: libghc-filestore-dev
 Architecture: any
 Depends:
  ${haskell:Depends},
  ${misc:Depends},
  ${shlibs:Depends},
- libghc6-filestore-data (= ${source:Version})
+ libghc-filestore-data (= ${source:Version})
 Suggests: ${haskell:Suggests}
 Recommends:
  ${haskell:Recommends},
@@ -52,7 +52,7 @@ Description: Haskell interface for versioning file stores - GHC 6 libraries
  .
  This package contains the libraries compiled for GHC 6.
 
-Package: libghc6-filestore-prof
+Package: libghc-filestore-prof
 Architecture: any
 Depends:
  ${haskell:Depends},
@@ -67,7 +67,7 @@ Description: Haskell interface for versioning file stores - GHC 6 profiling libr
  .
  This package contains the profiling libraries compiled for GHC 6.
 
-Package: libghc6-filestore-doc
+Package: libghc-filestore-doc
 Section: doc
 Architecture: all
 Depends:
@@ -82,7 +82,7 @@ Description: Haskell interface for versioning file stores - documentation
  .
  This package contains the library documentation.
 
-Package: libghc6-filestore-data
+Package: libghc-filestore-data
 Architecture: all
 Depends:
  ${haskell:Depends},
diff --git a/p/haskell-filestore/debian/libghc6-filestore-data.dirs b/p/haskell-filestore/debian/libghc-filestore-data.dirs
index dd222dbfa..dd222dbfa 100644
--- a/p/haskell-filestore/debian/libghc6-filestore-data.dirs
+++ b/p/haskell-filestore/debian/libghc-filestore-data.dirs
diff --git a/p/haskell-filestore/debian/libghc6-filestore-data.lintian-overrides b/p/haskell-filestore/debian/libghc-filestore-data.lintian-overrides
index 43d6205c6..fdbefcb90 100644
--- a/p/haskell-filestore/debian/libghc6-filestore-data.lintian-overrides
+++ b/p/haskell-filestore/debian/libghc-filestore-data.lintian-overrides
@@ -1,3 +1,3 @@
 # This is not a problem, as the script is not meant to be executed (but
 # rather to be copied in the correct place by the library)
-libghc6-filestore-data: script-not-executable ./usr/share/filestore-0.3.4.1/extra/post-update
+libghc-filestore-data: script-not-executable ./usr/share/filestore-0.3.4.1/extra/post-update
diff --git a/p/haskell-filestore/debian/rules b/p/haskell-filestore/debian/rules
index eb4c85c08..2e38d832d 100755
--- a/p/haskell-filestore/debian/rules
+++ b/p/haskell-filestore/debian/rules
@@ -3,5 +3,6 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
 
-install/libghc6-filestore-data:: debian/tmp-inst-ghc6
-	mv debian/tmp-inst-ghc6/usr/share/filestore-$(CABAL_VERSION) debian/libghc6-filestore-data/usr/share
+install/libghc-filestore-data:: debian/tmp-inst-ghc
+	mv debian/tmp-inst-ghc/usr/share/filestore-$(CABAL_VERSION) debian/libghc-filestore-data/usr/share
+