[Pkg-haskell-commits] darcs: ghc: Use dh_link to symlink to DEB_HOOGLE_TXT_DIR; do not compress .txt files

Joachim Breitner mail at joachim-breitner.de
Tue Oct 16 07:59:14 UTC 2012


Mon Oct  8 11:51:39 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Use dh_link to symlink to DEB_HOOGLE_TXT_DIR; do not compress .txt files
  Ignore-this: 9408d5f1355882220ac4aff8d8157ddf

    M ./rules -5 +5

Mon Oct  8 11:51:39 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Use dh_link to symlink to DEB_HOOGLE_TXT_DIR; do not compress .txt files
  Ignore-this: 9408d5f1355882220ac4aff8d8157ddf
diff -rN -u old-ghc//rules new-ghc//rules
--- old-ghc//rules	2012-10-16 07:59:14.451734272 +0000
+++ new-ghc//rules	2012-10-16 07:59:14.590718590 +0000
@@ -238,13 +238,12 @@
 	# ghc-doc
 ifeq (YES,$(BUILD_HADDOCK_DOCS))
 	mkdir -p debian/tmp/$(DEB_HOOGLE_TXT_DIR)
-	find debian/tmp/usr/share/doc/ghc-doc/html/libraries/*/ -name "*.txt" | \
-	  runghc debian/haddock-collect \
-	  debian/tmp debian/tmp/$(DEB_HOOGLE_TXT_DIR)
+	find debian/tmp/usr/share/doc/ghc-doc/html/libraries/*/ -name "*.txt" \
+		-printf "%p $(DEB_HOOGLE_TXT_DIR)/%f\n" >> debian/ghc-doc.links
 	find debian/tmp/usr/share/doc/ghc-doc $(FILES) > debian/ghc-doc.install
 	find debian/tmp/usr/lib/ghc-doc $(FILES)      >> debian/ghc-doc.install
 endif
-	sed -i s,^debian/tmp,, debian/*.install
+	sed -i s,^debian/tmp,, debian/*.install debian/*.links
 	rm -f debian/ghc.links
 	echo "/var/lib/ghc/package.conf.d /usr/lib/ghc/package.conf.d" >> debian/ghc.links
 	touch $@
@@ -265,6 +264,7 @@
 	rm -f debian/*.1
 	rm -f debian/ghc.manpages
 	rm -f debian/ghc.links
+	rm -f debian/ghc-doc.links
 	rm -f mk/build.mk
 	rm -rf debian/testghc
 	rm -f ch01.html ch02.html index.html
@@ -305,7 +305,7 @@
 	dh_installman -a
 	dh_strip
 	dh_link -a
-	dh_compress -X.haddock -a
+	dh_compress -X.haddock -X.txt -a
 	dh_fixperms -a
 	sh debian/dh_haskell_provides
 	dh_installdeb -a





More information about the Pkg-haskell-commits mailing list