[Pkg-haskell-commits] darcs: haskell98-report: Use dh.

[Marco Túlio Gontijo e Silva]

Mon Mar  8 18:44:18 UTC 2010  Marco T[_\c3_][_\ba_]lio Gontijo e Silva <marcot at debian.org>
  * Use dh.
  Ignore-this: 6d9db6d4cd4a9e5bfd86d4a23b0f6f93

    M ./changelog +1
    M ./control -1 +1
    A ./docs
    M ./patches/correct-build.patch -2
    M ./rules -41 +5

Mon Mar  8 18:44:18 UTC 2010  Marco Túlio Gontijo e Silva <marcot at debian.org>
  * Use dh.
  Ignore-this: 6d9db6d4cd4a9e5bfd86d4a23b0f6f93
diff -rN -u old-haskell98-report/changelog new-haskell98-report/changelog
--- old-haskell98-report/changelog	2010-03-08 22:28:27.073475590 +0000
+++ new-haskell98-report/changelog	2010-03-08 22:28:27.081476006 +0000
@@ -16,6 +16,7 @@
   * Use Section: Programming/Haskell in doc-base.
   * Remove maintainer scripts, since they were empty.
   * patches/correct-build.patch: Create.
+  * Use dh.
 
  -- Marco Túlio Gontijo e Silva <marcot at debian.org>  Mon, 08 Mar 2010 12:08:08 -0300
 
diff -rN -u old-haskell98-report/control new-haskell98-report/control
--- old-haskell98-report/control	2010-03-08 22:28:27.073475590 +0000
+++ new-haskell98-report/control	2010-03-08 22:28:27.081476006 +0000
@@ -4,7 +4,7 @@
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
 Uploaders: Marco Túlio Gontijo e Silva <marcot at debian.org>
 Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7.0.50~)
 Build-Depends-Indep: ghc6 (>= 6.6), flex-old,
  texlive-fonts-recommended, texlive-latex-recommended, gs-common,
  texlive-latex-extra
diff -rN -u old-haskell98-report/docs new-haskell98-report/docs
--- old-haskell98-report/docs	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell98-report/docs	2010-03-08 22:28:27.073475590 +0000
@@ -0,0 +1,5 @@
+ffi/ffi.pdf
+ffi/ffi.ps
+haskell98-revised/*
+hierarchical-modules/hier.pdf
+hierarchical-modules/hier.ps
diff -rN -u old-haskell98-report/patches/correct-build.patch new-haskell98-report/patches/correct-build.patch
--- old-haskell98-report/patches/correct-build.patch	2010-03-08 22:28:27.073475590 +0000
+++ new-haskell98-report/patches/correct-build.patch	2010-03-08 22:28:27.077475798 +0000
@@ -1,5 +1,3 @@
-Mon Mar  8 12:04:02 BRT 2010  Marco Túlio Gontijo e Silva <marcot at debian.org>
-  * Correct build.
 diff -rN -u old-haskell98-report/ffi/Makefile new-haskell98-report/ffi/Makefile
 --- old-haskell98-report/ffi/Makefile	2010-03-08 13:18:19.000000000 -0300
 +++ new-haskell98-report/ffi/Makefile	2010-03-08 13:18:19.000000000 -0300
diff -rN -u old-haskell98-report/rules new-haskell98-report/rules
--- old-haskell98-report/rules	2010-03-08 22:28:27.073475590 +0000
+++ new-haskell98-report/rules	2010-03-08 22:28:27.077475798 +0000
@@ -1,49 +1,13 @@
 #!/usr/bin/make -f
-# This file is public domain software.
-# Originally written by Joey Hess as sample debian/rules that uses debhelper.
-# Modified for haskell98-report by Ian Lynagh.
+%:
+	dh $@
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-build: build-stamp
-build-stamp:
-	dh_testdir
-	dh_installdirs
-	$(MAKE) PREFIX=`pwd`/debian/`dh_listpackages`/usr/share/doc/haskell98-report
+override_dh_auto_build:
+	$(MAKE)
 	$(MAKE) -C ffi
-	cp ffi/ffi.ps ffi/ffi.pdf debian/`dh_listpackages`/usr/share/doc/haskell98-report
 	$(MAKE) -C hierarchical-modules
-	cp hierarchical-modules/hier.ps hierarchical-modules/hier.pdf debian/`dh_listpackages`/usr/share/doc/haskell98-report
-	touch build-stamp
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
+override_dh_auto_clean:
 	$(MAKE) clean
 	$(MAKE) -C ffi clean
 	$(MAKE) -C hierarchical-modules clean
-	dh_clean
-
-binary-indep: build
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-arch:
-
-binary: binary-indep binary-arch
-
-.PHONY: build clean binary-indep binary-arch binary
-