[Pkg-ocaml-maint-commits] r4886 - in /trunk/packages/matita/trunk/debian: changelog patches/00list patches/matita.conf.xml.in.dpatch patches/native-compilers.dpatch patches/numbers.dpatch

Tue Dec 11 13:23:27 UTC 2007

Author: gareuselesinge
Date: Tue Dec 11 13:23:27 2007
New Revision: 4886

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4886
Log:
disallowd native compilers on alpha and ia64, documented patches

Added:
    trunk/packages/matita/trunk/debian/patches/native-compilers.dpatch   (with props)
Modified:
    trunk/packages/matita/trunk/debian/changelog
    trunk/packages/matita/trunk/debian/patches/00list
    trunk/packages/matita/trunk/debian/patches/matita.conf.xml.in.dpatch
    trunk/packages/matita/trunk/debian/patches/numbers.dpatch

Modified: trunk/packages/matita/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/matita/trunk/debian/changelog?rev=4886&op=diff
==============================================================================

--- trunk/packages/matita/trunk/debian/changelog (original)
+++ trunk/packages/matita/trunk/debian/changelog Tue Dec 11 13:23:27 2007
@@ -1,6 +1,6 @@
-matita (0.4.98-5) UNRELEASED; urgency=low
+matita (0.4.98-5) unstable; urgency=low
 
-  * UNRELEASED
+  * Added patch to disallow native compilers on alpha and ia64
 
  -- Enrico Tassi <gareuselesinge at debian.org>  Sat, 08 Dec 2007 11:29:31 +0100
 

Modified: trunk/packages/matita/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/matita/trunk/debian/patches/00list?rev=4886&op=diff
==============================================================================
--- trunk/packages/matita/trunk/debian/patches/00list (original)
+++ trunk/packages/matita/trunk/debian/patches/00list Tue Dec 11 13:23:27 2007
@@ -1,2 +1,3 @@
 matita.conf.xml.in.dpatch
 numbers.dpatch
+native-compilers.dpatch

Modified: trunk/packages/matita/trunk/debian/patches/matita.conf.xml.in.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/matita/trunk/debian/patches/matita.conf.xml.in.dpatch?rev=4886&op=diff
==============================================================================
--- trunk/packages/matita/trunk/debian/patches/matita.conf.xml.in.dpatch (original)
+++ trunk/packages/matita/trunk/debian/patches/matita.conf.xml.in.dpatch Tue Dec 11 13:23:27 2007
@@ -2,7 +2,7 @@
 ## matita.conf.xml.in.dpatch by Enrico Tassi <gareuselesinge at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: patch to use sqlite backend in the default configuration
 
 @DPATCH@
 diff -urNad trunk~/matita/matita.conf.xml.in trunk/matita/matita.conf.xml.in

Added: trunk/packages/matita/trunk/debian/patches/native-compilers.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/matita/trunk/debian/patches/native-compilers.dpatch?rev=4886&op=file
==============================================================================
--- trunk/packages/matita/trunk/debian/patches/native-compilers.dpatch (added)
+++ trunk/packages/matita/trunk/debian/patches/native-compilers.dpatch Tue Dec 11 13:23:27 2007
@@ -1,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## native-compilers.dpatch by Enrico Tassi <gareuselesinge at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: disable native compilers on ia64 and alpha
+
+ at DPATCH@
+diff -urNad trunk~/Makefile.defs.in trunk/Makefile.defs.in
+--- trunk~/Makefile.defs.in	2007-11-25 15:36:52.000000000 +0100
++++ trunk/Makefile.defs.in	2007-12-11 14:20:44.000000000 +0100
+@@ -5,7 +5,17 @@
+ endif
+ CAMLP5O = @CAMLP5O@
+ LABLGLADECC = @LABLGLADECC@
+-HAVE_OCAMLOPT = @HAVE_OCAMLOPT@
++# debian specific limitation of architecture on which native compilers are used
++ifeq "$(shell dpkg-architecture -qDEB_HOST_ARCH)" "alpha"
++	HAVE_OCAMLOPT = no
++else 
++ifeq "$(shell dpkg-architecture -qDEB_HOST_ARCH)" "ia64"
++	HAVE_OCAMLOPT = no
++else
++	HAVE_OCAMLOPT = @HAVE_OCAMLOPT@
++endif
++endif
++
+ DISTRIBUTED = @DISTRIBUTED@
+ 
+ MATITA_REQUIRES = @FINDLIB_REQUIRES@

Propchange: trunk/packages/matita/trunk/debian/patches/native-compilers.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/matita/trunk/debian/patches/numbers.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/matita/trunk/debian/patches/numbers.dpatch?rev=4886&op=diff
==============================================================================
--- trunk/packages/matita/trunk/debian/patches/numbers.dpatch (original)
+++ trunk/packages/matita/trunk/debian/patches/numbers.dpatch Tue Dec 11 13:23:27 2007
@@ -2,7 +2,7 @@
 ## numbers.dpatch by Enrico Tassi <gareuselesinge at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: disable Coq numbers
 
 @DPATCH@
 diff -urNad trunk~/components/cic_disambiguation/number_notation.ml trunk/components/cic_disambiguation/number_notation.ml


