[Pkg-ocaml-maint-commits] [SCM] advi packaging branch, experimental, updated. debian/1.6.0-13-56-g070ca49

[Ralf Treinen]

The following commit has been merged in the experimental branch:
commit 775c822896b903393f04c60d4d12a34c9c10d3a2
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue Mar 2 20:59:19 2010 +0100

    bytecode-compilation without -custom

diff --git a/debian/changelog b/debian/changelog
index 3cf8976..4dcdfd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,7 @@ advi (1.8-1) experimental; urgency=low
       applied to the copy which now in debian/examples-source. These patches
       are therefore just stored in debian/examples-source/patches:
         0003-Don-t-call-advi-on-example-build-generation
+	0006-Enable-build-and-install-on-architectures-with-only.patch
         0007-Fix-examples-includes
         0008-Fix-mon_seminar
         0009-Fix-test-includes.patch
@@ -46,6 +47,9 @@ advi (1.8-1) experimental; urgency=low
         0014-xanim-xanimate.patch
         0016-example-makefiles-texinputs.patch
         0017-Don-t-compile-tests-which-fail-with-texlive.patch 
+  * New patches:
+    - byte-compilation-no-custom: do not use -custom in bytecode compilation
+      (closes: Bug#517546).
   
   [ Stefano Zacchiroli ]
   * fix vcs-svn field to point just above the debian/ dir
@@ -58,7 +62,7 @@ advi (1.8-1) experimental; urgency=low
   * Replace obsolete build-dep on x-dev (Closes: #515364)
   * Switch packaging to git
 
- -- Ralf Treinen <treinen at debian.org>  Mon, 01 Mar 2010 23:15:48 +0100
+ -- Ralf Treinen <treinen at debian.org>  Tue, 02 Mar 2010 20:58:12 +0100
 
 advi (1.6.0-13) unstable; urgency=low
 
diff --git a/debian/patches/byte-compilation-no-custom b/debian/patches/byte-compilation-no-custom
new file mode 100644
index 0000000..168f4ba
--- /dev/null
+++ b/debian/patches/byte-compilation-no-custom
@@ -0,0 +1,13 @@
+Index: advi/src/Makefile.in
+===================================================================
+--- advi.orig/src/Makefile.in	2010-03-02 20:54:53.000000000 +0100
++++ advi/src/Makefile.in	2010-03-02 20:55:01.000000000 +0100
+@@ -522,7 +522,7 @@
+ 
+ advi.byt$(EXEEXT): $(COBJS) $(OCAMLBYTOBJS)
+ 	$(OCAMLC) -o advi.byt$(EXEEXT) \
+-		$(OCAMLCFLAGS) $(AM_OCAMLCFLAGS) $(AM_LINKFLAGS) -custom \
++		$(OCAMLCFLAGS) $(AM_OCAMLCFLAGS) $(AM_LINKFLAGS) \
+ 		$(COBJS) $(OCAMLLIBS_BYT) $(OCAMLBYTOBJS)
+ 
+ install_hook: $(INSTALLEXEC) installdata
diff --git a/debian/patches/series b/debian/patches/series
index 4925614..616f3ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 japanese-fonts
 cache-dir-tilde-expansion
+byte-compilation-no-custom
diff --git a/debian/rules b/debian/rules
index eb0c0e6..ba8a8e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,4 +22,8 @@ override_dh_auto-build:
 
 override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/advi
+ifeq ($(OPT),true)
 	-rm -f $(CURDIR)/debian/advi/usr/bin/advi.byt
+else
+	cd $(CURDIR)/debian/advi/usr/bin && mv -f advi.byt advi
+endif

-- 
advi packaging