[Pkg-ocaml-maint-commits] [SCM] camomile packaging branch, master, updated. debian/0.7.1-5-1-g3de057a
Sylvain Le Gall
gildor at debian.org
Thu Mar 5 12:51:59 UTC 2009
The following commit has been merged in the master branch:
commit 5441fa503c871264bde1e41a2dfadf8ed12dde72
Author: Sylvain Le Gall <gildor at debian.org>
Date: Thu Mar 5 13:49:34 2009 +0100
Transition to OCaml 3.11 (dh_ocaml)
* Remove obsolete debian/control.in related variables and files
* Remove dpkg-dev build-dependency since source:Version is now
standard
* Add dh-ocaml build-dependency (rules/ocaml.mk)
* Set maintainer to Debian OCaml Maintainers
* Upgrade debian/compat to 7 (use debian/clean)
* Upgrade Standards-Version to 3.8.0 (debian/README.source)
* Add Homepage field to debian/control
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..62605d2
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,5 @@
+This package use dpatch for patching the source.
+
+Please consider reading dpatch manpage to patch the source.
+
+ -- Sylvain Le Gall <gildor at debian.org> Sun, 22 Jun 2008 23:26:52 +0200
diff --git a/debian/changelog b/debian/changelog
index e68c762..d99bdd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
-camomile (0.7.1-5) UNRELEASED; urgency=low
+camomile (0.7.1-5) unstable; urgency=low
* Switch packaging to git
-
- -- Sylvain Le Gall <gildor at debian.org> Wed, 04 Mar 2009 23:46:24 +0100
+ * Remove obsolete debian/control.in related variables and files
+ * Remove dpkg-dev build-dependency since source:Version is now
+ standard
+ * Add dh-ocaml build-dependency (rules/ocaml.mk)
+ * Set maintainer to Debian OCaml Maintainers
+ * Upgrade debian/compat to 7 (use debian/clean)
+ * Upgrade Standards-Version to 3.8.0 (debian/README.source)
+ * Add Homepage field to debian/control
+
+ -- Sylvain Le Gall <gildor at debian.org> Thu, 05 Mar 2009 12:41:41 +0100
camomile (0.7.1-4) experimental; urgency=low
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..62c3be3
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,10 @@
+config.log
+config.status
+config.cache
+toolslib/toolslib.a
+toolslib/colParser.output
+internal/uReStrParser.output
+META
+debian/xml-man/en/camomilecharmap.1
+debian/xml-man/en/camomilelocaledef.1
+camomileDefaultConfig.ml
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 08621e1..c8ef6f8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,26 @@
Source: camomile
Section: libdevel
Priority: optional
-Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.11.0-1), po4a, docbook-xml (>= 4.4), docbook-xsl, libxml2-utils, xsltproc, ocaml-findlib (>= 1.2.3), dpkg-dev (>= 1.13.19), dh-ocaml,
- camlp4 (>= 3.11.0-1)
-Standards-Version: 3.7.2
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
+Uploaders: Sylvain Le Gall <gildor at debian.org>
+Build-Depends: cdbs (>= 0.4.23-1.1),
+ debhelper (>= 7),
+ dpatch,
+ ocaml-nox (>= 3.11),
+ po4a, docbook-xml (>= 4.4), docbook-xsl, libxml2-utils, xsltproc,
+ ocaml-findlib (>= 1.2.4),
+ dh-ocaml (>= 0.4.1),
+ camlp4 (>= 3.11)
+Standards-Version: 3.8.0
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
Architecture: all
Suggests: libcamomile-ocaml-dev
+Depends: ${misc:Depends}
Description: Unicode data for OCaml
Camomile is a comprehensive Unicode library for objective caml language.
The library is currently designed to conform Unicode Standard 3.2.
@@ -21,7 +30,7 @@ Description: Unicode data for OCaml
Package: libcamomile-ocaml-dev
Section: libdevel
Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libcamomile-ocaml-data (= ${source:Version})
+Depends: ocaml-nox-${F:OCamlABI}, libcamomile-ocaml-data (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
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.
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index fe357dc..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,32 +0,0 @@
-Source: camomile
-Section: libdevel
-Priority: optional
-Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: @cdbs@, ocaml-findlib (>= 1.2.3), dpkg-dev (>= 1.13.19), dh-ocaml,
- camlp4 (>= 3.11.0-1)
-Standards-Version: 3.7.2
-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/camomile/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camomile/trunk/
-
-Package: libcamomile-ocaml-data
-Section: libdevel
-Architecture: all
-Suggests: libcamomile-ocaml-dev
-Description: Unicode data for OCaml
- 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
-Section: libdevel
-Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libcamomile-ocaml-data (= ${source:Version})
-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.
- .
- 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/copyright b/debian/copyright
index 48096d2..2a2fabf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,30 +1,47 @@
-This package was debianized by Sylvain Le Gall <gildor at debian.org> on
-Wed, 20 Sep 2003 17:50:39 +0200.
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Upstream-Author: Yamagata Yoriyuki <yori at sourceforge.net>
+Packaged-By: Sylvain Le Gall <gildor at debian.org>
+Packaged-Date: Wed, 20 Sep 2003 17:50:39 +0200
+Original-Source-Location: http://camomile.sourceforge.net/
-It was downloaded from :
+Files: *
+Copyright: (C) 2001-2006 Yamagata Yoriyuki
+License: LGPL-2.1
-http://camomile.sourceforge.net/
+Files: configure.in, Makefile.in
+Copyright: Jean-Christophe Filliatre
+License: LGPL
-Upstream Authors:
- Yamagata Yoriyuki <yori at sourceforge.net>
-
-Components licence:
- configure.in Makefile.in : Jean-Christophe FILLIATRE
- Licensed by LGPL
-
- locales : International Business Machines :
- derived from the ICU package.
-
- mappings : Free Software Foundation :
- derived from glibc. Licensed by LGPL
-
- unidata : Unicode Inc. : see README.unidata of package
- libcamomile-ocaml-data
-
-
-Copyright:
This Library is distributed under the terms of the GNU Library General
Public License version 2.1.
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+Files: locales/*
+Copyright: (C) 1997-2002 International Business Machines
+License: other
+
+Derived from the ICU package.
+
+Files: charmaps/*
+Copyright: (C) Free Software Foundation
+License: other
+
+Derived from glibc (iconv). Distribution and use, even for commercial purpose,
+is free.
+
+Files: unidata/*
+Copyright: (C) 1991-2008 Unicode Inc.
+License:
+
+The file allkey.txt is obtained from Unicode Consortium Web site. Its copyright
+is owned by Unicode Consortium. Its use, reproduction, distribution are
+permitted under the term of http://www.unicode.org/copyright.html.
+
+See README.unidata of package libcamomile-ocaml-data.
+
+Files: debian/*
+Copyright: (C) 2006-2008 Sylvain Le Gall
+License: GPL-2+
+
diff --git a/debian/patches/makefile.dpatch b/debian/patches/makefile.dpatch
old mode 100644
new mode 100755
diff --git a/debian/rules b/debian/rules
index 137a727..7b1e801 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
# debian/rules for camomile package
-# Copyright (C) 2006 Sylvain Le Gall <gildor at debian.org>
+# Copyright (C) 2006-2008 Sylvain Le Gall <gildor at debian.org>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
@@ -17,13 +17,10 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
# MA 02110-1301, USA.
-# Generate debian/control using
-# fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
-
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 /usr/share/cdbs/1/class/ocaml.mk
+include /usr/share/cdbs/1/rules/ocaml.mk
include $(CURDIR)/debian/mk/docbook-manpage.mk
PACKAGE_DEV := libcamomile-ocaml-dev
@@ -51,21 +48,8 @@ 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))
-
OCAML_OCAMLDOC_PACKAGES_DOCBASE := libcamomile-ocaml-dev
clean::
- -$(RM) "$(CURDIR)/config.log"
- -$(RM) "$(CURDIR)/config.status"
- -$(RM) "$(CURDIR)/config.cache"
- -$(RM) "$(CURDIR)/Makefile"
- -$(RM) -r "$(CURDIR)/dochtml"
- -$(RM) "$(CURDIR)/toolslib/toolslib.a"
- -$(RM) "$(CURDIR)/toolslib/colParser.output"
- -$(RM) "$(CURDIR)/internal/uReStrParser.output"
- -$(RM) "$(CURDIR)/META"
- -$(RM) "$(CURDIR)/camomileDefaultConfig.ml"
- -$(RM) "$(CURDIR)/debian/libcamomile-ocaml-dev.dirs"
- -$(RM) "$(CURDIR)/libcamomile-ocaml-dev.dirs"
- -$(RM) "$(CURDIR)/debian/libcamomile-ocaml-dev.doc-base.ocamldoc-apiref"
+ -$(RM) '$(CURDIR)/Makefile'
+ -$(RM) -r '$(CURDIR)/dochtml'
diff --git a/debian/xml-man/po4a/po/camomile-man.pot b/debian/xml-man/po4a/po/camomile-man.pot
index 039cf61..5900f3e 100644
--- a/debian/xml-man/po4a/po/camomile-man.pot
+++ b/debian/xml-man/po4a/po/camomile-man.pot
@@ -1,12 +1,13 @@
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-06-24 16:56+0100\n"
+"POT-Creation-Date: 2009-03-05 12:47+0100\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"
@@ -43,17 +44,9 @@ msgstr ""
#: debian/xml-man/en/camomilecharmap.xml:51
msgid ""
"&dhprg; <arg choice=\"opt\">-d <arg choice=\"req\"> "
-"<replaceable>dir</replaceable> </arg> </arg>"
-msgstr ""
-
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><group>
-#: debian/xml-man/en/camomilecharmap.xml:58 debian/xml-man/en/camomilelocaledef.xml:63
-msgid "<arg choice=\"plain\">-help</arg> <arg choice=\"plain\">--help</arg>"
-msgstr ""
-
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: debian/xml-man/en/camomilecharmap.xml:61
-msgid "<arg choice=\"opt\"> <replaceable>file</replaceable> </arg>"
+"<replaceable>dir</replaceable> </arg> </arg> <group> <arg "
+"choice=\"plain\">-help</arg> <arg choice=\"plain\">--help</arg> </group> "
+"<arg choice=\"opt\"> <replaceable>file</replaceable> </arg>"
msgstr ""
# type: Content of: <refentry><refsect1><title>
@@ -121,6 +114,13 @@ msgstr ""
msgid "SEE ALSO"
msgstr ""
+# 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
#: debian/xml-man/en/camomilelocaledef.xml:5
msgid "<command>camomilelocaledef</command>"
@@ -136,12 +136,9 @@ msgstr ""
msgid ""
"&dhprg; <arg choice=\"opt\">--enc <arg choice=\"req\"> "
"<replaceable>encoding</replaceable> </arg> </arg> <arg choice=\"opt\">--file "
-"<arg choice=\"req\"> <replaceable>file</replaceable> </arg> </arg>"
-msgstr ""
-
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: debian/xml-man/en/camomilelocaledef.xml:66
-msgid "<arg choice=\"opt\"> <replaceable>dir</replaceable> </arg>"
+"<arg choice=\"req\"> <replaceable>file</replaceable> </arg> </arg> <group> "
+"<arg choice=\"plain\">-help</arg> <arg choice=\"plain\">--help</arg> "
+"</group> <arg choice=\"opt\"> <replaceable>dir</replaceable> </arg>"
msgstr ""
# type: Content of: <refentry><refsect1><para>
@@ -182,6 +179,13 @@ msgstr ""
msgid "Output directory. If omitted, default to the current directory."
msgstr ""
+# 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>
#: debian/xml-man/en/license.xml:32
msgid "LICENSE"
--
camomile packaging
More information about the Pkg-ocaml-maint-commits
mailing list