[Pkg-ocaml-maint-commits] [SCM] libfuse-ocaml packaging annotated tag, debian/0.2-1, created. debian/0.2-1
The annotated tag, debian/0.2-1 has been created at d6d4d857823916c7dd099742752dfafa8eb59e64 (tag) tagging 515a781e7ce71a05fb754719b7833b441e409ac6 (commit) tagged by Goswin von Brederlow on Sun Mar 8 20:55:49 2009 +0100 - Shortlog Releaseing 0.2-1. Goswin von Brederlow (6): Initial checkin Ignore generated files Remove *-stamp files in clean target. Change version to non-native package. * Add missing callbacks. * Release 0.2-1. --- -- libfuse-ocaml packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] libfuse-ocaml packaging annotated tag, upstream/0.2, created. upstream/0.2
The annotated tag, upstream/0.2 has been created at a56df86f4de580d2d7c20a51115f7a8ce302c014 (tag) tagging 242689b08b3cdb9d284b5d81155d348135052767 (commit) replaces upstream/0.0 tagged by Goswin von Brederlow on Sun Mar 8 20:52:02 2009 +0100 - Shortlog Upstream version 0.2 Goswin von Brederlow (2): Imported Upstream version 0.1 Imported Upstream version 0.2 --- -- libfuse-ocaml packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] cameleon packaging branch, master, updated. debian/1.9.18.svn20070918-2-28-g5f02eb5
The following commit has been merged in the master branch: commit bae4de2402645083fcbb98277eb14b4d030bef1a Merge: dee43569a26e1ea76ccb44bffb6421f513afa858 a4088e8cb79b1f4b2ab808db2ec3402f50609f1c Author: Stephane Glondu st...@glondu.net Date: Sun Mar 8 19:09:47 2009 +0100 Merge commit 'upstream/1.9.18.svn20090302+691' -- cameleon packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] cameleon packaging branch, master, updated. debian/1.9.18.svn20070918-2-28-g5f02eb5
The following commit has been merged in the master branch: commit ee492c7c366bee94a825c1f5b627a295ceada5a9 Author: Stephane Glondu st...@glondu.net Date: Sun Mar 8 12:41:02 2009 +0100 New upstream SVN snapshot diff --git a/debian/changelog b/debian/changelog index b17b847..4889900 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,14 @@ -cameleon (1.9.18.svn20070918-3) UNRELEASED; urgency=low - - [ Sylvain Le Gall ] - * NOT RELEASED YET +cameleon (1.9.18.svn20090302+691-1) UNRELEASED; urgency=low [ Stephane Glondu ] + * New upstream SVN snapshot * Remove Julien from Uploaders * Switch packaging to git [ Mehdi Dogguy ] * Fix a typo in description of libcameleon-ocaml-dev - -- Mehdi Dogguy dog...@pps.jussieu.fr Mon, 23 Feb 2009 11:00:57 +0100 + -- Stephane Glondu st...@glondu.net Sun, 08 Mar 2009 19:13:09 +0100 cameleon (1.9.18.svn20070918-2) unstable; urgency=low @@ -291,4 +289,3 @@ cameleon (1.1+cvs.20021010-1) unstable; urgency=low provided by Cameleon. Closes: Bug#155959, Bug#155958, Bug#155957. -- Jerome Marant jer...@debian.org Thu, 10 Oct 2002 21:37:09 +0200 - -- cameleon packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] cameleon packaging branch, master, updated. debian/1.9.18.svn20070918-2-28-g5f02eb5
The following commit has been merged in the master branch: commit 5e0b6ab657dcd31dd3b6d2da161ce42c7533807d Author: Stephane Glondu st...@glondu.net Date: Sun Mar 8 17:18:54 2009 +0100 Add README.source diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 000..2024f7f --- /dev/null +++ b/debian/README.source @@ -0,0 +1,11 @@ +cameleon for Debian +--- + +This source package uses quilt to apply and remove its patches. Please +refer to `/usr/share/doc/quilt/README.source' for information about +how to use quilt for source packages. + +The quilt series is generated from the Git repository. Have a look at +the `redo-patches' target of debian/rules for more details. + + -- Stephane Glondu st...@glondu.net Sun, 08 Mar 2009 17:14:42 +0100 -- cameleon packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] cameleon packaging branch, master, updated. debian/1.9.18.svn20070918-2-28-g5f02eb5
The following commit has been merged in the master branch: commit 0eb6703b180013796eb0599b61c4f2813120121a Author: Stephane Glondu st...@glondu.net Date: Sun Mar 8 16:29:10 2009 +0100 Remove deprecated Encoding entries in *.desktop diff --git a/debian/cameleon.desktop b/debian/cameleon.desktop index 2075bef..253088a 100644 --- a/debian/cameleon.desktop +++ b/debian/cameleon.desktop @@ -1,6 +1,5 @@ [Desktop Entry] Version=1.0 -Encoding=UTF-8 Type=Application Name=Cameleon GenericName=OCaml Integrated Development Environment diff --git a/debian/chamo.desktop b/debian/chamo.desktop index 1deac44..4c29c40 100644 --- a/debian/chamo.desktop +++ b/debian/chamo.desktop @@ -1,6 +1,5 @@ [Desktop Entry] Version=1.0 -Encoding=UTF-8 Type=Application Name=Chamo GenericName=Source code editor diff --git a/debian/dbforge.desktop b/debian/dbforge.desktop index 5041e56..39e425a 100644 --- a/debian/dbforge.desktop +++ b/debian/dbforge.desktop @@ -1,6 +1,5 @@ [Desktop Entry] Version=1.0 -Encoding=UTF-8 Type=Application Name=DBForge GenericName=Database designer diff --git a/debian/ocaml-docbrowser.desktop b/debian/ocaml-docbrowser.desktop index 16b0163..9d78436 100644 --- a/debian/ocaml-docbrowser.desktop +++ b/debian/ocaml-docbrowser.desktop @@ -1,6 +1,5 @@ [Desktop Entry] Version=1.0 -Encoding=UTF-8 Type=Application Name=OCaml docbrowser GenericName=Documentation browser for OCaml diff --git a/debian/ocamlcvs.desktop b/debian/ocamlcvs.desktop index 4240abf..aeb8a2f 100644 --- a/debian/ocamlcvs.desktop +++ b/debian/ocamlcvs.desktop @@ -1,6 +1,5 @@ [Desktop Entry] Version=1.0 -Encoding=UTF-8 Type=Application Name=OCamlCVS GenericName=Handle CVS diff --git a/debian/report.desktop b/debian/report.desktop index 438cc27..ab5b5a6 100644 --- a/debian/report.desktop +++ b/debian/report.desktop @@ -1,6 +1,5 @@ [Desktop Entry] Version=1.0 -Encoding=UTF-8 Type=Application Name=Report GenericName=XML schema builder for OCaml -- cameleon packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] cameleon packaging branch, master, updated. debian/1.9.18.svn20070918-2-28-g5f02eb5
The following commit has been merged in the master branch: commit 7cd6c99426edbb6bc1d48fab5acd196c6fb63fdc Author: Stephane Glondu st...@glondu.net Date: Sun Mar 8 17:40:34 2009 +0100 Update ocaml-nox version in CDBS_BUILD_DEPENDS diff --git a/debian/control b/debian/control index 89c1c7e..19a0d78 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Ralf Treinen trei...@debian.org, Remi Vanicat vani...@debian.org, Samuel Mimram smim...@debian.org, Stefano Zacchiroli z...@debian.org, Sven Luther lut...@debian.org, Sylvain Le Gall gil...@debian.org -Build-Depends: cdbs (= 0.4.23-1.1), quilt, patchutils (= 0.2.25), cdbs (= 0.4.27), ocaml-nox (= 3.10.0-9), po4a, docbook-xml (= 4.4), docbook-xsl, libxml2-utils, xsltproc, +Build-Depends: cdbs (= 0.4.23-1.1), quilt, patchutils (= 0.2.25), cdbs (= 0.4.27), ocaml-nox (= 3.11.0-5), po4a, docbook-xml (= 4.4), docbook-xsl, libxml2-utils, xsltproc, camlp4, ocaml-findlib, liblablgtk2-ocaml-dev, diff --git a/debian/rules b/debian/rules index d90a00c..630d28f 100755 --- a/debian/rules +++ b/debian/rules @@ -76,7 +76,7 @@ DOCBOOK_MANPAGE_SOURCES := $(CURDIR)/debian/xml-man/en/cam-config2.byte.xml \ DOCBOOK_MANPAGE_EXTRA_SOURCES := $(CURDIR)/debian/xml-man/en/license.xml \ $(CURDIR)/debian/xml-man/en/refentryinfo.xml -CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (= 3.10.0-9),$(CDBS_BUILD_DEPENDS)) +CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (= 3.11.0-5),$(CDBS_BUILD_DEPENDS)) OCAML_OCAMLDOC_PACKAGES_DOCBASE := libcameleon-ocaml-dev -- cameleon packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] cameleon packaging branch, master, updated. debian/1.9.18.svn20070918-2-28-g5f02eb5
The following commit has been merged in the master branch: commit 80583e332f6dbc87bf0d692eb482f6a4e61a35ad Author: Stephane Glondu st...@glondu.net Date: Sun Mar 8 16:47:45 2009 +0100 Bump debhelper compatibility level to 7 diff --git a/debian/compat b/debian/compat index 7ed6ff8..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index ab58eba..55b9b25 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,7 @@ Priority: optional Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Ralf Treinen trei...@debian.org, Remi Vanicat vani...@debian.org, Samuel Mimram smim...@debian.org, Stefano Zacchiroli z...@debian.org, Sven Luther lut...@debian.org, Sylvain Le Gall gil...@debian.org Build-Depends: cdbs (= 0.4.23-1.1), quilt, patchutils (= 0.2.25), cdbs (= 0.4.27), ocaml-nox (= 3.11.0-5), po4a, docbook-xml (= 4.4), docbook-xsl, libxml2-utils, xsltproc, + debhelper (= 7), camlp4, ocaml-findlib, liblablgtk2-ocaml-dev, -- cameleon packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] cameleon packaging branch, master, updated. debian/1.9.18.svn20070918-2-28-g5f02eb5
The following commit has been merged in the master branch: commit 32ee68261f5f021afaf46975924c020160fdf9ee Author: Stephane Glondu st...@glondu.net Date: Sun Mar 8 19:26:08 2009 +0100 Use ocaml.mk as a CDBS rules file, add dh-ocaml to Build-Depends diff --git a/debian/control b/debian/control index 55b9b25..2d4f19c 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Ralf Treinen trei...@debian.org, Remi Vanicat vani...@debian.org, Samuel Mimram smim...@debian.org, Stefano Zacchiroli z...@debian.org, Sven Luther lut...@debian.org, Sylvain Le Gall gil...@debian.org Build-Depends: cdbs (= 0.4.23-1.1), quilt, patchutils (= 0.2.25), cdbs (= 0.4.27), ocaml-nox (= 3.11.0-5), po4a, docbook-xml (= 4.4), docbook-xsl, libxml2-utils, xsltproc, debhelper (= 7), + dh-ocaml, camlp4, ocaml-findlib, liblablgtk2-ocaml-dev, diff --git a/debian/rules b/debian/rules index e8189ec..1152e25 100755 --- a/debian/rules +++ b/debian/rules @@ -23,7 +23,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/class/ocaml.mk +include /usr/share/cdbs/1/rules/ocaml.mk include $(CURDIR)/debian/mk/docbook-manpage.mk PACKAGE := cameleon -- cameleon packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] cameleon packaging branch, master, updated. debian/1.9.18.svn20070918-2-28-g5f02eb5
The following commit has been merged in the master branch: commit 17d3281ceef81aab444a3337ef422de2fa150d8e Author: Stephane Glondu st...@glondu.net Date: Sun Mar 8 16:47:53 2009 +0100 Add debian/clean diff --git a/debian/cameleon.manpages b/debian/clean similarity index 91% copy from debian/cameleon.manpages copy to debian/clean index 40f5f46..10639b1 100644 --- a/debian/cameleon.manpages +++ b/debian/clean @@ -1,19 +1,21 @@ -debian/xml-man/en/tdl.byte.1 -debian/xml-man/en/tdl_export.byte.1 -debian/xml-man/en/make_my_chamo.1 -debian/xml-man/en/tdl2html.byte.1 -debian/xml-man/en/ocamlrss2.byte.1 -debian/xml-man/en/rss_export.byte.1 -debian/xml-man/en/tdl_svn.byte.1 debian/xml-man/en/cam-config2.byte.1 debian/xml-man/en/cam-mktop2.1 debian/xml-man/en/cameleon2.byte.1 -debian/xml-man/en/docbrowser2.byte.1 -debian/xml-man/en/tmpl_engine.byte.1 -debian/xml-man/en/ocamlcvs2.byte.1 +debian/xml-man/en/chamo.byte.1 debian/xml-man/en/dbforge2.byte.1 debian/xml-man/en/dbforge2.gui.byte.1 +debian/xml-man/en/docbrowser2.byte.1 +debian/xml-man/en/make_my_chamo.1 +debian/xml-man/en/ocamlcvs2.byte.1 +debian/xml-man/en/ocamlrss2.byte.1 +debian/xml-man/en/ocamltdl2.byte.1 debian/xml-man/en/report2.byte.1 debian/xml-man/en/report2.gui.byte.1 -debian/xml-man/en/chamo.byte.1 -debian/xml-man/en/ocamltdl2.byte.1 +debian/xml-man/en/rss_export.byte.1 +debian/xml-man/en/tdl.byte.1 +debian/xml-man/en/tdl2html.byte.1 +debian/xml-man/en/tdl_export.byte.1 +debian/xml-man/en/tdl_svn.byte.1 +debian/xml-man/en/tmpl_engine.byte.1 +src/custop/custop_installation.ml +src/editor/make_my_chamo diff --git a/debian/rules b/debian/rules index 630d28f..e8189ec 100755 --- a/debian/rules +++ b/debian/rules @@ -80,37 +80,10 @@ CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (= 3.11.0-5),$(CDBS_BUILD_DEP OCAML_OCAMLDOC_PACKAGES_DOCBASE := libcameleon-ocaml-dev +# These cannot be erased by debian/clean mechanisms becore they are touched +# by upstream `make clean' clean:: - -$(RM) '$(CURDIR)/src/odot/.depend' - -$(RM) '$(CURDIR)/src/.depend' - -$(RM) '$(CURDIR)/src/editor/make_my_chamo' - -$(RM) '$(CURDIR)/src/tdl/tdl_filter_parser.ml' - -$(RM) '$(CURDIR)/src/tdl/tdl_filter_parser.mli' - -$(RM) '$(CURDIR)/src/tdl/tdl_filter_parser.output' - -$(RM) '$(CURDIR)/debian/xml-man/en/tdl.byte.1' - -$(RM) '$(CURDIR)/debian/xml-man/en/tdl_export.byte.1' - -$(RM) '$(CURDIR)/debian/xml-man/en/make_my_chamo.1' - -$(RM) '$(CURDIR)/debian/xml-man/en/tdl2html.byte.1' - -$(RM) '$(CURDIR)/debian/xml-man/en/ocamlrss2.byte.1' - -$(RM) '$(CURDIR)/debian/xml-man/en/rss_export.byte.1' - -$(RM) '$(CURDIR)/debian/xml-man/en/tdl_svn.byte.1' - -$(RM) '$(CURDIR)/debian/xml-man/en/cam-config2.byte.1' - -$(RM) '$(CURDIR)/debian/xml-man/en/cameleon2.byte.1' - -$(RM) '$(CURDIR)/debian/xml-man/en/cam-mktop2.1' - -$(RM) '$(CURDIR)/debian/xml-man/en/dbforge2.byte.1' - -$(RM) '$(CURDIR)/debian/xml-man/en/dbforge2.gui.byte.1' - -$(RM) '$(CURDIR)/debian/xml-man/en/docbrowser2.byte.1' - -$(RM) '$(CURDIR)/debian/xml-man/en/ocamlcvs2.byte.1' - -$(RM) '$(CURDIR)/debian/xml-man/en/report2.byte.1' - -$(RM) '$(CURDIR)/debian/xml-man/en/report2.gui.byte.1' - -$(RM) '$(CURDIR)/debian/xml-man/en/tmpl_engine.byte.1' - -$(RM) '$(CURDIR)/debian/xml-man/en/chamo.byte.1' - -$(RM) '$(CURDIR)/debian/xml-man/en/ocamltdl2.byte.1' - -$(RM) '$(CURDIR)/debian/cameleon-doc.dirs' - -$(RM) '$(CURDIR)/debian/libcameleon-ocaml-dev.dirs' - -$(RM) '$(CURDIR)/debian/libcameleon-ocaml-dev.install' - -$(RM) '$(CURDIR)/debian/META.cameleon' - -$(RM) '$(CURDIR)/debian/libcameleon-ocaml-dev.ocamldoc-apiref' + $(RM) src/.depend src/odot/.depend src/custop/custop_installation.ml install/cameleon install/cameleon-doc install/libcameleon-ocaml-dev:: cameleon-install-extra -- cameleon packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] cameleon packaging branch, master, updated. debian/1.9.18.svn20070918-2-28-g5f02eb5
The following commit has been merged in the master branch: commit 5f02eb5d043c3bc9263332434f0bca481537dc0b Author: Stephane Glondu st...@glondu.net Date: Mon Mar 9 00:42:07 2009 +0100 Update changelog diff --git a/debian/changelog b/debian/changelog index 4889900..63009a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,27 @@ cameleon (1.9.18.svn20090302+691-1) UNRELEASED; urgency=low [ Stephane Glondu ] - * New upstream SVN snapshot - * Remove Julien from Uploaders + * New upstream SVN snapshot (Closes: #462010, #514111): +- remove unused patches +- remove obsolete tdl_filter_precious +- refresh patches and switch patch system to quilt + * Remove Julien from Uploaders, add myself to Uploaders * Switch packaging to git + * Add README.source + * Remove deprecated Encoding entries in *.desktop + * Cleanup and wrap dependencies + * Update ocaml-nox version in CDBS_BUILD_DEPENDS + * Bump Standards-Version to 3.8.0 + * Bump debhelper compatibility level to 7 + * Add dh-ocaml to Build-Depends (Closes: #517323) + * Use ocaml.mk as a CDBS rules file + * Switch copyright to machine-parsable format + * Add Lintian overrides for bytecode executables [ Mehdi Dogguy ] * Fix a typo in description of libcameleon-ocaml-dev - -- Stephane Glondu st...@glondu.net Sun, 08 Mar 2009 19:13:09 +0100 + -- Stephane Glondu st...@glondu.net Mon, 09 Mar 2009 00:49:12 +0100 cameleon (1.9.18.svn20070918-2) unstable; urgency=low -- cameleon packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] cameleon packaging branch, pristine-tar, updated. 9b05777da765eb42c17aebb5a15c7da01d3d18b5
The following commit has been merged in the pristine-tar branch: commit 9b05777da765eb42c17aebb5a15c7da01d3d18b5 Author: Stephane Glondu st...@glondu.net Date: Mon Mar 9 00:42:45 2009 +0100 pristine-tar data for cameleon_1.9.18.svn20090302+691.orig.tar.gz diff --git a/cameleon_1.9.18.svn20090302+691.orig.tar.gz.delta b/cameleon_1.9.18.svn20090302+691.orig.tar.gz.delta new file mode 100644 index 000..6ec2dce Binary files /dev/null and b/cameleon_1.9.18.svn20090302+691.orig.tar.gz.delta differ diff --git a/cameleon_1.9.18.svn20090302+691.orig.tar.gz.id b/cameleon_1.9.18.svn20090302+691.orig.tar.gz.id new file mode 100644 index 000..809b578 --- /dev/null +++ b/cameleon_1.9.18.svn20090302+691.orig.tar.gz.id @@ -0,0 +1 @@ +a4088e8cb79b1f4b2ab808db2ec3402f50609f1c -- cameleon packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] cameleon packaging annotated tag, upstream/1.9.18.svn20090302+691, created. upstream/1.9.18.svn20090302+691
The annotated tag, upstream/1.9.18.svn20090302+691 has been created at 81cc88c7595660955a1c38cd7aed4ea200f24468 (tag) tagging a4088e8cb79b1f4b2ab808db2ec3402f50609f1c (commit) replaces upstream/1.9.18.svn20070918 tagged by Stephane Glondu on Sun Mar 8 19:08:47 2009 +0100 - Shortlog Upstream version 1.9.18.svn20090302+691 Stephane Glondu (1): Imported Upstream version 1.9.18.svn20090302+691 --- -- cameleon packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-lastfm packaging branch, master, updated. debian/0.1.3-1-8-g2f6d448
The following commit has been merged in the master branch:
commit fbd2f284b49e77131f04647c43e2f04b2ea478d2
Author: Romain Beauxis to...@rastageeks.org
Date: Mon Mar 9 03:05:18 2009 +0100
Prepared next upload.
diff --git a/debian/changelog b/debian/changelog
index 7f57afc..a6cfdf5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,18 @@
-ocaml-lastfm (0.1.3-2) UNRELEASED; urgency=low
+ocaml-lastfm (0.1.3-2) unstable; urgency=low
+ [ Samuel Mimram ]
* Rebuild with OCaml 3.11.
* Switch packaging to git.
* Update compat to 7.
* Update standards version to 3.8.0.
* Use dh-ocaml.
- -- Samuel Mimram smim...@debian.org Wed, 25 Feb 2009 22:37:10 +0100
+ [ Romain Beauxis ]
+ * Switched rules to cdbs.
+ * Used OPT: for files installed only when
+ocamlopt is available.
+
+ -- Romain Beauxis to...@rastageeks.org Mon, 09 Mar 2009 03:04:04 +0100
ocaml-lastfm (0.1.3-1) unstable; urgency=low
diff --git a/debian/liblastfm-ocaml-dev.install.in
b/debian/liblastfm-ocaml-dev.install.in
index 975c02f..235540c 100644
--- a/debian/liblastfm-ocaml-dev.install.in
+++ b/debian/liblastfm-ocaml-dev.install.in
@@ -1,4 +1,4 @@
@OCamlStdlibDir@/lastfm/META
@OCamlStdlibDir@/lastfm/*.cm*
@OCamlStdlibDir@/lastfm/*.ml*
-...@ocamlstdlibdir@/lastfm/*.a
+OPT: @OCamlStdlibDir@/lastfm/*.a
diff --git a/debian/rules b/debian/rules
index cb934fb..390def5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,68 +1,19 @@
#!/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
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/ocaml.mk
-include /usr/share/ocaml/ocamlvars.mk
-include /usr/share/ocaml/ocamlinit.mk
+# In order to regenerate 'debian/control' :
+# DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
+# Then check manually if everything's ok
-DESTDIR := $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
-
-config.status: configure
- dh_testdir
- ./configure --prefix=/usr --mandir=\$${prefix}/share/man
--infodir=\$${prefix}/share/info
-
-build: ocamlinit build-stamp
-build-stamp: config.status
- dh_testdir
- $(MAKE)
- touch build-stamp
-
-clean: ocamlinit-clean
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- [ ! -f Makefile ] || $(MAKE) clean
- rm -f config.log config.status
- rm -rf debian/doc/
- rm -rf doc
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
+DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
+DEB_MAKE_INSTALL_TARGET := install OCAMLFIND_DESTDIR=$(DESTDIR)
OCAMLFIND_LDCONF=ignore
+build/liblastfm-ocaml-dev::
mkdir -p $(DESTDIR)
- $(MAKE) install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
- $(MAKE) doc
-
-binary-indep:
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs CHANGES
- dh_installdocs
- dh_installexamples
- dh_install --sourcedir=debian/tmp --list-missing
- dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol -- -VF:OCamlABI=$(OCAML_ABI)
- dh_md5sums
- dh_builddeb
+ make doc
-binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+clean::
+ rm -rf Makefile src/Makefile src/META doc config.log config.status
--
ocaml-lastfm packaging
___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-lastfm packaging branch, master, updated. debian/0.1.3-1-8-g2f6d448
The following commit has been merged in the master branch: commit 2f6d4484e5577a11a0adb1e504aa7db073d65ca0 Author: Romain Beauxis to...@rastageeks.org Date: Mon Mar 9 03:14:09 2009 +0100 Fixed build-dep diff --git a/debian/control b/debian/control index c2ce15f..99139fe 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,9 @@ Section: devel Priority: optional Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Samuel Mimram smim...@debian.org, Romain Beauxis to...@rastageeks.org -Build-Depends: debhelper (= 7), dh-ocaml, ocaml-nox (= 3.11), ocaml-findlib (= 1.2.4), libxmlplaylist-ocaml-dev, libocamlnet-ocaml-dev +Build-Depends: cdbs, debhelper (= 7), dh-ocaml, + ocaml-nox (= 3.11), ocaml-findlib (= 1.2.4), + libxmlplaylist-ocaml-dev (= 0.1.1-4), libocamlnet-ocaml-dev (= 2.2.9-6) Standards-Version: 3.8.0 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-lastfm.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-lastfm.git -- ocaml-lastfm packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] r6324 - /trunk/packages/camlpdf/
Author: toots Date: Mon Mar 9 02:24:13 2009 New Revision: 6324 URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1rev=6324 Log: Moved packaging to git Removed: trunk/packages/camlpdf/ ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] camlpdf packaging branch, master, updated. debian/0.3-3-6-g8eb2d39
The following commit has been merged in the master branch: commit 2360760ba0bacb97cfc1795ded3bba564f507725 Merge: 0d984e024ea1e2f5e9142cdea46d14d4321b2a01 e9da4239cb856d3f9120b25fea341b47f1bfc687 Author: Romain Beauxis to...@rastageeks.org Date: Mon Mar 9 03:27:34 2009 +0100 Merge commit 'upstream/0.4' -- camlpdf packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] camlpdf packaging branch, master, updated. debian/0.3-3-6-g8eb2d39
The following commit has been merged in the master branch: commit 8eb2d39c439a3f0f4d8f3e8b158fd57de1666e4f Author: Romain Beauxis to...@rastageeks.org Date: Mon Mar 9 03:44:40 2009 +0100 Updated packaging.. diff --git a/debian/changelog b/debian/changelog index 4dbedb2..184f16d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,15 @@ -camlpdf (0.3-4) UNRELEASED; urgency=low +camlpdf (0.4-1) unstable; urgency=low + [ Mehdi Dogguy ] * Fix watch file and debian/control: Update webpage link - -- Mehdi Dogguy dog...@pps.jussieu.fr Thu, 19 Feb 2009 14:28:12 +0100 + [ Romain Beauxis ] + * New upstream release. + * Updated packaging: ++ Use dh-ocaml ++ Bumped compat to 7 + + -- Romain Beauxis to...@rastageeks.org Mon, 09 Mar 2009 03:28:20 +0100 camlpdf (0.3-3) unstable; urgency=low diff --git a/debian/compat b/debian/compat index 7ed6ff8..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index d198013..a42ffa6 100644 --- a/debian/control +++ b/debian/control @@ -3,12 +3,13 @@ Section: non-free/devel Priority: optional Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Romain Beauxis to...@rastageeks.org -Build-Depends: debhelper (= 5), ocaml-nox, quilt, patchutils (= 0.2.25), cdbs (= 0.4.27), ocaml-findlib, libzip-ocaml-dev +Build-Depends: cdbs (= 0.4.23-1.1), debhelper (= 7), ocaml-nox (= 3.11), + ocaml-findlib (= 1.2.4), libzip-ocaml-dev (= 1.04-2), quilt Standards-Version: 3.8.0 XS-Autobuild: yes -Homepage: http://www.coherentpdf.com/ocaml-libraries.html -Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/camlpdf/trunk -Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlpdf/trunk/ +Homepage: http://www.coherentgraphics.co.uk/camlpdf.html +Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camlpdf.git +Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camlpdf.git Package: libcamlpdf-ocaml-dev Architecture: any diff --git a/debian/control.in b/debian/control.in index 3a911d3..9f75075 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,12 +3,13 @@ Section: non-free/devel Priority: optional Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Romain Beauxis to...@rastageeks.org -Build-Depends: @cdbs@, ocaml-findlib, libzip-ocaml-dev +Build-Depends: @cdbs@, + ocaml-findlib (= 1.2.4), libzip-ocaml-dev (= 1.04-2) Standards-Version: 3.8.0 XS-Autobuild: yes Homepage: http://www.coherentgraphics.co.uk/camlpdf.html -Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/camlpdf/trunk -Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlpdf/trunk/ +Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camlpdf.git +Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camlpdf.git Package: libcamlpdf-ocaml-dev Architecture: any diff --git a/debian/libcamlpdf-ocaml-dev.install.in b/debian/libcamlpdf-ocaml-dev.install.in index b597f7b..6bf0a7d 100644 --- a/debian/libcamlpdf-ocaml-dev.install.in +++ b/debian/libcamlpdf-ocaml-dev.install.in @@ -1 +1 @@ -debian/META *.a *.cm* usr/lib/ocaml/@OCamlABI@/camlpdf +debian/META *.a *.cm* @OCamlStdlibDir@/camlpdf diff --git a/debian/patches/disable_zlib_build.patch b/debian/patches/disable_zlib_build.patch index 2f29fa3..cd789f4 100644 --- a/debian/patches/disable_zlib_build.patch +++ b/debian/patches/disable_zlib_build.patch @@ -1,15 +1,17 @@ camlpdf-0.3/makefile 2008-03-02 14:08:09.0 +0100 -+++ camlpdf-0.3.wozip/makefile 2008-06-12 14:54:57.0 +0200 -@@ -4,8 +4,6 @@ - - # OCaml and C source and interface files. Order matters. - SOURCES = utility.ml utility.mli io.ml io.mli \ +Index: camlpdf/makefile +=== +--- camlpdf.orig/makefile 2009-03-09 03:27:34.0 +0100 camlpdf/makefile 2009-03-09 03:37:29.0 +0100 +@@ -8,8 +8,6 @@ + unzip.ml unzip.mli \ + pdfio.ml pdfio.mli \ + cgenlex.ml cgenlex.mli \ -zlib.ml zlib.mli \ -zlibstubs.c \ transform.ml transform.mli \ units.ml units.mli \ paper.ml paper.mli \ -@@ -27,7 +25,7 @@ +@@ -36,7 +34,7 @@ TRASH = tl prog.tex camlpdf.tex camlpdf.aux camlpdf.log camlpdf.toc # ML Libraries @@ -18,12 +20,12 @@ CLIBS = z -@@ -35,6 +33,8 @@ +@@ -44,6 +42,8 @@ #OCAMLNCFLAGS = -g #OCAMLBCFLAGS = -g #CAMLLDFLAGS = -g +OCAMLFLAGS=-I $(shell ocamlfind query zip) +OCAMLLDFLAGS=-I $(shell ocamlfind query zip) - all : native-code-library byte-code-library - + #Uncomment if you have these compilers + #OCAMLOPT = ocamlopt.opt diff --git a/debian/svn-deblayout b/debian/svn-deblayout deleted file mode 100644 index 40036ab..000 --- a/debian/svn-deblayout +++ /dev/null @@ -1 +0,0 @@
[Pkg-ocaml-maint-commits] [SCM] camlpdf packaging branch, pristine-tar, updated. b32dca752bd0ee357cc8d26decf0d34859c87cb8
The following commit has been merged in the pristine-tar branch: commit b32dca752bd0ee357cc8d26decf0d34859c87cb8 Author: Romain Beauxis to...@rastageeks.org Date: Mon Mar 9 03:27:34 2009 +0100 pristine-tar data for camlpdf_0.4.orig.tar.gz diff --git a/camlpdf_0.4.orig.tar.gz.delta b/camlpdf_0.4.orig.tar.gz.delta new file mode 100644 index 000..5ce75b0 Binary files /dev/null and b/camlpdf_0.4.orig.tar.gz.delta differ diff --git a/camlpdf_0.4.orig.tar.gz.id b/camlpdf_0.4.orig.tar.gz.id new file mode 100644 index 000..bfcc719 --- /dev/null +++ b/camlpdf_0.4.orig.tar.gz.id @@ -0,0 +1 @@ +e9da4239cb856d3f9120b25fea341b47f1bfc687 -- camlpdf packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] camlpdf packaging branch, master, updated. debian/0.3-3-7-g3f5b415
The following commit has been merged in the master branch: commit 3f5b41503744b6c6e24094fd4c2c49648dafbb6b Author: Romain Beauxis to...@rastageeks.org Date: Mon Mar 9 03:54:51 2009 +0100 Fixed build-dep on quilt.. diff --git a/debian/control b/debian/control index a42ffa6..074c8fe 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,8 @@ Priority: optional Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Romain Beauxis to...@rastageeks.org Build-Depends: cdbs (= 0.4.23-1.1), debhelper (= 7), ocaml-nox (= 3.11), - ocaml-findlib (= 1.2.4), libzip-ocaml-dev (= 1.04-2), quilt + ocaml-findlib (= 1.2.4), libzip-ocaml-dev (= 1.04-2), + quilt, dh-ocaml Standards-Version: 3.8.0 XS-Autobuild: yes Homepage: http://www.coherentgraphics.co.uk/camlpdf.html diff --git a/debian/control.in b/debian/control.in index 9f75075..1bbaf94 100644 --- a/debian/control.in +++ b/debian/control.in @@ -4,7 +4,8 @@ Priority: optional Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Romain Beauxis to...@rastageeks.org Build-Depends: @cdbs@, - ocaml-findlib (= 1.2.4), libzip-ocaml-dev (= 1.04-2) + ocaml-findlib (= 1.2.4), libzip-ocaml-dev (= 1.04-2), + dh-ocaml Standards-Version: 3.8.0 XS-Autobuild: yes Homepage: http://www.coherentgraphics.co.uk/camlpdf.html -- camlpdf packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] camlpdf packaging annotated tag, debian/0.4-1, created. debian/0.4-1
The annotated tag, debian/0.4-1 has been created at 2fa12a6553a675c3b264595f74257dfda641eed2 (tag) tagging 3f5b41503744b6c6e24094fd4c2c49648dafbb6b (commit) replaces debian/0.3-3 tagged by Romain Beauxis on Mon Mar 9 03:55:14 2009 +0100 - Shortlog Debian release 0.4-1 Mehdi Dogguy (2): Update watch according to the new url Update webpage link Romain Beauxis (4): Imported Upstream version 0.4 Merge commit 'upstream/0.4' Updated packaging.. Fixed build-dep on quilt.. --- -- camlpdf packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] camlpdf packaging annotated tag, upstream/0.4, created. upstream/0.4
The annotated tag, upstream/0.4 has been created at 6ee7a8f4005e240e176c687cbdd45d17b1b0dd04 (tag) tagging e9da4239cb856d3f9120b25fea341b47f1bfc687 (commit) replaces upstream/0.3 tagged by Romain Beauxis on Mon Mar 9 03:27:34 2009 +0100 - Shortlog Upstream version 0.4 Romain Beauxis (1): Imported Upstream version 0.4 --- -- camlpdf packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
