The following commit has been merged in the master branch:
commit 1ff207395c00f9c1bd3d4e45e8b3c9f3cb154bd2
Author: Mehdi Dogguy <me...@debian.org>
Date: Wed Jan 4 15:08:17 2012 +0100
Various changes
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..c130fbc
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+debian/docs
+debian/ocaml-doc.doc-base.ocaml
diff --git a/debian/control b/debian/control
index 88ebb0d..c57d096 100644
--- a/debian/control
+++ b/debian/control
@@ -7,13 +7,15 @@ Uploaders:
Samuel Mimram <smim...@debian.org>,
Remi Vanicat <vani...@debian.org>,
Ralf Treinen <trei...@debian.org>
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.9.2
+Homepage: http://caml.inria.fr
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-doc.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-doc.git
Package: ocaml-doc
Architecture: all
+Depends: ${misc:Depends}
Suggests: ocaml
Description: Documentation for Objective Caml
This package contains documentation for Objective Caml in html, pdf, info and
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 1eaefda..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,4 +0,0 @@
-ocaml-3.11-refman.pdf
-ocaml-3.11-refman.txt.gz
-ocaml.html
-ocamlbuild-user-guide.pdf
diff --git a/debian/docs.in b/debian/docs.in
new file mode 100644
index 0000000..7550b41
--- /dev/null
+++ b/debian/docs.in
@@ -0,0 +1,4 @@
+ocaml-@vers...@-refman.pdf
+ocaml-@vers...@-refman.txt.gz
+ocaml.html
+ocamlbuild-user-guide.pdf
diff --git a/debian/ocaml-doc.doc-base.ocaml
b/debian/ocaml-doc.doc-base.ocaml.in
similarity index 69%
rename from debian/ocaml-doc.doc-base.ocaml
rename to debian/ocaml-doc.doc-base.ocaml.in
index 0bc0cd0..47dc7c0 100644
--- a/debian/ocaml-doc.doc-base.ocaml
+++ b/debian/ocaml-doc.doc-base.ocaml.in
@@ -1,5 +1,5 @@
Document: ocaml-doc
-Title: The OCaml 3.11 Documentation
+Title: The OCaml @VERSION@ Documentation
Author: Xavier Leroy (with Damien Doligez, Jacques Garrigue, Didier Rémy and
Jérôme Vouillon)
Abstract: The Objective Caml system release 3.11 documentation and user's
manual
Section: Programming/OCaml
@@ -9,7 +9,7 @@ Index: /usr/share/doc/ocaml-doc/ocaml.html/index.html
Files: /usr/share/doc/ocaml-doc/ocaml.html/*.html
Format: text
-Files: /usr/share/doc/ocaml-doc/ocaml-3.11-refman.txt.gz
+Files: /usr/share/doc/ocaml-doc/ocaml-@vers...@-refman.txt.gz
Format: PDF
-Files: /usr/share/doc/ocaml-doc/ocaml-3.11-refman.pdf
+Files: /usr/share/doc/ocaml-doc/ocaml-@vers...@-refman.pdf
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644
index aea776b..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- configure)
- # Info documentation stuff.
- install-info --quiet --section Programming Programming \
- --description="The Objective Caml system release 3.10 Documentation
and user's manual" \
- /usr/share/info/ocaml.info.gz
-
- # Remove the old package's directory
- if [ ! -L /usr/share/doc/ocaml/docs ]; then
- rmdir /usr/share/doc/ocaml/docs/camlp4.html || true;
- rmdir /usr/share/doc/ocaml/docs/camlp4-tutorial.html || true;
- rmdir /usr/share/doc/ocaml/docs/examples || true;
- rmdir /usr/share/doc/ocaml/docs || true;
- if [ ! -e /usr/share/doc/ocaml/docs ]; then
- cd /usr/share/doc/ocaml;
- ln -s ../ocaml-doc docs;
- fi;
- fi
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/prerm b/debian/prerm
deleted file mode 100644
index 56fadd1..0000000
--- a/debian/prerm
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- remove|upgrade|deconfigure)
- # Info documentation stuff.
- install-info --quiet --remove /usr/share/info/ocaml.info.gz
- ;;
-
- failed-upgrade)
- ;;
-
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/rules b/debian/rules
index e69757f..7fa92b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,48 +1,15 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-build: build-stamp
-build-stamp:
- dh_testdir
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
- dh_clean
+DOC_VERSION=$(shell dpkg-parsechangelog | sed -n "s/Version:
\(.*\)-[^-]\+/\1/p")
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
+override_dh_auto_build:
+ for file in docs ocaml-doc.doc-base.ocaml; do \
+ sed "s/@VERSION@/$(DOC_VERSION)/g" debian/$${file}.in >
debian/$${file}; \
+ done
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_install
-# dh_installman
- dh_installinfo -n
- dh_link
- dh_strip
+override_dh_compress:
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 configure
+%:
+ dh $@
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..18a6022
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://caml.inria.fr/download.en.html
pub/distrib/ocaml-.*/ocaml-(.*)-refman.html.tar.gz
--
ocaml-doc packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
