[Pkg-ocaml-maint-commits] [SCM] camomile packaging branch, master, updated. debian/0.7.2-1

Sylvain Le Gall gildor at debian.org
Thu Jul 2 22:08:27 UTC 2009


The following commit has been merged in the master branch:
commit 4485f4791902d81b04a84fc1657d9c98e0adf28c
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Thu Jul 2 22:05:48 2009 +0000

    New upstream version and OCaml 3.11.1 transition
    
    * New Upstream Version
    * Upgrade standards-version to 3.8.2 (section ocaml)
    * Tighten Build Depends for OCaml 3.11.1 transition (findlib)

diff --git a/debian/changelog b/debian/changelog
index cf1f831..77e946a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-camomile (0.7.1-6) UNRELEASED; urgency=low
+camomile (0.7.2-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New Upstream Version
+  * Upgrade standards-version to 3.8.2 (section ocaml)
+  * Tighten Build Depends for OCaml 3.11.1 transition (findlib)
 
- -- Sylvain Le Gall <gildor at debian.org>  Thu, 05 Mar 2009 13:51:55 +0100
+ -- Sylvain Le Gall <gildor at debian.org>  Thu, 02 Jul 2009 21:58:22 +0000
 
 camomile (0.7.1-5) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c8ef6f8..ef24042 100644
--- a/debian/control
+++ b/debian/control
@@ -6,18 +6,18 @@ Uploaders: Sylvain Le Gall <gildor at debian.org>
 Build-Depends: cdbs (>= 0.4.23-1.1), 
  debhelper (>= 7), 
  dpatch, 
- ocaml-nox (>= 3.11), 
+ ocaml-nox (>= 3.11.1), 
  po4a, docbook-xml (>= 4.4), docbook-xsl, libxml2-utils, xsltproc, 
- ocaml-findlib (>= 1.2.4), 
+ ocaml-findlib (>= 1.2.4-2), 
  dh-ocaml (>= 0.4.1), 
- camlp4 (>= 3.11)
-Standards-Version: 3.8.0
+ camlp4
+Standards-Version: 3.8.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/
 
 Package: libcamomile-ocaml-data
-Section: libdevel
+Section: ocaml
 Architecture: all
 Suggests: libcamomile-ocaml-dev
 Depends: ${misc:Depends}
@@ -28,7 +28,7 @@ Description: Unicode data for OCaml
  This package contains the data needed by camomile.
  
 Package: libcamomile-ocaml-dev
-Section: libdevel
+Section: ocaml
 Architecture: any
 Depends: ocaml-nox-${F:OCamlABI}, libcamomile-ocaml-data (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} 
 Description: Unicode library for OCaml
diff --git a/debian/xml-man/po4a/po/camomile-man.pot b/debian/xml-man/po4a/po/camomile-man.pot
index 5900f3e..0bf0327 100644
--- a/debian/xml-man/po4a/po/camomile-man.pot
+++ b/debian/xml-man/po4a/po/camomile-man.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-03-05 12:47+0100\n"
+"POT-Creation-Date: 2009-07-02 22:00+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -15,32 +15,42 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: ENCODING"
 
-# type: Content of the debian entity
+#. 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
 msgid "Debian GNU/Linux"
 msgstr ""
 
-# type: Content of the dhprg entity
+#. type: Content of the dhprg entity
 #: debian/xml-man/en/camomilecharmap.xml:5
 msgid "<command>camomilecharmap</command>"
 msgstr ""
 
-# type: Content of the camomile entity
+#. type: Content of the camomile entity
 #: debian/xml-man/en/camomilecharmap.xml:6 debian/xml-man/en/camomilelocaledef.xml:6
 msgid "camomile"
 msgstr ""
 
-# type: Content of: <refentry><refnamediv><refname>
+#. type: Content of: <refentry><refmeta><refentrytitle>
+#: debian/xml-man/en/camomilecharmap.xml:39
+msgid "CAMOMILECHARMAP"
+msgstr ""
+
+#. type: Content of: <refentry><refmeta><manvolnum>
+#: debian/xml-man/en/camomilecharmap.xml:40 debian/xml-man/en/camomilelocaledef.xml:40
+msgid "1"
+msgstr ""
+
+#. type: Content of: <refentry><refnamediv><refname>
 #: debian/xml-man/en/camomilecharmap.xml:44 debian/xml-man/en/camomilelocaledef.xml:44
 msgid "&dhprg;"
 msgstr ""
 
-# type: Content of: <refentry><refnamediv><refpurpose>
+#. type: Content of: <refentry><refnamediv><refpurpose>
 #: debian/xml-man/en/camomilecharmap.xml:46
 msgid "a charmap database translators for &camomile;."
 msgstr ""
 
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
+#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
 #: debian/xml-man/en/camomilecharmap.xml:51
 msgid ""
 "&dhprg; <arg choice=\"opt\">-d <arg choice=\"req\"> "
@@ -49,24 +59,24 @@ msgid ""
 "<arg choice=\"opt\"> <replaceable>file</replaceable> </arg>"
 msgstr ""
 
-# type: Content of: <refentry><refsect1><title>
+#. type: Content of: <refentry><refsect1><title>
 #: debian/xml-man/en/camomilecharmap.xml:68 debian/xml-man/en/camomilelocaledef.xml:73
 msgid "DESCRIPTION"
 msgstr ""
 
-# type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><para>
 #: debian/xml-man/en/camomilecharmap.xml:70 debian/xml-man/en/camomilelocaledef.xml:75
 msgid "This manual page documents briefly the &dhprg; command."
 msgstr ""
 
-# type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><para>
 #: debian/xml-man/en/camomilecharmap.xml:72 debian/xml-man/en/camomilelocaledef.xml:77
 msgid ""
 "This manual page was written for the &debian; distribution because the "
 "original program does not have a manual page."
 msgstr ""
 
-# type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><para>
 #: debian/xml-man/en/camomilecharmap.xml:75
 msgid ""
 "&dhprg; is made to convert standard charmap file into "
@@ -74,64 +84,69 @@ msgid ""
 "the internal database format of &camomile;."
 msgstr ""
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: debian/xml-man/en/camomilecharmap.xml:82
-msgid "-d <parameter>dir</parameter>"
+msgid "<option>-d <parameter>dir</parameter> </option>"
 msgstr ""
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: debian/xml-man/en/camomilecharmap.xml:87
 msgid "Output directory."
 msgstr ""
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: debian/xml-man/en/camomilecharmap.xml:93 debian/xml-man/en/camomilelocaledef.xml:109
-msgid "-help"
+msgid "<option>-help</option>"
 msgstr ""
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: debian/xml-man/en/camomilecharmap.xml:96 debian/xml-man/en/camomilelocaledef.xml:112
-msgid "--help"
+msgid "<option>--help</option>"
 msgstr ""
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: debian/xml-man/en/camomilecharmap.xml:99 debian/xml-man/en/camomilelocaledef.xml:115
 msgid "Display help message."
 msgstr ""
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: debian/xml-man/en/camomilecharmap.xml:105
 msgid "file"
 msgstr ""
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: debian/xml-man/en/camomilecharmap.xml:108
 msgid "Charmap file."
 msgstr ""
 
-# type: Content of: <refentry><refsect1><title>
+#. type: Content of: <refentry><refsect1><title>
 #: debian/xml-man/en/camomilecharmap.xml:116 debian/xml-man/en/camomilelocaledef.xml:132
 msgid "SEE ALSO"
 msgstr ""
 
-# type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><para>
 #: debian/xml-man/en/camomilecharmap.xml:119
 msgid ""
 "<citerefentry> <refentrytitle>camomilelocaledef</refentrytitle> "
 "<manvolnum>1</manvolnum> </citerefentry>"
 msgstr ""
 
-# type: Content of the dhprg entity
+#. type: Content of the dhprg entity
 #: debian/xml-man/en/camomilelocaledef.xml:5
 msgid "<command>camomilelocaledef</command>"
 msgstr ""
 
-# type: Content of: <refentry><refnamediv><refpurpose>
+#. type: Content of: <refentry><refmeta><refentrytitle>
+#: debian/xml-man/en/camomilelocaledef.xml:39
+msgid "CAMOMILELOCALEDEF"
+msgstr ""
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
 #: debian/xml-man/en/camomilelocaledef.xml:46
 msgid "a localedef database translators for &camomile;."
 msgstr ""
 
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
+#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
 #: debian/xml-man/en/camomilelocaledef.xml:51
 msgid ""
 "&dhprg; <arg choice=\"opt\">--enc <arg choice=\"req\"> "
@@ -141,7 +156,7 @@ msgid ""
 "</group> <arg choice=\"opt\"> <replaceable>dir</replaceable> </arg>"
 msgstr ""
 
-# type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><para>
 #: debian/xml-man/en/camomilelocaledef.xml:80
 msgid ""
 "&dhprg; is made to convert standard localedef file into "
@@ -149,77 +164,94 @@ msgid ""
 "file into the internal database format of &camomile;."
 msgstr ""
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: debian/xml-man/en/camomilelocaledef.xml:87
-msgid "--enc <parameter>encoding</parameter>"
+msgid "<option>--enc <parameter>encoding</parameter> </option>"
 msgstr ""
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: debian/xml-man/en/camomilelocaledef.xml:92
 msgid "Encoding used for reading the input file. If omitted, default to UTF-8."
 msgstr ""
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: debian/xml-man/en/camomilelocaledef.xml:98
-msgid "--file <parameter>file</parameter>"
+msgid "<option>--file <parameter>file</parameter> </option>"
 msgstr ""
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: debian/xml-man/en/camomilelocaledef.xml:103
 msgid "Input localedef file. If ommited, use <filename>stdin</filename>."
 msgstr ""
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: debian/xml-man/en/camomilelocaledef.xml:121
 msgid "dir"
 msgstr ""
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: debian/xml-man/en/camomilelocaledef.xml:124
 msgid "Output directory. If omitted, default to the current directory."
 msgstr ""
 
-# type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><para>
 #: debian/xml-man/en/camomilelocaledef.xml:135
 msgid ""
 "<citerefentry> <refentrytitle>camomilecharmap</refentrytitle> "
 "<manvolnum>1</manvolnum> </citerefentry>"
 msgstr ""
 
-# type: Content of: <refsect1><title>
+#. type: Content of: <refsect1><title>
 #: debian/xml-man/en/license.xml:32
 msgid "LICENSE"
 msgstr ""
 
-# type: Content of: <refsect1><para>
+#. type: Content of: <refsect1><para>
 #: debian/xml-man/en/license.xml:35
 msgid ""
 "This manual page was written by <personname> <firstname>Sylvain</firstname> "
 "<surname>Le Gall</surname> </personname> <email>gildor at debian.org</email> "
 "for the Debian GNU/Linux system (but may be used by others).  Permission is "
 "granted to copy, distribute and/or modify this document under the terms of "
-"the"
-msgstr ""
-
-# type: Content of: <refsect1><para><acronym>
-#: debian/xml-man/en/license.xml:43
-msgid "GNU"
-msgstr ""
-
-# type: Content of: <refsect1><para>
-#: debian/xml-man/en/license.xml:43
+"the <acronym>GNU</acronym> Lesser General Public License, Version 2.1 or any "
+"later version published by the Free Software Foundation; considering as "
+"source code all the file that enable the production of this manpage."
+msgstr ""
+
+#. **********************************************************************
+#.  refentryinfo.xml                                                     
+#.                                                                       
+#.  Copyright (C) 2006 Sylvain Le Gall <gildor at debian.org>
+#.                
+#.                                                                       
+#.  This library is free software; you can redistribute it and/or        
+#.  modify it under the terms of the GNU Lesser General Public           
+#.  License as published by the Free Software Foundation; either         
+#.  version 2.1 of the License, or (at your option) any later version;   
+#.  with the OCaml static compilation exception.                         
+#.                                                                       
+#.  This library is distributed in the hope that it will be useful,      
+#.  but WITHOUT ANY WARRANTY; without even the implied warranty of       
+#.  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU    
+#.  Lesser General Public License for more details.                      
+#.                                                                       
+#.  You should have received a copy of the GNU Lesser General Public     
+#.  License along with this library; if not, write to the Free Software  
+#.  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               
+#.  MA 02110-1301, USA.                                                  
+#.                                                                       
+#.  Contact: gildor at debian.org                                           
+#. **********************************************************************
+#. type: Content of: <refentryinfo>
+#: debian/xml-man/en/refentryinfo.xml:31
 msgid ""
-"Lesser General Public License, Version 2.1 or any later version published by "
-"the Free Software Foundation; considering as source code all the file that "
-"enable the production of this manpage."
-msgstr ""
-
-# type: Content of: <refentryinfo><copyright><holder>
-#: debian/xml-man/en/refentryinfo.xml:38
-msgid "Sylvain Le Gall"
+"  <author> <firstname>Sylvain</firstname> <surname>Le Gall</surname> "
+"<email>gildor at debian.org</email> </author> <copyright> <year>2006</year> "
+"<holder>Sylvain Le Gall</holder> </copyright> <date>Oct 23, 2006</date> "
+"<corpname>Debian</corpname>"
 msgstr ""
 
-# type: Content of: <refentryinfo><date>
-#: debian/xml-man/en/refentryinfo.xml:40
-msgid "Oct 23, 2006"
+#. type: Content of: outside any tag (error?)
+#: debian/xml-man/en/refentryinfo.xml:30
+msgid "<placeholder type=\"refentryinfo\" id=\"0\"/>"
 msgstr ""

-- 
camomile packaging



More information about the Pkg-ocaml-maint-commits mailing list