[Pkg-ocaml-maint-commits] [SCM] ocaml-gettext packaging branch, master, updated. debian/0.3.3-1
Sylvain Le Gall
gildor at debian.org
Tue Nov 3 23:17:00 UTC 2009
The following commit has been merged in the master branch:
commit 272b72bebc8b88e06dd91ba2164725b9e446fb79
Author: Sylvain Le Gall <gildor at debian.org>
Date: Tue Nov 3 22:40:52 2009 +0000
New upstream release
* New upstream release (Closes: #551234)
* Remove all patches (applied upstream), comment dpatch
build-dependency
* Use dh-ocaml 0.9 features, tighten dependency on camomile for automatic
dependencies computation
* Upgrade Standards-Version to 3.8.3 (section ocaml)
diff --git a/debian/changelog b/debian/changelog
index 5787151..fbcc686 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-ocaml-gettext (0.3.2-3) UNRELEASED; urgency=low
+ocaml-gettext (0.3.3-1) unstable; urgency=low
- * Patch TopMakefile to avoid generating gettextConfig.mli when
- installing (Closes: #537011)
+ * New upstream release (Closes: #551234)
+ * Remove all patches (applied upstream), comment dpatch
+ build-dependency
+ * Use dh-ocaml 0.9 features, tighten dependency on camomile for automatic
+ dependencies computation
+ * Upgrade Standards-Version to 3.8.3 (section ocaml)
- -- Sylvain Le Gall <gildor at debian.org> Tue, 14 Jul 2009 17:37:31 +0000
+ -- Sylvain Le Gall <gildor at debian.org> Tue, 03 Nov 2009 22:10:05 +0000
ocaml-gettext (0.3.2-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 8de6df7..a0b0eca 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
Source: ocaml-gettext
-Section: libdevel
+Section: ocaml
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Sylvain Le Gall <gildor at debian.org>
@@ -7,20 +7,20 @@ Build-Depends: cdbs (>= 0.4.52),
ocaml-nox (>= 3.11),
debhelper (>> 5),
ocaml-findlib,
- dpatch,
- libcamomile-ocaml-dev,
+ libcamomile-ocaml-dev (>= 0.7.2-2),
libfileutils-ocaml-dev,
xsltproc, docbook-xml, docbook-xsl,
camlp4, camlp4-extra,
- dh-ocaml (>= 0.4.1)
-Standards-Version: 3.8.0
+ dh-ocaml (>= 0.9.1)
+Standards-Version: 3.8.3
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}, ${misc:Depends}
+Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${ocaml:Provides}
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.
@@ -33,7 +33,11 @@ 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}), ${misc:Depends}
+Depends: libcamomile-ocaml-dev,
+ libfileutils-ocaml-dev,
+ libgettext-ocaml (= ${binary:Version}),
+ ${misc:Depends}, ${ocaml:Depends}
+Provides: ${ocaml:Provides}
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/patches/00list b/debian/patches/00list
index 5552eaa..e69de29 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1 +0,0 @@
-camlp4_311
diff --git a/debian/patches/camlp4_311.dpatch b/debian/patches/camlp4_311.dpatch
deleted file mode 100755
index 346da8f..0000000
--- a/debian/patches/camlp4_311.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /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/patches/dont-generate-mli-file.dpatch b/debian/patches/dont-generate-mli-file.dpatch
deleted file mode 100755
index 0820c21..0000000
--- a/debian/patches/dont-generate-mli-file.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## dont-generate-mli-file.dpatch by Sylvain Le Gall <gildor at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: avoid generating additional file at build time.
-
- at DPATCH@
-diff -urNad ocaml-gettext~/TopMakefile ocaml-gettext/TopMakefile
---- ocaml-gettext~/TopMakefile 2009-07-14 17:34:14.000000000 +0000
-+++ ocaml-gettext/TopMakefile 2009-07-14 17:36:01.000000000 +0000
-@@ -96,7 +96,8 @@
-
- # Build the lib
- ONLY_BYTE=$(filter-out %.o,$(filter-out %.a,$(filter-out %.cmx, $(filter-out %.cmxa,$(1))))) $(filter lib%.a,$(1))
--GET_MLI=$(filter %.mli,$(patsubst %.cmi,%.mli,$(1)))
-+ML_OR_MLI=$(if $(wildcard $(1).mli),$(1).mli,$(1).ml)
-+GET_MLI=$(foreach interf,$(patsubst %.mli,%,$(filter %.mli,$(patsubst %.cmi,%.mli,$(1)))),$(call ML_OR_MLI,$(interf)))
-
- %.cmxa %.a %.so:
- $(if $(STUBSOBJS), \
diff --git a/debian/rules b/debian/rules
index abe4cdd..fc7a6ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,10 +17,10 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
# MA 02110-1301, USA.
+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/rules/dpatch.mk
include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/ocaml.mk
PACKAGE=libgettext-ocaml
DESTDIR=$(CURDIR)/debian/$(PACKAGE)
--
ocaml-gettext packaging
More information about the Pkg-ocaml-maint-commits
mailing list