[Pkg-ocaml-maint-commits] [SCM] camomile packaging branch, master, updated. debian/0.7.2-2-17-gb2e6e45
The following commit has been merged in the master branch: commit b2e6e45f6e3818b45eb084d84650102c280d14ff Author: Stephane Glondu Date: Fri Jul 29 19:52:43 2011 +0200 Update changelog and prepare upload to experimental diff --git a/debian/changelog b/debian/changelog index 3b3b0fd..dd0c47f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ -camomile (0.8.3-1) UNRELEASED; urgency=low +camomile (0.8.3-1) experimental; urgency=low - * New upstream release + * Team upload + * New upstream release (Closes: #631640) + * Switch source package format to 3.0 (quilt) + * Bump Standards-Version to 3.9.2 (no changes) -- Stéphane Glondu Fri, 29 Jul 2011 18:56:12 +0200 -- camomile 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] camomile packaging branch, master, updated. debian/0.7.2-2-17-gb2e6e45
The following commit has been merged in the master branch: commit 48df127293d9ecbdabec4122ca07ccdb8321cf8d Author: Stephane Glondu Date: Fri Jul 29 20:15:24 2011 +0200 Add cppo to Build-Depends diff --git a/debian/control b/debian/control index e0b1f0c..e8fcacb 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Build-Depends: cdbs (>= 0.4.23-1.1), po4a, docbook-xml (>= 4.4), docbook-xsl, libxml2-utils, xsltproc, ocaml-findlib (>= 1.2.4-2), dh-ocaml (>= 0.9.1), + cppo, camlp4 Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camomile.git -- camomile 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] camomile packaging branch, master, updated. debian/0.7.2-2-17-gb2e6e45
The following commit has been merged in the master branch: commit be7cdbaab1d76e566a5497c52f7775de3f6e791a Author: Stephane Glondu Date: Fri Jul 29 19:46:45 2011 +0200 Install missing camomileLibrary.a diff --git a/debian/patches/0002-Install-missing-camomileLibrary.a.patch b/debian/patches/0002-Install-missing-camomileLibrary.a.patch new file mode 100644 index 000..23d300d --- /dev/null +++ b/debian/patches/0002-Install-missing-camomileLibrary.a.patch @@ -0,0 +1,23 @@ +From: Stephane Glondu +Date: Fri, 29 Jul 2011 19:46:45 +0200 +Subject: Install missing camomileLibrary.a + +Signed-off-by: Stephane Glondu +--- + Makefile.in |2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index e1fc579..45dc0ac 100644 +--- a/Makefile.in b/Makefile.in +@@ -406,7 +406,7 @@ install-with-ocamlfind: + files= &&\ + if [ -f camomileLibrary.cmx ]; then files=camomileLibrary.cmx; fi && \ + if [ -f camomileLibrary.cma ]; then files="camomileLibrary.cma $$files"; fi && \ +- if [ -f camomileLibrary.cmxa ]; then files="camomileLibrary.cmxa $$files"; fi && \ ++ if [ -f camomileLibrary.cmxa ]; then files="camomileLibrary.cmxa camomileLibrary.a $$files"; fi && \ + if [ -f camomileLibraryDefault.cmx ]; then files="camomileLibraryDefault.cmx $$files"; fi && \ + if [ -f camomileLibraryDyn.cmx ]; then files="camomileLibraryDyn.cmx $$files"; fi && \ + if [ -f camomile.cma ]; then files="camomile.cma $$files"; fi&& \ +-- diff --git a/debian/patches/series b/debian/patches/series index c1d1692..e5a8a8f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-Makefile.patch +0002-Install-missing-camomileLibrary.a.patch -- camomile 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] camomile packaging branch, master, updated. debian/0.7.2-2-17-gb2e6e45
The following commit has been merged in the master branch: commit b0eaaad4b12d73977a64d56da2b156f3d6a11bbe Author: Stephane Glondu Date: Fri Jul 29 19:45:25 2011 +0200 Recommend ocaml-findlib diff --git a/debian/control b/debian/control index 83ea99a..e0b1f0c 100644 --- a/debian/control +++ b/debian/control @@ -32,6 +32,7 @@ Depends: libcamomile-ocaml-data (= ${source:Version}), ${shlibs:Depends}, ${ocaml:Depends} Provides: ${ocaml:Provides} +Recommends: ocaml-findlib Description: Unicode library for OCaml Camomile is a comprehensive Unicode library for objective caml language. The library is currently designed to conform Unicode Standard 3.2. -- camomile 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] camomile packaging branch, master, updated. debian/0.7.2-2-17-gb2e6e45
The following commit has been merged in the master branch: commit ad8f48f8d2ac2a77cfcf34f7f3f83e4bd427f810 Author: Stephane Glondu Date: Fri Jul 29 19:15:31 2011 +0200 Bump Standards-Version to 3.9.2 diff --git a/debian/control b/debian/control index 1291614..83ea99a 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: cdbs (>= 0.4.23-1.1), ocaml-findlib (>= 1.2.4-2), dh-ocaml (>= 0.9.1), camlp4 -Standards-Version: 3.8.3 +Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camomile.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camomile.git Homepage: http://sourceforge.net/projects/camomile/ -- camomile 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] camomile packaging branch, master, updated. debian/0.7.2-2-17-gb2e6e45
The following commit has been merged in the master branch: commit 81fea5ba04b821048569ed9402c643d79e3c1862 Author: Stephane Glondu Date: Fri Jul 29 19:43:17 2011 +0200 Refresh pot file diff --git a/debian/xml-man/po4a/po/camomile-man.pot b/debian/xml-man/po4a/po/camomile-man.pot index 0bf0327..4f97964 100644 --- a/debian/xml-man/po4a/po/camomile-man.pot +++ b/debian/xml-man/po4a/po/camomile-man.pot @@ -7,13 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-07-02 22:00+\n" +"POT-Creation-Date: 2011-07-29 19:24+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: ENCODING" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" #. type: Content of the debian entity #: debian/xml-man/en/camomilecharmap.xml:4 debian/xml-man/en/camomilelocaledef.xml:4 debian/xml-man/en/license.xml:4 -- camomile 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] camomile packaging branch, master, updated. debian/0.7.2-2-17-gb2e6e45
The following commit has been merged in the master branch: commit 8954ddf8efd48a057f4337d7936491af639678ff Author: Stephane Glondu Date: Fri Jul 29 19:06:05 2011 +0200 Complete switch to 3.0 (quilt) diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..845ca06 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.pc diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 62605d2..000 --- a/debian/README.source +++ /dev/null @@ -1,5 +0,0 @@ -This package use dpatch for patching the source. - -Please consider reading dpatch manpage to patch the source. - - -- Sylvain Le Gall Sun, 22 Jun 2008 23:26:52 +0200 diff --git a/debian/control b/debian/control index 5a4b449..1291614 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ Maintainer: Debian OCaml Maintainers Uploaders: Sylvain Le Gall Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 7), - dpatch, ocaml-nox (>= 3.11.1), po4a, docbook-xml (>= 4.4), docbook-xsl, libxml2-utils, xsltproc, ocaml-findlib (>= 1.2.4-2), diff --git a/debian/gbp.conf b/debian/gbp.conf index cec628c..4f24002 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,2 +1,3 @@ [DEFAULT] pristine-tar = True +compression = bzip2 diff --git a/debian/rules b/debian/rules index abc7987..365abc4 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,6 @@ include /usr/share/cdbs/1/rules/ocaml.mk include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/dpatch.mk include /usr/share/cdbs/1/class/autotools.mk include $(CURDIR)/debian/mk/docbook-manpage.mk diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/local-options b/debian/source/local-options new file mode 100644 index 000..c4cf480 --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1,2 @@ +abort-on-upstream-changes +unapply-patches -- camomile 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] camomile packaging branch, master, updated. debian/0.7.2-2-17-gb2e6e45
The following commit has been merged in the master branch: commit 52f6e63fb723a3bcdc436cb5184664dcd106ae8b Author: Stephane Glondu Date: Fri Jul 29 19:03:01 2011 +0200 Refresh patches (and switch to quilt) diff --git a/debian/patches/0001-Makefile.patch b/debian/patches/0001-Makefile.patch new file mode 100644 index 000..400d194 --- /dev/null +++ b/debian/patches/0001-Makefile.patch @@ -0,0 +1,37 @@ +From: Sylvain Le Gall +Date: Fri, 29 Jul 2011 19:01:30 +0200 +Subject: Makefile + +--- + Makefile.in |6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 28ca896..e1fc579 100644 +--- a/Makefile.in b/Makefile.in +@@ -70,12 +70,12 @@ OFLAGS = $(OOPTIONS) $(INCLUDES) + # Generic targets + # + +-all : byte $(OCAMLBEST) opt unidata unimaps charmap_data locale_data ++all : byte $(OCAMLBEST) unidata unimaps charmap_data locale_data + + # Build the library + ### + +-lib : byte $(OCAMLBEST) opt ++lib : byte $(OCAMLBEST) + + NOOBJ_INT= \ + public/unicodeString.cmi configInt.cmi internal/uReStrParserType.cmi +@@ -412,7 +412,7 @@ install-with-ocamlfind: + if [ -f camomile.cma ]; then files="camomile.cma $$files"; fi&& \ + if [ -f camomile.cmxa ]; then files="camomile.cmxa $$files"; fi&& \ + if [ -f camomile.a ]; then files="camomile.a $$files"; fi && \ +- ocamlfind install camomile $$files META $(MLI) camomileLibrary.cmi camomileLibraryDefault.cmi camomileLibraryDyn.cmi ++ ocamlfind install $(OCAMLFIND_INSTALL_FLAGS) camomile $$files META $(MLI) camomileLibrary.cmi camomileLibraryDefault.cmi camomileLibraryDyn.cmi + + install-data: + mkdir -p '$(DATADIR)' +-- diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index f0be4dd..000 --- a/debian/patches/00list +++ /dev/null @@ -1 +0,0 @@ -makefile diff --git a/debian/patches/fix_bigarray.dpatch b/debian/patches/fix_bigarray.dpatch deleted file mode 100644 index a37b409..000 --- a/debian/patches/fix_bigarray.dpatch +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -e -## fix_bigarray.dpatch by Sylvain Le Gall -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -if [ $# -ne 1 ]; then -echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" -exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch}" - -case "$1" in - -patch) patch $patch_opts -p1 < $0;; - -unpatch) patch $patch_opts -p1 -R < $0;; -*) -echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" -exit 1;; -esac - -exit 0 - -@DPATCH@ -diff -urNad /mnt/nfs0/gildor/deb/cvs-package/camomile/camomile-0.4.1/META camomile-0.4.1/META /mnt/nfs0/gildor/deb/cvs-package/camomile/camomile-0.4.1/META 2003-09-21 18:33:12.0 +0200 -+++ camomile-0.4.1/META2003-09-21 18:52:21.0 +0200 -@@ -1,6 +1,6 @@ - name="camomile" - version="0.4.1" - description="Unicode library for ocaml" --requires="" -+requires="bigarray" - archive(byte)="camomile.cma" - archive(native)="camomile.cmxa" -diff -urNad /mnt/nfs0/gildor/deb/cvs-package/camomile/camomile-0.4.1/public/camomile.ml camomile-0.4.1/public/camomile.ml /mnt/nfs0/gildor/deb/cvs-package/camomile/camomile-0.4.1/public/camomile.ml 2003-09-21 18:33:54.0 +0200 -+++ camomile-0.4.1/public/camomile.ml 2003-09-21 18:52:36.0 +0200 -@@ -100,7 +100,7 @@ - - let add_array x a = - expand x (x.len + Array.length a); -- Array.blit a 0 x.buf 0 (Array.length a); -+ Array.blit a 0 x.buf x.len (Array.length a); - x.len <- x.len + Array.length a - - let add_xarray x1 x2 = diff --git a/debian/patches/makefile.dpatch b/debian/patches/makefile.dpatch deleted file mode 100755 index 862d57d..000 --- a/debian/patches/makefile.dpatch +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -e -## makefile.dpatch by Sylvain Le Gall -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -if [ $# -ne 1 ]; then -echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" -exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch}" - -case "$1" in - -patch) patch $patch_opts -p1 < $0;; - -unpatch) patch $patch_opts -p1 -R < $0;; -*) -echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" -exit 1;; -esac - -exit 0 - -@DPATCH@ -diff -urNad camomile-0.7.1~/Makefile.in camomile-0.7.1/Makefile.in camomile-0.7.1~/Makefile.in2006-08-14 13:35:01.0 +0200 -+++ camomile-0.7.1/Makefile.in 2006-10-18 01:06:35.0 +0200 -@@ -61,12 +61,12 @@ - # Generic targets - # - --all : byte $(OCAMLBEST) opt unidata unim
[Pkg-ocaml-maint-commits] [SCM] camomile packaging branch, master, updated. debian/0.7.2-2-17-gb2e6e45
The following commit has been merged in the master branch: commit 9f5bd34c8fd8f346e18737c53b18a379d90e8b24 Author: Stephane Glondu Date: Fri Jul 29 19:06:57 2011 +0200 Delete trailing whitespaces diff --git a/debian/changelog b/debian/changelog index 53b8332..3b3b0fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,7 +43,7 @@ camomile (0.7.1-4) experimental; urgency=low [ Romain Beauxis ] * Upload to experimental to build against ocaml 3.11 - * Versioned ocaml-relared build-deps to avoid confusion. + * Versioned ocaml-relared build-deps to avoid confusion. * Added build-dep on dh-ocaml. -- Romain Beauxis Sun, 14 Dec 2008 00:11:29 +0100 @@ -100,7 +100,7 @@ camomile (0.6.5-1) unstable; urgency=low * Acknowledge NMU from Ralf Treinen (thanks for doing it), * Upgrade standards version to 3.7.2.0 (no change), * Apply a tip to made the package binNMU safe, thanks to Aaron M. Ucko, for -suggesting to use dpkg-dev(>= 1.13.19) and substituting ${source:Version} +suggesting to use dpkg-dev(>= 1.13.19) and substituting ${source:Version} for ${Source-Version} (Closes: #370007), * Add debian-ocaml-ma...@lists.debian.org as uploaders... because this package stands in the pkg-ocaml-maint snv repository, diff --git a/debian/control b/debian/control index 73945ab..5a4b449 100644 --- a/debian/control +++ b/debian/control @@ -3,13 +3,13 @@ Section: ocaml Priority: optional Maintainer: Debian OCaml Maintainers Uploaders: Sylvain Le Gall -Build-Depends: cdbs (>= 0.4.23-1.1), - debhelper (>= 7), - dpatch, - ocaml-nox (>= 3.11.1), - po4a, docbook-xml (>= 4.4), docbook-xsl, libxml2-utils, xsltproc, - ocaml-findlib (>= 1.2.4-2), - dh-ocaml (>= 0.9.1), +Build-Depends: cdbs (>= 0.4.23-1.1), + debhelper (>= 7), + dpatch, + ocaml-nox (>= 3.11.1), + po4a, docbook-xml (>= 4.4), docbook-xsl, libxml2-utils, xsltproc, + ocaml-findlib (>= 1.2.4-2), + dh-ocaml (>= 0.9.1), camlp4 Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camomile.git @@ -21,23 +21,23 @@ Architecture: all Suggests: libcamomile-ocaml-dev Depends: ${misc:Depends} Description: Unicode data for OCaml - Camomile is a comprehensive Unicode library for objective caml language. + Camomile is a comprehensive Unicode library for objective caml language. The library is currently designed to conform Unicode Standard 3.2. . This package contains the data needed by camomile. - + Package: libcamomile-ocaml-dev Architecture: any -Depends: libcamomile-ocaml-data (= ${source:Version}), - ${misc:Depends}, - ${shlibs:Depends}, +Depends: libcamomile-ocaml-data (= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends}, ${ocaml:Depends} Provides: ${ocaml:Provides} Description: Unicode library for OCaml - Camomile is a comprehensive Unicode library for objective caml language. + Camomile is a comprehensive Unicode library for objective caml language. The library is currently designed to conform Unicode Standard 3.2. . - Normalisers (NFD, NFKD, NFC, NFKC) and collator (string comparison) pass - the conformance tests defined Unicode Technical Reports. Collator is also + Normalisers (NFD, NFKD, NFC, NFKC) and collator (string comparison) pass + the conformance tests defined Unicode Technical Reports. Collator is also tested to Canadian, Thai and Japanese standards with their locales. diff --git a/debian/rules b/debian/rules index c30cb03..abc7987 100755 --- a/debian/rules +++ b/debian/rules @@ -42,7 +42,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := --datadir=/usr/share PO4A_SOURCES := $(CURDIR)/debian/xml-man/po4a/po4a.cfg DOCBOOK_MANPAGE_SOURCES := $(CURDIR)/debian/xml-man/en/camomilecharmap.xml \ - $(CURDIR)/debian/xml-man/en/camomilelocaledef.xml + $(CURDIR)/debian/xml-man/en/camomilelocaledef.xml DOCBOOK_MANPAGE_EXTRA_SOURCES := $(CURDIR)/debian/xml-man/en/license.xml \ $(CURDIR)/debian/xml-man/en/refentryinfo.xml -- camomile 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] camomile packaging branch, master, updated. debian/0.7.2-2-17-gb2e6e45
The following commit has been merged in the master branch: commit 556582fe0f90c3f88ac1ddb80ffa004aa2d89d80 Author: Stephane Glondu Date: Fri Jul 29 18:56:18 2011 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index 036ad54..53b8332 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +camomile (0.8.3-1) UNRELEASED; urgency=low + + * New upstream release + + -- Stéphane Glondu Fri, 29 Jul 2011 18:56:12 +0200 + camomile (0.7.2-2) unstable; urgency=low * Upgrade standards-version to 3.8.3 (no change) -- camomile 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] camomile packaging branch, master, updated. debian/0.7.2-2-17-gb2e6e45
The following commit has been merged in the master branch: commit 6585ffbd1618d375cf86a42e6ebac6abb81c8972 Merge: 13086525508c10957beb94b054c186b6dc8ecea1 35eb7302929cc0347122bc2feb34b819ac5dd230 Author: Stephane Glondu Date: Fri Jul 29 18:55:52 2011 +0200 Merge commit 'upstream/0.8.3' -- camomile 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