[Pkg-ocaml-maint-commits] [SCM] ocaml-gettext packaging branch, master, updated. debian/0.3.3-1-11-g383f46d
The following commit has been merged in the master branch: commit 19c591f05e57281ce00fdcd2a4b60a14dfce Author: Stephane Glondu st...@glondu.net Date: Fri Aug 12 08:02:48 2011 +0200 Switch source package format to 3.0 (quilt) 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 gil...@debian.org Sun, 22 Jun 2008 23:26:52 +0200 diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index e69de29..000 diff --git a/debian/rules b/debian/rules index fc7a6ed..27255d9 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 PACKAGE=libgettext-ocaml 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 -- ocaml-gettext 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] ocaml-gettext packaging branch, master, updated. debian/0.3.3-1-11-g383f46d
The following commit has been merged in the master branch:
commit 5ea908417403830eb470690993e70e0af9745515
Author: Stephane Glondu st...@glondu.net
Date: Fri Aug 12 08:05:47 2011 +0200
Delete trailing whitespaces
diff --git a/debian/changelog b/debian/changelog
index 0a459c0..2207799 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,7 +29,7 @@ ocaml-gettext (0.3.2-2) unstable; urgency=low
* 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
+ * Add patch camlp4_311 to fix missing dynlink.cma
-- Sylvain Le Gall gil...@debian.org Tue, 03 Mar 2009 19:57:03 +0100
diff --git a/debian/control b/debian/control
index 4c4967d..22bfa83 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,12 @@ Priority: optional
Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org
Uploaders: Sylvain Le Gall gil...@debian.org
Build-Depends: cdbs (= 0.4.52~),
- ocaml-nox (= 3.11),
- debhelper ( 5),
- ocaml-findlib,
+ ocaml-nox (= 3.11),
+ debhelper ( 5),
+ ocaml-findlib,
libcamomile-ocaml-dev (= 0.7.2-2~),
- libfileutils-ocaml-dev,
- xsltproc, docbook-xml, docbook-xsl,
+ libfileutils-ocaml-dev,
+ xsltproc, docbook-xml, docbook-xsl,
camlp4, camlp4-extra,
dh-ocaml (= 0.9.1~)
Standards-Version: 3.8.3
@@ -21,7 +21,7 @@ Package: libgettext-ocaml
Architecture: any
Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
Provides: ${ocaml:Provides}
-Description: OCaml internationalization shared library
+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,9 +33,9 @@ Description: OCaml internationalization shared library
Package: libgettext-ocaml-dev
Architecture: any
-Depends: libcamomile-ocaml-dev,
- libfileutils-ocaml-dev,
- libgettext-ocaml (= ${binary:Version}),
+Depends: libcamomile-ocaml-dev,
+ libfileutils-ocaml-dev,
+ libgettext-ocaml (= ${binary:Version}),
${misc:Depends}, ${ocaml:Depends}
Provides: ${ocaml:Provides}
Description: OCaml internationalization library
diff --git a/debian/rules b/debian/rules
index 27255d9..fa9f581 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,8 +28,8 @@ PACKAGE_DEV=libgettext-ocaml-dev
DESTDIR_DEV=$(CURDIR)/debian/$(PACKAGE_DEV)
DEB_MAKE_CLEAN_TARGET:= distclean
-DEB_MAKE_BUILD_TARGET:= all
-DEB_MAKE_INSTALL_TARGET := install
+DEB_MAKE_BUILD_TARGET:= all
+DEB_MAKE_INSTALL_TARGET := install
DEB_CONFIGURE_EXTRA_FLAGS += \
--prefix='$(DESTDIR_DEV)/usr'
DEB_CONFIGURE_EXTRA_FLAGS += \
--
ocaml-gettext 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] ocaml-gettext packaging annotated tag, debian/0.3.4-1, created. debian/0.3.4-1
The annotated tag, debian/0.3.4-1 has been created at 2fc5e01e8aa4b6d4e95c986b1ba1c32024114b8d (tag) tagging 383f46d7972c76eeaa6e232b8f34d115ad5847f5 (commit) replaces debian/0.3.3-1 tagged by Stephane Glondu on Fri Aug 12 08:19:09 2011 +0200 - Shortlog Debian release 0.3.4-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJORMXdAAoJEHhT2k1JiBrT2GQP/itarjsnUdDflZhU9EOSYhC0 4CITrmokP+zGR5ckzo1xzYLdoZGCASNKg9D0QUofrT8Vw5AoL7cUKslvXTrLnAGt fuku1fEuXQiGpO41WRz8MLTl1ibONqzJzbpHIy/fPjmEvyC52kJYa8IQf+rNtZjm 13JDcPgewQ9+bcg71E0pLIn1VbksCpigmCMUbuhMDL6OnGvqPRIeHnuN9+bV7Oq0 9XfHqcA3EnzswucS95fgSi9rAKH40SKYBjsCWqabEwpCUK8gcFSdKYVHiXdUbqMH TAoXoVEglK/G1wg9Ntmfp8fXh+hzTSbIRzy4azjmCbqnq1gQ/hZs9jH4kAOhk9q9 SMMxbn0O86sbN1MibSg67vfB3PQyEQBmwKb9xyNqBdksQ0cNJgM2wr4nBOQpq+vn xCOgXNphcG3jhqyYrQG0U6jkAk+5ogwmDabY5Eis/qz+pcQ8k8O3k2FTKogIiQSP tAqD2VdAsNJv6YScHCKPCXUuQoZq5pmTlxPbpxFTLFKYTxeGcuNA9owsJrGboI/n qQGSuO5FmLhwsZTHN8lWQWQtPLB02R3N+EA9BC58u5opvTqBD3aWQTziJh7JEOW1 E9wPLQkGpG0GJ6HuzHiHLYE3XhdrJTjeQ/07SmS+XdR4Q0ilv/fFdUe2Yk+HijND L9mC3d+Hvi15/z4oJrq4 =eQQ+ -END PGP SIGNATURE- Stephane Glondu (8): Fix versioned build-deps to ensure smoother backports Switch source package format to 3.0 (quilt) Delete trailing whitespaces libgettext-ocaml-dev suggests ocaml-findlib Bump versioned build-dep to libcamomile-ocaml-dev Bump debhelper compatibility level to 8 Bump Standards-Version to 3.9.2 (no changes) Update changelog and prepare upload to unstable Sylvain Le Gall (3): Imported Upstream version 0.3.4 Merge commit 'upstream/0.3.4' New upstream release and new homepage --- -- ocaml-gettext 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] ocaml-gettext packaging branch, master, updated. debian/0.3.3-1-11-g383f46d
The following commit has been merged in the master branch: commit 97bdf053e25fdb10d3e5593231b8336e544bcf7a Author: Stephane Glondu st...@glondu.net Date: Fri Aug 12 08:10:17 2011 +0200 Bump Standards-Version to 3.9.2 (no changes) diff --git a/debian/control b/debian/control index 1ff0e0c..31e7c03 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: cdbs (= 0.4.52~), xsltproc, docbook-xml, docbook-xsl, camlp4, camlp4-extra, dh-ocaml (= 0.9.1~) -Standards-Version: 3.8.3 +Standards-Version: 3.9.2 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://forge.ocamlcore.org/projects/ocaml-gettext/ -- ocaml-gettext 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] ocaml-gettext packaging branch, master, updated. debian/0.3.3-1-11-g383f46d
The following commit has been merged in the master branch: commit beab8af9fb8377b56fc5bde074d4df749c703e32 Author: Stephane Glondu st...@glondu.net Date: Fri Aug 12 08:08:24 2011 +0200 Bump versioned build-dep to libcamomile-ocaml-dev diff --git a/debian/control b/debian/control index 112b5b9..d46d858 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: cdbs (= 0.4.52~), ocaml-nox (= 3.11), debhelper ( 5), ocaml-findlib, - libcamomile-ocaml-dev (= 0.7.2-2~), + libcamomile-ocaml-dev (= 0.8), libfileutils-ocaml-dev, xsltproc, docbook-xml, docbook-xsl, camlp4, camlp4-extra, -- ocaml-gettext 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] OCaml packaging branch, master, updated. debian/3.12.0-7-13-g0b471ac
The following commit has been merged in the master branch:
commit 14afd32fcdb89f99a4b51ec435c40ecf90e92afe
Author: Stephane Glondu st...@glondu.net
Date: Fri Aug 12 21:17:37 2011 +0200
ocamlopt/arm: add .type directive for code symbols (LP: #810402)
diff --git
a/debian/patches/0013-ocamlopt-arm-add-.type-directive-for-code-symbols.patch
b/debian/patches/0013-ocamlopt-arm-add-.type-directive-for-code-symbols.patch
new file mode 100644
index 000..fca359a
--- /dev/null
+++
b/debian/patches/0013-ocamlopt-arm-add-.type-directive-for-code-symbols.patch
@@ -0,0 +1,124 @@
+From: Stephane Glondu st...@glondu.net
+Date: Fri, 12 Aug 2011 21:13:17 +0200
+Subject: ocamlopt/arm: add .type directive for code symbols
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/810402
+Signed-off-by: Stephane Glondu st...@glondu.net
+---
+ asmcomp/arm/emit.mlp |1 +
+ asmrun/arm.S | 12
+ 2 files changed, 13 insertions(+), 0 deletions(-)
+
+diff --git a/asmcomp/arm/emit.mlp b/asmcomp/arm/emit.mlp
+index 2003313..a4b2241 100644
+--- a/asmcomp/arm/emit.mlp
b/asmcomp/arm/emit.mlp
+@@ -556,6 +556,7 @@ let fundecl fundecl =
+ ` .text\n`;
+ ` .align 2\n`;
+ ` .global {emit_symbol fundecl.fun_name}\n`;
++ ` .type {emit_symbol fundecl.fun_name}, %function\n`;
+ `{emit_symbol fundecl.fun_name}:\n`;
+ let n = frame_size() in
+ ignore(emit_stack_adjustment sub n);
+diff --git a/asmrun/arm.S b/asmrun/arm.S
+index 164f731..1313e9c 100644
+--- a/asmrun/arm.S
b/asmrun/arm.S
+@@ -24,6 +24,7 @@ alloc_limit .reqr10
+ /* Allocation functions and GC interface */
+
+ .globl caml_call_gc
++.type caml_call_gc, %function
+ caml_call_gc:
+ /* Record return address and desired size */
+ /* Can use alloc_limit as a temporary since it will be reloaded by
+@@ -41,6 +42,7 @@ caml_call_gc:
+ bx lr
+
+ .globl caml_alloc1
++.type caml_alloc1, %function
+ caml_alloc1:
+ sub alloc_ptr, alloc_ptr, #8
+ cmp alloc_ptr, alloc_limit
+@@ -54,6 +56,7 @@ caml_alloc1:
+ b caml_alloc1
+
+ .globl caml_alloc2
++.type caml_alloc2, %function
+ caml_alloc2:
+ sub alloc_ptr, alloc_ptr, #12
+ cmp alloc_ptr, alloc_limit
+@@ -67,6 +70,7 @@ caml_alloc2:
+ b caml_alloc2
+
+ .globl caml_alloc3
++.type caml_alloc3, %function
+ caml_alloc3:
+ sub alloc_ptr, alloc_ptr, #16
+ cmp alloc_ptr, alloc_limit
+@@ -80,6 +84,7 @@ caml_alloc3:
+ b caml_alloc3
+
+ .globl caml_allocN
++.type caml_allocN, %function
+ caml_allocN:
+ sub alloc_ptr, alloc_ptr, r12
+ cmp alloc_ptr, alloc_limit
+@@ -134,6 +139,7 @@ caml_allocN:
+ /* Function to call is in r12 */
+
+ .globl caml_c_call
++.type caml_c_call, %function
+ caml_c_call:
+ /* Preserve return address in callee-save register r4 */
+ mov r4, lr
+@@ -160,6 +166,7 @@ caml_c_call:
+ /* Start the Caml program */
+
+ .globl caml_start_program
++.type caml_start_program, %function
+ caml_start_program:
+ ldr r12, .Lcaml_program
+
+@@ -235,6 +242,7 @@ caml_start_program:
+ /* Raise an exception from C */
+
+ .globl caml_raise_exception
++.type caml_raise_exception, %function
+ caml_raise_exception:
+ /* Reload Caml allocation pointers */
+ ldr r12, .Lcaml_young_ptr
+@@ -250,6 +258,7 @@ caml_raise_exception:
+ /* Callback from C to Caml */
+
+ .globl caml_callback_exn
++.type caml_callback_exn, %function
+ caml_callback_exn:
+ /* Initial shuffling of arguments (r0 = closure, r1 = first arg) */
+ mov r12, r0
+@@ -259,6 +268,7 @@ caml_callback_exn:
+ b .Ljump_to_caml
+
+ .globl caml_callback2_exn
++.type caml_callback2_exn, %function
+ caml_callback2_exn:
+ /* Initial shuffling of arguments (r0 = closure, r1 = arg1, r2 = arg2) */
+ mov r12, r0
+@@ -269,6 +279,7 @@ caml_callback2_exn:
+ b .Ljump_to_caml
+
+ .globl caml_callback3_exn
++.type caml_callback3_exn, %function
+ caml_callback3_exn:
+ /* Initial shuffling of arguments */
+ /* (r0 = closure, r1 = arg1, r2 = arg2, r3 = arg3) */
+@@ -281,6 +292,7 @@ caml_callback3_exn:
+ b .Ljump_to_caml
+
+ .globl caml_ml_array_bound_error
++.type caml_ml_array_bound_error, %function
+ caml_ml_array_bound_error:
+ /* Load address of [caml_array_bound_error] in r12 */
+ ldr r12, .Lcaml_array_bound_error
+--
diff --git a/debian/patches/series b/debian/patches/series
index c321cdf..8b210e3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
0010-Properly-initialize-executable-name-in-caml_startup_.patch
0011-Embed-bytecode-in-C-object-when-using-custom.patch
0012-Make-objinfo-show-force_link-and-ccobjs-ccopts-when-.patch
[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.12.0-7-13-g0b471ac
The following commit has been merged in the master branch: commit 0b471ac2c2f2ee92d7ff4bd5f78b80c8d70ced9f Author: Stephane Glondu st...@glondu.net Date: Fri Aug 12 21:20:36 2011 +0200 Update changelog diff --git a/debian/changelog b/debian/changelog index 7e80229..8c1a2cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,11 @@ ocaml (3.12.1-1) UNRELEASED; urgency=low + [ Stéphane Glondu ] * New upstream release (Closes: #634621) + * ocamlopt/arm: add .type directive for code symbols (LP: #810402) + + [ Mehdi Dogguy ] + * Make objinfo show force_link and ccobjs/ccopts when needed -- Stéphane Glondu glo...@debian.org Wed, 15 Jun 2011 18:19:01 +0200 -- OCaml 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
