[Pkg-ocaml-maint-commits] [SCM] advi packaging branch, master, updated. debian/1.9.0-1-4-g4a818ac

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 31c04ddb092f1c497c28263d7e3309cabeea7db7
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue Jan 4 03:06:25 2011 +0100

    enable linking --as-needed

diff --git a/debian/changelog b/debian/changelog
index ea5fa51..62d30ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-advi (1.9.0-2) UNRELEASED; urgency=low
+advi (1.9.0-2) experimental; urgency=low
 
   * Removed ghostscript from the dependencies of advi-examples
+  * Patch linker_as_needed: enable linking with --as-needed flag. Thanks
+    to Stefan Potyra for the  patch! (closes: #607530).
 
- -- Ralf Treinen <treinen at debian.org>  Tue, 01 Jun 2010 20:44:34 +0200
+ -- Ralf Treinen <treinen at debian.org>  Tue, 04 Jan 2011 03:05:32 +0100
 
 advi (1.9.0-1) unstable; urgency=low
 
diff --git a/debian/patches/linker_as_needed b/debian/patches/linker_as_needed
new file mode 100644
index 0000000..828e90b
--- /dev/null
+++ b/debian/patches/linker_as_needed
@@ -0,0 +1,61 @@
+Description: enable linking with --as-needed
+Author: Stefan Potyra <sistpoty at ubuntu.com>
+Integrated: Ralf Treinen <treinen at debian.org>
+Debian-bug: 607530:
+
+Index: advi-1.9.0/src/Makefile.am
+===================================================================
+--- advi-1.9.0.orig/src/Makefile.am	2010-03-24 08:52:41.000000000 +0100
++++ advi-1.9.0/src/Makefile.am	2010-12-19 15:32:36.392866917 +0100
+@@ -75,7 +75,7 @@
+ COBJS           = $(CSOURCES:.c=.o)
+ 
+ AM_CFLAGS	= $(XINERAMA_CFLAGS) $(X_CFLAGS)
+-AM_LINKFLAGS	= $(XINERAMA_LIBS)
++LDADD		= $(XINERAMA_LIBS)
+ AM_OCAMLCFLAGS	= $(CAMLIMAGES_INCLUDES)
+ 
+ OTHER_LIBS	= unix str
+@@ -85,12 +85,12 @@
+ advi$(EXEEXT): $(COBJS) $(OCAMLOPTOBJS)
+ 	$(OCAMLOPT) -o advi$(EXEEXT) \
+ 		$(OCAMLCFLAGS) $(AM_OCAMLCFLAGS) $(AM_LINKFLAGS) \
+-		$(COBJS) $(OCAMLLIBS_OPT) $(OCAMLOPTOBJS)
++		$(COBJS) $(OCAMLLIBS_OPT) $(OCAMLOPTOBJS) $(LDADD)
+ 
+ advi.byt$(EXEEXT): $(COBJS) $(OCAMLBYTOBJS)
+ 	$(OCAMLC) -o advi.byt$(EXEEXT) \
+ 		$(OCAMLCFLAGS) $(AM_OCAMLCFLAGS) $(AM_LINKFLAGS) -custom \
+-		$(COBJS) $(OCAMLLIBS_BYT) $(OCAMLBYTOBJS)
++		$(COBJS) $(OCAMLLIBS_BYT) $(OCAMLBYTOBJS) $(LDADD)
+ 
+ install_hook: $(INSTALLEXEC) installdata
+ 	- texhash
+Index: advi-1.9.0/src/Makefile.in
+===================================================================
+--- advi-1.9.0.orig/src/Makefile.in	2010-12-19 15:33:10.582866917 +0100
++++ advi-1.9.0/src/Makefile.in	2010-12-19 15:34:47.332866917 +0100
+@@ -253,7 +253,7 @@
+ OCAMLOPTOBJS = $(OCAMLBUILTSOURCES:.ml=.cmx) $(OCAMLSOURCES:.ml=.cmx)
+ COBJS = $(CSOURCES:.c=.o)
+ AM_CFLAGS = $(XINERAMA_CFLAGS) $(X_CFLAGS)
+-AM_LINKFLAGS = $(XINERAMA_LIBS)
++LDADD = $(XINERAMA_LIBS)
+ AM_OCAMLCFLAGS = $(CAMLIMAGES_INCLUDES)
+ OTHER_LIBS = unix str
+ OCAMLLIBS_OPT = $(CAMLIMAGES_LIBS_NATIVE) $(OTHER_LIBS:=.cmxa)
+@@ -519,12 +519,12 @@
+ advi$(EXEEXT): $(COBJS) $(OCAMLOPTOBJS)
+ 	$(OCAMLOPT) -o advi$(EXEEXT) \
+ 		$(OCAMLCFLAGS) $(AM_OCAMLCFLAGS) $(AM_LINKFLAGS) \
+-		$(COBJS) $(OCAMLLIBS_OPT) $(OCAMLOPTOBJS)
++		$(COBJS) $(OCAMLLIBS_OPT) $(OCAMLOPTOBJS) $(LDADD)
+ 
+ advi.byt$(EXEEXT): $(COBJS) $(OCAMLBYTOBJS)
+ 	$(OCAMLC) -o advi.byt$(EXEEXT) \
+ 		$(OCAMLCFLAGS) $(AM_OCAMLCFLAGS) $(AM_LINKFLAGS) -custom \
+-		$(COBJS) $(OCAMLLIBS_BYT) $(OCAMLBYTOBJS)
++		$(COBJS) $(OCAMLLIBS_BYT) $(OCAMLBYTOBJS) $(LDADD)
+ 
+ install_hook: $(INSTALLEXEC) installdata
+ 	- texhash
diff --git a/debian/patches/series b/debian/patches/series
index 076d1c4..12a9965 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ no-local-advirc
 typo-message
 manpage
 examples-distclean
+linker_as_needed

-- 
advi packaging