[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, 2.32.52/master, updated. debian/unison2.32.52-2.32.52-4-7-g78621c1

[Stephane Glondu]

The following commit has been merged in the 2.32.52/master branch:
commit e056b54cae25897894665f40f007204ed1c70125
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Jan 27 07:27:57 2012 +0100

    Fix link order (Closes: #657423)

diff --git a/debian/patches/0007-Fix-link-order-to-list-C-objects-before-the-librarie.patch b/debian/patches/0007-Fix-link-order-to-list-C-objects-before-the-librarie.patch
new file mode 100644
index 0000000..907276d
--- /dev/null
+++ b/debian/patches/0007-Fix-link-order-to-list-C-objects-before-the-librarie.patch
@@ -0,0 +1,26 @@
+From: Colin Watson <cjwatson at ubuntu.com>
+Date: Fri, 27 Jan 2012 07:25:23 +0100
+Subject: Fix link order to list C objects before the libraries they require
+
+Author: Colin Watson <cjwatson at ubuntu.com>
+Forwarded: yes
+Last-Update: 2011-09-10
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657423
+---
+ Makefile.OCaml |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.OCaml b/Makefile.OCaml
+index 00d6756..0fec866 100644
+--- a/Makefile.OCaml
++++ b/Makefile.OCaml
+@@ -366,7 +366,7 @@ win32rc/unison.res.lib: win32rc/unison.res
+ 
+ $(NAME)$(EXEC_EXT): $(CAMLOBJS) $(COBJS)
+ 	@echo Linking $@
+-	$(CAMLC) -verbose $(CAMLFLAGS) -o $@ $(CFLAGS) $(CAMLLIBS) $(CLIBS) $^
++	$(CAMLC) -verbose $(CAMLFLAGS) -o $@ $(CFLAGS) $(CAMLLIBS) $^ $(CLIBS)
+ 
+ # Unfortunately -output-obj does not put .o files into the output, only .cmx
+ # files, so we have to use $(LD) to take care of COBJS.
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 9c2a4c0..8ff2e73 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-Fix-silent-behaviour.patch
 0005-Fix-build-with-OCaml-3.12.patch
 0006-Fix-bad-interaction-with-OpenSSH-5.6.patch
+0007-Fix-link-order-to-list-C-objects-before-the-librarie.patch

-- 
unison packaging