[Pkg-ocaml-maint-commits] [SCM] ocaml-gettext packaging branch, master, updated. debian/0.3.2-2
Sylvain Le Gall
gildor at debian.org
Tue Mar 17 23:44:32 UTC 2009
The following commit has been merged in the master branch:
commit 23d9cc90e21a0e4ef8d4fd58f2ae93613efd3cd4
Author: Sylvain Le Gall <gildor at debian.org>
Date: Wed Mar 18 00:43:46 2009 +0100
Prepare upload for OCaml transition 3.11
* Set maintainer to Debian OCaml Maintainers
* Add dh-ocaml build-dependency (rules/ocaml.mk)
* Upgrade Standards-Version to 3.8.0 (debian/README.source)
* Add ${misc:Depends} to dependencies
* Update debian/copyright file to use
http://wiki.debian.org/Proposals/CopyrightFormat
* Add patch camlp4_311 to fix missing dynlink.cma
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 a3dc070..276c78c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
-ocaml-gettext (0.3.2-2) UNRELEASED; urgency=low
+ocaml-gettext (0.3.2-2) unstable; urgency=low
- * NOT RELEASED YET
* Switch packaging to git
+ * Set maintainer to Debian OCaml Maintainers
+ * Add dh-ocaml build-dependency (rules/ocaml.mk)
+ * Upgrade Standards-Version to 3.8.0 (debian/README.source)
+ * Add ${misc:Depends} to dependencies
+ * Update debian/copyright file to use
+ http://wiki.debian.org/Proposals/CopyrightFormat
+ * Add patch camlp4_311 to fix missing dynlink.cma
-- Sylvain Le Gall <gildor at debian.org> Tue, 03 Mar 2009 19:57:03 +0100
diff --git a/debian/control b/debian/control
index 2744fa0..8de6df7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,26 @@
Source: ocaml-gettext
Section: libdevel
Priority: optional
-Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4.52), ocaml-nox (>= 3.10.1), debhelper (>> 5), ocaml-findlib, dpatch, libcamomile-ocaml-dev, libfileutils-ocaml-dev, xsltproc, docbook-xml, docbook-xsl, camlp4, camlp4-extra
-Standards-Version: 3.7.3
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
+Uploaders: Sylvain Le Gall <gildor at debian.org>
+Build-Depends: cdbs (>= 0.4.52),
+ ocaml-nox (>= 3.11),
+ debhelper (>> 5),
+ ocaml-findlib,
+ dpatch,
+ libcamomile-ocaml-dev,
+ libfileutils-ocaml-dev,
+ xsltproc, docbook-xml, docbook-xsl,
+ camlp4, camlp4-extra,
+ dh-ocaml (>= 0.4.1)
+Standards-Version: 3.8.0
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-gettext.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-gettext.git
Homepage: http://le-gall.net/sylvain+violaine/ocaml-gettext.html
Package: libgettext-ocaml
Architecture: any
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
Description: OCaml internationalization shared library
This library provides utilities and libraries to enable localization
in OCaml programs. It is based on the same principle of GNU gettext.
@@ -23,7 +33,7 @@ Description: OCaml internationalization shared library
Package: libgettext-ocaml-dev
Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libcamomile-ocaml-dev, libfileutils-ocaml-dev, libgettext-ocaml (= ${binary:Version})
+Depends: ocaml-nox-${F:OCamlABI}, libcamomile-ocaml-dev, libfileutils-ocaml-dev, libgettext-ocaml (= ${binary:Version}), ${misc:Depends}
Description: OCaml internationalization library
This library provides utilities and libraries to enable localization
in OCaml programs. It is based on the same principle of GNU gettext.
diff --git a/debian/copyright b/debian/copyright
index 71ed637..225e635 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,31 +1,35 @@
-This package was debianized by Sylvain Le Gall <gildor at debian.org> on
-Tue, 29 Apr 2008 18:00:47 +0200.
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Upstream-Author: Sylvain Le Gall
+Packaged-By: Sylvain Le Gall <gildor at debian.org>
+Packaged-Date: Tue, 29 Apr 2008 18:00:47 +0200.
+Original-Source-Location: http://le-gall.net/sylvain+violaine/download/
-It was downloaded from :
-
-http://le-gall.net/sylvain+violaine/download/
-
-Copyright:
-
- Copyright (C) 2003-2008 Sylvain Le Gall
-
-License:
+Files: *
+Copyright: (C) 2003-2008 Sylvain Le Gall
+License: LGPL-2.1+
This package 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; version 2.1 dated February, 1999.
with OCaml static compilation exception.
- This package 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 package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
- USA.
+ As a special exception to the GNU Library General Public License, you
+ may link, statically or dynamically, a "work that uses the Library"
+ with a publicly distributed version of the Library to produce an
+ executable file containing portions of the Library, and distribute
+ that executable file under terms of your choice, without any of the
+ additional requirements listed in clause 6 of the GNU Library General
+ Public License. By "a publicly distributed version of the Library",
+ we mean either the unmodified Library as distributed by INRIA, or a
+ modified version of the Library that is distributed under the
+ conditions defined in clause 3 of the GNU Library General Public
+ License. This exception does not however invalidate any other reasons
+ why the executable file might be covered by the GNU Library General
+ Public License.
On Debian GNU/Linux systems, the complete text of the GNU Lesser General
Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+File: debian/*
+Copyright: (C) 2008 Sylvain Le Gall
+Licences: GPL-2+
diff --git a/debian/patches/00list b/debian/patches/00list
index e69de29..5552eaa 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -0,0 +1 @@
+camlp4_311
diff --git a/debian/patches/camlp4_311.dpatch b/debian/patches/camlp4_311.dpatch
new file mode 100755
index 0000000..346da8f
--- /dev/null
+++ b/debian/patches/camlp4_311.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## camlp4_311.dpatch by Sylvain Le Gall <gildor at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use dynlink with camlp4lib.
+
+ at DPATCH@
+diff -urNad ocaml-gettext~/ocaml-gettext/Makefile ocaml-gettext/ocaml-gettext/Makefile
+--- ocaml-gettext~/ocaml-gettext/Makefile 2009-03-18 00:32:22.000000000 +0100
++++ ocaml-gettext/ocaml-gettext/Makefile 2009-03-18 00:33:38.000000000 +0100
+@@ -63,7 +63,7 @@
+
+ ocaml-xgettext: $(BUILDBIN)
+ $(OCAMLC) \
+- -I +camlp4 camlp4lib.cma \
++ -I +camlp4 dynlink.cma camlp4lib.cma \
+ unix.cma \
+ `$(OCAMLFIND) query -r -predicates byte gettext.extract -i-format` \
+ `$(OCAMLFIND) query -r -predicates byte gettext.extract -a-format` \
diff --git a/debian/rules b/debian/rules
index c6fa848..abe4cdd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,8 +20,7 @@
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
PACKAGE=libgettext-ocaml
DESTDIR=$(CURDIR)/debian/$(PACKAGE)
@@ -41,8 +40,8 @@ DEB_CONFIGURE_EXTRA_FLAGS += \
install/$(PACKAGE_DEV):: install/$(PACKAGE)
mv $(DESTDIR_DEV)/usr/share/locale/* \
- $(DESTDIR)/usr/share/locale/
+ '$(DESTDIR)/usr/share/locale/'
$(RM) -r $(DESTDIR_DEV)/usr/share/locale
mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/gettext-stub/*.so \
- $(DESTDIR)/$(OCAML_DLL_DIR)
+ '$(DESTDIR)/$(OCAML_DLL_DIR)'
--
ocaml-gettext packaging
More information about the Pkg-ocaml-maint-commits
mailing list