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

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


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

    M ./TODO -1 +1
    M ./changelog +6
    M ./control -53 +53
    M ./rules -8 +8

Sat Jan 15 15:05:47 UTC 2011  Marco Silva <marcot at debian.org>
  * Use ghc instead of ghc6
  Ignore-this: f47e1de8021971a5a040fde837f31aaf
diff -rN -u old-gitit/changelog new-gitit/changelog
--- old-gitit/changelog	2011-01-15 15:16:40.260816965 +0000
+++ new-gitit/changelog	2011-01-15 15:16:40.268817387 +0000
@@ -1,3 +1,9 @@
+gitit (0.7.3.6-2) UNRELEASED; urgency=low
+
+  * Use ghc instead of ghc
+
+ -- Marco Silva <marcot at debian.org>  Sat, 15 Jan 2011 12:40:46 -0200
+
 gitit (0.7.3.6-1) unstable; urgency=low
 
   * Initial release. (closes: #556099)
diff -rN -u old-gitit/control new-gitit/control
--- old-gitit/control	2011-01-15 15:16:40.260816965 +0000
+++ new-gitit/control	2011-01-15 15:16:40.268817387 +0000
@@ -7,58 +7,58 @@
  debhelper (>= 7),
  haskell-devscripts (>= 0.7),
  cdbs,
- ghc6,
- ghc6-prof,
- libghc6-cautious-file-dev,
- libghc6-cgi-dev,
- libghc6-configfile-dev,
- libghc6-feed-dev,
- libghc6-filestore-dev,
- libghc6-happstack-server-dev,
- libghc6-happstack-util-dev,
- libghc6-highlighting-kate-dev,
- libghc6-hslogger-dev,
- libghc6-hstringtemplate-dev,
- libghc6-http-dev,
- libghc6-mtl-dev,
- libghc6-network-dev,
- libghc6-pandoc-dev,
- libghc6-parsec3-dev,
- libghc6-recaptcha-dev,
- libghc6-safe-dev,
- libghc6-sha-dev,
- libghc6-texmath-dev,
- libghc6-text-dev,
- libghc6-unix-compat-dev,
- libghc6-url-dev,
- libghc6-xhtml-dev,
- libghc6-xml-dev
+ ghc,
+ ghc-prof,
+ libghc-cautious-file-dev,
+ libghc-cgi-dev,
+ libghc-configfile-dev,
+ libghc-feed-dev,
+ libghc-filestore-dev,
+ libghc-happstack-server-dev,
+ libghc-happstack-util-dev,
+ libghc-highlighting-kate-dev,
+ libghc-hslogger-dev,
+ libghc-hstringtemplate-dev,
+ libghc-http-dev,
+ libghc-mtl-dev,
+ libghc-network-dev,
+ libghc-pandoc-dev,
+ libghc-parsec3-dev,
+ libghc-recaptcha-dev,
+ libghc-safe-dev,
+ libghc-sha-dev,
+ libghc-texmath-dev,
+ libghc-text-dev,
+ libghc-unix-compat-dev,
+ libghc-url-dev,
+ libghc-xhtml-dev,
+ libghc-xml-dev
 Build-Depends-Indep:
- ghc6-doc,
- libghc6-cautious-file-doc,
- libghc6-cgi-doc,
- libghc6-configfile-doc,
- libghc6-feed-doc,
- libghc6-filestore-doc,
- libghc6-happstack-server-doc,
- libghc6-happstack-util-doc,
- libghc6-highlighting-kate-doc,
- libghc6-hslogger-doc,
- libghc6-hstringtemplate-doc,
- libghc6-http-doc,
- libghc6-mtl-doc,
- libghc6-network-doc,
- libghc6-pandoc-doc,
- libghc6-parsec3-doc,
- libghc6-recaptcha-doc,
- libghc6-safe-doc,
- libghc6-sha-doc,
- libghc6-texmath-doc,
- libghc6-text-doc,
- libghc6-unix-compat-doc,
- libghc6-url-doc,
- libghc6-xhtml-doc,
- libghc6-xml-doc
+ ghc-doc,
+ libghc-cautious-file-doc,
+ libghc-cgi-doc,
+ libghc-configfile-doc,
+ libghc-feed-doc,
+ libghc-filestore-doc,
+ libghc-happstack-server-doc,
+ libghc-happstack-util-doc,
+ libghc-highlighting-kate-doc,
+ libghc-hslogger-doc,
+ libghc-hstringtemplate-doc,
+ libghc-http-doc,
+ libghc-mtl-doc,
+ libghc-network-doc,
+ libghc-pandoc-doc,
+ libghc-parsec3-doc,
+ libghc-recaptcha-doc,
+ libghc-safe-doc,
+ libghc-sha-doc,
+ libghc-texmath-doc,
+ libghc-text-doc,
+ libghc-unix-compat-doc,
+ libghc-url-doc,
+ libghc-xhtml-doc,
+ libghc-xml-doc
 Standards-Version: 3.9.1
 Homepage: http://hackage.haskell.org/package/gitit
 Vcs-Darcs: http://darcs.debian.org/darcs/pkg-haskell/gitit
@@ -94,7 +94,7 @@
      any happstack application;
    * pages can be written directly in literate Haskell.
 
-Package: libghc6-gitit-dev
+Package: libghc-gitit-dev
 Architecture: any
 Depends:
  ${haskell:Depends},
@@ -128,7 +128,7 @@
  .
  This package contains the libraries compiled for GHC 6.
 
-Package: libghc6-gitit-doc
+Package: libghc-gitit-doc
 Section: doc
 Architecture: all
 Depends:
diff -rN -u old-gitit/rules new-gitit/rules
--- old-gitit/rules	2011-01-15 15:16:40.260816965 +0000
+++ new-gitit/rules	2011-01-15 15:16:40.264817176 +0000
@@ -3,12 +3,12 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
 
-PANDOC_DEP := $(shell dpkg -p libghc6-pandoc-dev | grep ^Version: | cut -d' ' -f2)
-FILESTORE_DEP := $(shell dpkg -p libghc6-filestore-dev | grep ^Version: | cut -d' ' -f2)
+PANDOC_DEP := $(shell dpkg -p libghc-pandoc-dev | grep ^Version: | cut -d' ' -f2)
+FILESTORE_DEP := $(shell dpkg -p libghc-filestore-dev | grep ^Version: | cut -d' ' -f2)
 
-install/gitit:: debian/tmp-inst-ghc6
-	cp -av debian/tmp-inst-ghc6/usr/bin/* debian/gitit/usr/bin
-	cp -av debian/tmp-inst-ghc6/usr/share/gitit-$(CABAL_VERSION) debian/gitit/usr/share
+install/gitit:: debian/tmp-inst-ghc
+	cp -av debian/tmp-inst-ghc/usr/bin/* debian/gitit/usr/bin
+	cp -av debian/tmp-inst-ghc/usr/share/gitit-$(CABAL_VERSION) debian/gitit/usr/share
 
 	# Don't use embedded copies of jQuery and jQuery UI; instead, make symlinks
 	rm -f debian/gitit/usr/share/gitit-$(CABAL_VERSION)/data/static/js/jquery.min.js
@@ -17,7 +17,7 @@
 	dh_link -pgitit /usr/share/javascript/jquery-ui/jquery-ui.min.js usr/share/gitit-$(CABAL_VERSION)/data/static/js/jquery-ui.packed.js
 
 	# Generate dependencies against data packages
-	echo "gitit:Depends=pandoc (= ${PANDOC_DEP}), libghc6-filestore-data (= ${FILESTORE_DEP})" >> debian/gitit.substvars
+	echo "gitit:Depends=pandoc (= ${PANDOC_DEP}), libghc-filestore-data (= ${FILESTORE_DEP})" >> debian/gitit.substvars
 
 	# Removes a few files, that are not necessary and make lintian cry
 	rm -f debian/gitit/usr/share/gitit-0.7.3.6/data/post-update
@@ -25,7 +25,7 @@
 	rm -f debian/gitit/usr/share/gitit-0.7.3.6/YUI-LICENSE
 
 # Not used at the moment
-#install/libghc6-gitit-dev:: debian/tmp-inst-ghc6
+#install/libghc-gitit-dev:: debian/tmp-inst-ghc
 #	# Generate dependencies against data packages
-#	echo "gitit:Depends=pandoc (= ${PANDOC_DEP}), libghc6-filestore-data (= ${FILESTORE_DEP})" >> debian/gitit.substvars
+#	echo "gitit:Depends=pandoc (= ${PANDOC_DEP}), libghc-filestore-data (= ${FILESTORE_DEP})" >> debian/gitit.substvars
 
diff -rN -u old-gitit/TODO new-gitit/TODO
--- old-gitit/TODO	2011-01-15 15:16:40.260816965 +0000
+++ new-gitit/TODO	2011-01-15 15:16:40.264817176 +0000
@@ -1,2 +1,2 @@
  * enable -prof support as soon as also pandoc has it
- * split out a -data package, shared among gitit and libghc6-gitit-dev
+ * split out a -data package, shared among gitit and libghc-gitit-dev





More information about the Pkg-haskell-commits mailing list