[Pkg-ocaml-maint-commits] [SCM] coq-doc packaging branch, master, updated. debian/8.1-3-27-gabb5c8e

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 019eddf66de71c0e912ee430d06589ccf98a779b
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jan 6 18:06:59 2010 +0100

    Switch to debhelper 7

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..5dc73b2
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,9 @@
+coqdoc.sty
+doc/RecTutorial/RecTutorial.html
+doc/refman/Reference-Manual.comidx
+doc/refman/Reference-Manual.erridx
+doc/refman/Reference-Manual.lof
+doc/refman/Reference-Manual.sh
+doc/refman/Reference-Manual.tacidx
+doc/stdlib/Library.out
+ide/index_urls.txt
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index a1c7229..72fc710 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
  Samuel Mimram <smimram at debian.org>,
  Stéphane Glondu <glondu at debian.org>
 Standards-Version: 3.8.3
-Build-Depends: debhelper (>= 4.0.0)
+Build-Depends: debhelper (>= 7.0.50~)
 Build-Depends-Indep:
  texlive,
  texlive-base,
diff --git a/debian/coq-doc-html.dirs b/debian/coq-doc-html.dirs
deleted file mode 100644
index 92b3750..0000000
--- a/debian/coq-doc-html.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/doc/coq
-usr/share/doc/coq-doc-html/refman
diff --git a/debian/coq-doc-html.install b/debian/coq-doc-html.install
new file mode 100644
index 0000000..72c447e
--- /dev/null
+++ b/debian/coq-doc-html.install
@@ -0,0 +1,4 @@
+doc/refman/html/*                    usr/share/doc/coq-doc-html/refman
+doc/tutorial/Tutorial.v.html         usr/share/doc/coq-doc-html
+doc/faq/FAQ.v.html                   usr/share/doc/coq-doc-html
+doc/RecTutorial/RecTutorial.html     usr/share/doc/coq-doc-html
diff --git a/debian/coq-doc-pdf.dirs b/debian/coq-doc-pdf.dirs
deleted file mode 100644
index 3289de0..0000000
--- a/debian/coq-doc-pdf.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/doc/coq
-usr/share/doc/coq-doc-pdf
diff --git a/debian/coq-doc-pdf.docs b/debian/coq-doc-pdf.docs
index eca890f..d9a4e8e 100644
--- a/debian/coq-doc-pdf.docs
+++ b/debian/coq-doc-pdf.docs
@@ -1,4 +1,4 @@
-tutorial/Tutorial.v.pdf
-refman/Reference-Manual.pdf
-faq/FAQ.v.pdf
-RecTutorial/RecTutorial.v.pdf
+doc/tutorial/Tutorial.v.pdf
+doc/refman/Reference-Manual.pdf
+doc/faq/FAQ.v.pdf
+doc/RecTutorial/RecTutorial.pdf
diff --git a/debian/coq-doc-ps.dirs b/debian/coq-doc-ps.dirs
deleted file mode 100644
index 89d0b7d..0000000
--- a/debian/coq-doc-ps.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/doc/coq
-usr/share/doc/coq-doc-ps
diff --git a/debian/coq-doc-ps.docs b/debian/coq-doc-ps.docs
deleted file mode 100644
index 8633c8f..0000000
--- a/debian/coq-doc-ps.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-Reference-Manual.ps.gz
-Syntax-v8.ps.gz
-Translator.ps.gz
diff --git a/debian/coq-doc.links b/debian/coq-doc.links
new file mode 100644
index 0000000..5b0b0ff
--- /dev/null
+++ b/debian/coq-doc.links
@@ -0,0 +1,4 @@
+/usr/share/doc/coq-doc-html    /usr/share/doc/coq-doc/html
+/usr/share/doc/coq-doc-html    /usr/share/doc/coq/html
+/usr/share/doc/coq-doc-pdf     /usr/share/doc/coq-doc/pdf
+/usr/share/doc/coq-doc-pdf     /usr/share/doc/coq/pdf
diff --git a/debian/rules b/debian/rules
index fdc0786..fb330ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,63 +1,21 @@
 #!/usr/bin/make -f
-# GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# We want to use dpatch
-include /usr/share/dpatch/dpatch.make
+%:
+	dh $@
 
-HTMLDEST := $(CURDIR)/debian/coq-doc-html/usr/share/doc/coq-doc-html/
+.PHONY: override_dh_auto_configure
+override_dh_auto_configure:
+	./configure -local
 
-build: patch
-	$(MAKE) tutorial/Tutorial.v.html refman/html/index.html faq/html/index.html RecTutorial/RecTutorial.v.html
-	$(MAKE) tutorial/Tutorial.v.pdf refman/Reference-Manual.pdf faq/FAQ.v.pdf RecTutorial/RecTutorial.v.pdf
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
+	$(MAKE) refman faq tutorial rectutorial
 
-real-clean: patch
-	$(MAKE) clean
+.PHONY: override_dh_auto_test
+override_dh_auto_test:
 
-clean: real-clean unpatch
-	dh_testdir
-	dh_testroot
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	dh_installdocs
-	cp tutorial/Tutorial.v.html $(HTMLDEST)
-	cp refman/html/* $(HTMLDEST)/refman
-	cp faq/FAQ.v.html $(HTMLDEST)
-	cp RecTutorial/RecTutorial.v.html $(HTMLDEST)
-	cd debian/coq-doc-html/usr/share/doc/coq; ln -s ../coq-doc-html html
-	cd debian/coq-doc-pdf/usr/share/doc/coq;  ln -s ../coq-doc-pdf  pdf
-	cd debian/coq-doc/usr/share/doc/coq-doc;  ln -s ../coq-doc-html html; ln -s ../coq-doc-pdf pdf
-
-	touch install-stamp
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_install
-	dh_installexamples
-	dh_installman
-	dh_installinfo
-	dh_installchangelogs
-	dh_link
-	dh_strip
-	dh_compress -X.pdf
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch
+.PHONY: override_dh_auto_install
+override_dh_auto_install:

-- 
coq-doc packaging