[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
