[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 241e594dcb75d3ead2589c13bb6bdc0498018f3e
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue Mar 2 21:12:05 2010 +0100

    disable patch byte-compilation-no-custom for now, needs more work

diff --git a/debian/changelog b/debian/changelog
index 4dcdfd0..cba1d9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,10 +47,7 @@ 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
 
diff --git a/debian/patches/0006-Enable-build-and-install-on-architectures-with-only.patch b/debian/patches/0006-Enable-build-and-install-on-architectures-with-only.patch
deleted file mode 100644
index a736dea..0000000
--- a/debian/patches/0006-Enable-build-and-install-on-architectures-with-only.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 105762633f49295f1cbde1bcc5c4ce52f8dede9e Mon Sep 17 00:00:00 2001
-From: Sven Luther <luther at debian.org>
-Date: Fri, 24 Apr 2009 00:12:06 +0200
-Subject: [PATCH] Enable build and install on architectures with only a bytecode compiler
-
----
- configure |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure b/configure
-index a7d0355..2bdad18 100755
---- a/configure
-+++ b/configure
-@@ -1715,7 +1715,7 @@ if test "$PATH_CAMLOPT" = "nope"; then
-   echo "to install the ocamlopt compiler if available"
-   echo "in your OS."
-   echo "*******************************************"
--  INSTALLTARGET="i_want_opt"
-+  INSTALLTARGET="advi.byt"
- else
-   if test -f "$CAMLIMAGESDIR/ci_ps.cmxa"; then
-     INSTALLTARGET="advi.bin"
--- 
-1.6.2.1
-
diff --git a/debian/patches/series b/debian/patches/series
index 616f3ba..4925614 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 japanese-fonts
 cache-dir-tilde-expansion
-byte-compilation-no-custom

-- 
advi packaging