[Pkg-ocaml-maint-commits] [SCM] ocaml-doc packaging branch, master, updated. debian/3.11-1-8-g7e26310
The following commit has been merged in the master branch:
commit aa9498c992f728f4983c65209e03f8a0495a8f03
Author: Mehdi Dogguy
Date: Wed Jan 4 15:13:06 2012 +0100
Update changelog
diff --git a/debian/changelog b/debian/changelog
index f9264db..f316d15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,19 @@
ocaml-doc (3.12-1) unstable; urgency=low
* New upstream release (Closes: #627791)
-
- -- Mehdi Dogguy Wed, 04 Jan 2012 15:04:52 +0100
+ * Add myself to Uploaders.
+ * Add a (very ugly) script "generate_tarball" to generate new tarballs
+for ocaml-doc.
+ * Clean debian/rules file by using dh7 rules style.
+ * Bump Standards-Version to 3.9.2, no changes needed.
+ * Add ${misc:Depends} in ocaml-doc's Depends field.
+ * Add a Homepage field.
+ * Fix install-info-used-in-maintainer-script by simply removing postinst
+and prerm scripts. Calls to install-info is now handled by triggers.
+ * Add a watch file
+ * Convert source package to 3.0 (quilt) format
+
+ -- Mehdi Dogguy Wed, 04 Jan 2012 15:11:31 +0100
ocaml-doc (3.11-1) unstable; urgency=low
--
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
[Pkg-ocaml-maint-commits] [SCM] ocaml-doc packaging branch, master, updated. debian/3.11-1-8-g7e26310
The following commit has been merged in the master branch:
commit 7e263109adae040a56988ad34bd38c1ab363548e
Author: Mehdi Dogguy
Date: Wed Jan 4 16:38:39 2012 +0100
Add a small paragraph describing OCaml in ocaml-doc's long description
diff --git a/debian/control b/debian/control
index c57d096..f6084d8 100644
--- a/debian/control
+++ b/debian/control
@@ -18,5 +18,9 @@ Architecture: all
Depends: ${misc:Depends}
Suggests: ocaml
Description: Documentation for Objective Caml
- This package contains documentation for Objective Caml in html, pdf, info and
- plain text format.
+ Objective Caml (OCaml) is an implementation of the ML language, based on
+ the Caml Light dialect extended with a complete class-based object system
+ and a powerful module system in the style of Standard ML.
+ .
+ This package contains documentation for Objective Caml in html, pdf, info
+ and plain text format.
--
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
[Pkg-ocaml-maint-commits] [SCM] ocaml-doc packaging branch, master, updated. debian/3.11-1-8-g7e26310
The following commit has been merged in the master branch:
commit 1ff207395c00f9c1bd3d4e45e8b3c9f3cb154bd2
Author: Mehdi Dogguy
Date: Wed Jan 4 15:08:17 2012 +0100
Various changes
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 000..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 ,
Remi Vanicat ,
Ralf Treinen
-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..000
--- 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 000..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..000
--- 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..000
--- 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}.i
[Pkg-ocaml-maint-commits] [SCM] ocaml-doc packaging branch, master, updated. debian/3.11-1-8-g7e26310
The following commit has been merged in the master branch: commit 51adb76656919ba744a53e9fd836a6145d7e9fa7 Author: Mehdi Dogguy Date: Wed Jan 4 15:05:08 2012 +0100 New upstream release (Closes: #627791) diff --git a/debian/changelog b/debian/changelog index 054323e..f9264db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml-doc (3.12-1) unstable; urgency=low + + * New upstream release (Closes: #627791) + + -- Mehdi Dogguy Wed, 04 Jan 2012 15:04:52 +0100 + ocaml-doc (3.11-1) unstable; urgency=low [ Stefano Zacchiroli ] -- 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
[Pkg-ocaml-maint-commits] [SCM] ocaml-doc packaging branch, master, updated. debian/3.11-1-8-g7e26310
The following commit has been merged in the master branch: commit 7ece035bb6e4fe8326e6ce8d995b4ad4e0cf3579 Merge: ab09b6baae98b86626adc39b5d0681c7c01994fc b4c49f76a9b76998fc11acc87bd071f801ad32d5 Author: Mehdi Dogguy Date: Wed Jan 4 15:04:16 2012 +0100 Merge commit 'upstream/3.12' -- 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
[Pkg-ocaml-maint-commits] [SCM] ocaml-doc packaging branch, master, updated. debian/3.11-1-8-g7e26310
The following commit has been merged in the master branch:
commit ab09b6baae98b86626adc39b5d0681c7c01994fc
Author: Mehdi Dogguy
Date: Wed Jan 4 15:03:29 2012 +0100
Add a script to generate a new tarball
diff --git a/debian/generate_tarball b/debian/generate_tarball
new file mode 100755
index 000..76aef97
--- /dev/null
+++ b/debian/generate_tarball
@@ -0,0 +1,59 @@
+#!/bin/bash
+#
+# This script prepares a tarbaill for ocaml-doc package by downloading
+# OCaml's upstream documentation from caml.inria.fr
+#
+# It needs tar and curl.
+
+set -e
+
+ver="$1"
+dir=`mktemp -d "ocaml-doc-3.12-X"`
+finaldir="ocaml-doc-$ver"
+tmp=`mktemp -d "ocaml-doc-3.12-tmp-X"`
+url="http://caml.inria.fr/pub/distrib/ocaml-${ver}";
+dl="curl -#"
+
+function tarxf() {
+ top=`tar tzf $1/$3 | sed -e 's@/.*@@' | uniq`
+ tar xf $1/$3 -C $2
+ mv $2/$top $4
+}
+
+function msg() {
+ echo "I: $1"
+}
+
+function usage() {
+ echo "Usage: $0 MAJOR_VERSION.MINOR_VERSION"
+ exit 1
+}
+
+test -z $ver && usage
+
+# Downloading documentation
+msg "Downloading documentation in $dir ($tmp)"
+$dl "$url/ocaml-${ver}-refman.info.tar.gz" -o $dir/info.tar.gz
+$dl "$url/ocaml-${ver}-refman.html.tar.gz" -o $dir/html.tar.gz
+$dl "$url/ocaml-${ver}-refman.pdf" -P $dir -o $dir/refman.pdf
+$dl "$url/ocaml-${ver}-refman.txt" -P $dir -o $dir/refman.txt
+$dl "http://nicolaspouillard.fr/ocamlbuild/ocamlbuild-user-guide.pdf"; -o
$dir/ocamlbuild-user-guide.pdf
+
+# Extracting tarballs
+msg "Extracting downloaded traballs"
+mkdir -p $finaldir
+tarxf $dir $tmp info.tar.gz $finaldir/ocaml.info
+tarxf $dir $tmp html.tar.gz $finaldir/ocaml.html
+cp $dir/refman.pdf $finaldir/ocaml-${ver}-refman.pdf
+gzip --to-stdout $dir/refman.txt > $finaldir/ocaml-${ver}-refman.txt.gz
+cp $dir/ocamlbuild-user-guide.pdf $finaldir/
+
+# Building final tarball
+msg "Building final tarball in ../ocaml-doc-${ver}.tar.gz"
+tar czvf ../ocaml-doc-${ver}.tar.gz $finaldir
+
+# Cleaning
+msg "Cleaning..."
+rm -rf $dir
+rm -rf $tmp
+rm -rf $finaldir
--
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
[Pkg-ocaml-maint-commits] [SCM] ocaml-doc packaging branch, master, updated. debian/3.11-1-8-g7e26310
The following commit has been merged in the master branch: commit 8311762d17cbfb68879c0888fadc2406e1cde288 Author: Mehdi Dogguy Date: Wed Jan 4 15:03:06 2012 +0100 Add myself to uploaders diff --git a/debian/control b/debian/control index b5a2f8c..88ebb0d 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,11 @@ Source: ocaml-doc Section: non-free/doc Priority: optional Maintainer: Debian OCaml Maintainers -Uploaders: Samuel Mimram , Remi Vanicat , Ralf Treinen +Uploaders: + Mehdi Dogguy , + Samuel Mimram , + Remi Vanicat , + Ralf Treinen Build-Depends: debhelper (>= 7) Standards-Version: 3.8.0 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-doc.git -- 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
