[Pkg-ocaml-maint-commits] [SCM] matita packaging branch, master, updated. debian/0.5.8-4-16-g156f528

Enrico Tassi gareuselesinge at debian.org
Sun May 6 21:10:24 UTC 2012


The following commit has been merged in the master branch:
commit 156f5288de051c68fb6157ff66edf874bca1d6d0
Author: Enrico Tassi <gareuselesinge at debian.org>
Date:   Sun May 6 21:29:29 2012 +0200

    Matita 0.99.1 packaged

diff --git a/debian/changelog b/debian/changelog
index 2f1db80..f6d7adb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+matita (0.99.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Removed package matita-doc (doc is available via F1)
+  * Switch to dh
+  * Add matita.desktop
+  * Remove the following patches (integrated upstream):
+    - Fix-FTBFS-with-camlp5-6.05
+    - matita.conf.xml.in
+    - slist-sep
+    - numbers
+    - native-compilers
+  * New patch 'configure' to avoid useless build-dep on mysql ocaml bindings
+  * Cleanup debian 
+
+ -- Enrico Tassi <gareuselesinge at debian.org>  Sun, 06 May 2012 20:35:57 +0200
+
 matita (0.5.8-4) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+8
diff --git a/debian/control b/debian/control
index a742da1..fd6a7b2 100644
--- a/debian/control
+++ b/debian/control
@@ -8,21 +8,16 @@ Build-Depends:
  ocaml-findlib (>= 1.2.1-2),
  libgdome2-ocaml-dev,
  liblablgtk2-ocaml-dev,
- liblablgtkmathview-ocaml-dev (>= 0.7.8-3),
- libsqlite3-ocaml-dev,
  libocamlnet-ocaml-dev,
  libzip-ocaml-dev,
  libhttp-ocaml-dev,
  ocaml-ulex08 (>= 0.8-4),
  libexpat-ocaml-dev,
- debhelper (>= 5),
- cdbs,
- libmysql-ocaml-dev,
+ debhelper (>= 8),
  camlp5 (>= 5.04),
  liblablgtksourceview2-ocaml-dev,
- help2man,
- libgtkmathview-dev (>= 0.8.0-2)
-Build-Depends-Indep: xsltproc, dblatex, docbook-xsl, docbook-xml
+ autoconf,
+ help2man
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/matita.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/matita.git
@@ -32,25 +27,6 @@ Package: matita
 Architecture: any
 Depends: ${shlibs:Depends}, ${interpreter:Depends}, ${misc:Depends}
 Recommends: graphviz, yelp
-Suggests: matita-doc
-Conflicts: matita-standard-library
-Replaces: matita-standard-library
 Description: interactive theorem prover
  Matita is a graphical interactive theorem prover based on the Calculus of
  (Co)Inductive Constructions. 
- .
- Matita adopts XML-encoded proof objects are produced for storage and exchange.
- This makes it compatible, at some extent, with Coq.
- .
- The graphical interface has been inspired by CtCoq and Proof General. It
- supports high quality bidimensional rendering of proofs and formulae
- transformed on-the-fly to MathML markup
-
-Package: matita-doc
-Architecture: all
-Suggests: matita, yelp
-Depends: ${misc:Depends}
-Section: doc
-Description: user manual of the Matita interactive theorem prover
- This package contains the PDF and HTML formatted Matita user manual.
-
diff --git a/debian/matita-doc.doc-base b/debian/matita-doc.doc-base
deleted file mode 100644
index 3c68dbe..0000000
--- a/debian/matita-doc.doc-base
+++ /dev/null
@@ -1,12 +0,0 @@
-Document: matita-manual
-Title: Matita user manual
-Author: HELM Team
-Abstract: User manual of the Matita interactive theorem prover.
-Section: Science/Mathematics
-
-Format: PDF
-Files: /usr/share/doc/matita-doc/pdf/matita.pdf
-
-Format: HTML
-Index: /usr/share/doc/matita-doc/html/index.html
-Files: /usr/share/doc/matita-doc/html/*
diff --git a/debian/matita-standard-library.dirs b/debian/matita-standard-library.dirs
deleted file mode 100644
index a1564d1..0000000
--- a/debian/matita-standard-library.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/matita/ma/
-/usr/share/matita/xml/
diff --git a/debian/matita-standard-library.install b/debian/matita-standard-library.install
deleted file mode 100644
index 0627e08..0000000
--- a/debian/matita-standard-library.install
+++ /dev/null
@@ -1,3 +0,0 @@
-/usr/share/matita/ma/
-/usr/share/matita/xml/
-/usr/share/matita/metadata.db
diff --git a/debian/matita.desktop b/debian/matita.desktop
new file mode 100644
index 0000000..6790baf
--- /dev/null
+++ b/debian/matita.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Matita
+Comment=Interactive theorem prover
+Exec=matita
+Icon=/usr/share/matita/icons/matita.png
+Terminal=false
+Type=Application
+Categories=Education;Science;Math
diff --git a/debian/matita.install b/debian/matita.install
index a844159..6817aeb 100644
--- a/debian/matita.install
+++ b/debian/matita.install
@@ -5,11 +5,10 @@ usr/share/matita/LICENSE
 usr/share/matita/*.xml
 usr/share/matita/*.lang
 usr/share/matita/*.gtkrc
-usr/share/matita/*.moo
 usr/share/matita/*.templ
+usr/share/matita/lib/
 usr/share/matita/matita usr/bin/
 usr/share/matita/matitac usr/bin/
-usr/share/matita/matitadep usr/bin/
 usr/share/matita/matitaclean usr/bin/
-usr/share/man/* usr/share/man/
-/usr/share/matita/ma/
+usr/share/man/
+debian/matita.desktop usr/share/applications/
diff --git a/debian/patches/Fix-FTBFS-with-camlp5-6.05.patch b/debian/patches/Fix-FTBFS-with-camlp5-6.05.patch
deleted file mode 100644
index 2592459..0000000
--- a/debian/patches/Fix-FTBFS-with-camlp5-6.05.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Mon, 12 Mar 2012 12:51:48 +0100
-Subject: Fix FTBFS with camlp5 6.05
-
-Replace Stdpp.Exc_located (which has been obsolete for a while) by
-Ploc.Exc.
-
-Signed-off-by: Stephane Glondu <steph at glondu.net>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666594
----
- components/content_pres/cicNotationParser.ml |    6 +++---
- components/grafite_parser/grafiteParser.ml   |    8 ++++----
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/components/content_pres/cicNotationParser.ml b/components/content_pres/cicNotationParser.ml
-index 5725dfb..8b5f1ed 100644
---- a/components/content_pres/cicNotationParser.ml
-+++ b/components/content_pres/cicNotationParser.ml
-@@ -814,11 +814,11 @@ let exc_located_wrapper f =
-   try
-     f ()
-   with
--  | Stdpp.Exc_located (floc, Stream.Error msg) ->
-+  | Ploc.Exc (floc, Stream.Error msg) ->
-       raise (HExtlib.Localized (floc, Parse_error msg))
--  | Stdpp.Exc_located (floc, HExtlib.Localized (_,exn)) ->
-+  | Ploc.Exc (floc, HExtlib.Localized (_,exn)) ->
-       raise (HExtlib.Localized (floc, (Parse_error (Printexc.to_string exn))))
--  | Stdpp.Exc_located (floc, exn) ->
-+  | Ploc.Exc (floc, exn) ->
-       raise (HExtlib.Localized (floc, (Parse_error (Printexc.to_string exn))))
- 
- let parse_level1_pattern precedence lexbuf =
-diff --git a/components/grafite_parser/grafiteParser.ml b/components/grafite_parser/grafiteParser.ml
-index 2a7405a..9506043 100644
---- a/components/grafite_parser/grafiteParser.ml
-+++ b/components/grafite_parser/grafiteParser.ml
-@@ -1005,13 +1005,13 @@ let exc_located_wrapper f =
-   try
-     f ()
-   with
--  | Stdpp.Exc_located (_, End_of_file) -> raise End_of_file
--  | Stdpp.Exc_located (floc, Stream.Error msg) ->
-+  | Ploc.Exc (_, End_of_file) -> raise End_of_file
-+  | Ploc.Exc (floc, Stream.Error msg) ->
-       raise (HExtlib.Localized (floc,CicNotationParser.Parse_error msg))
--  | Stdpp.Exc_located (floc, HExtlib.Localized(_,exn)) ->
-+  | Ploc.Exc (floc, HExtlib.Localized(_,exn)) ->
-       raise
-        (HExtlib.Localized (floc,CicNotationParser.Parse_error (Printexc.to_string exn)))
--  | Stdpp.Exc_located (floc, exn) ->
-+  | Ploc.Exc (floc, exn) ->
-       raise
-        (HExtlib.Localized (floc,CicNotationParser.Parse_error (Printexc.to_string exn)))
- 
--- 
diff --git a/debian/patches/configure b/debian/patches/configure
new file mode 100644
index 0000000..335ac70
--- /dev/null
+++ b/debian/patches/configure
@@ -0,0 +1,12 @@
+Index: matita/configure.ac
+===================================================================
+--- matita.orig/configure.ac	2012-05-06 18:10:31.000000000 +0200
++++ matita/configure.ac	2012-05-06 22:30:23.000000000 +0200
+@@ -63,7 +63,6 @@
+ http \
+ lablgtk2 \
+ lablgtksourceview2.gtksourceview2 \
+-mysql \
+ netstring \
+ ulex08 \
+ zip \
diff --git a/debian/patches/matita.conf.xml.in.patch b/debian/patches/matita.conf.xml.in.patch
deleted file mode 100644
index bb777a4..0000000
--- a/debian/patches/matita.conf.xml.in.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Enrico Tassi <gareuselesinge at debian.org>
-Date: Tue, 31 May 2011 11:09:13 +0200
-Subject: matita.conf.xml.in
-
-Patch to use sqlite backend in the default configuration.
----
- matita/matita.conf.xml.in |   14 ++++++--------
- 1 files changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/matita/matita.conf.xml.in b/matita/matita.conf.xml.in
-index aeb8af0..2198eb8 100644
---- a/matita/matita.conf.xml.in
-+++ b/matita/matita.conf.xml.in
-@@ -50,17 +50,18 @@
- 
-     <!-- The following snippet is used by the helm team
-          note that user's tables are named diffrently from library tables,
--	 so they can coexists on the same db -->
-+	 so they can coexists on the same db
- 
-     <key name="metadata">@DBHOST@ matita helm none library</key>
-     <key name="metadata">@DBHOST@ matita helm none user</key>
- 
-+    -->
-+
-     <!-- The following snippet it what you want to use a local sqlite db
-          and acess remotely to the coq library trought mowgli
-     <key name="metadata">@DBHOST@ matita helm none legacy</key>
--    <key name="metadata">file://$(matita.rt_base_dir) metadata.db helm helm library</key>
--    <key name="metadata">file://$(matita.basedir) user.db helm helm user</key>
-     -->
-+    <key name="metadata">file://$(matita.basedir) user.db helm helm user</key>
- 
-     <!-- 
-     If you have a large amount of metadata, you may be interested in using
-@@ -93,13 +94,9 @@
-     -->
-     <key name="prefix">
-       cic:/matita/
--      file://$(matita.rt_base_dir)/xml/standard-library/
--      ro
--    </key>
--    <key name="prefix">
--      cic:/matita/
-       file://$(user.home)/.matita/xml/matita/
-     </key>
-+<!--
-     <key name="prefix">
-       cic:/
-       file://@RT_BASE_DIR@/xml/legacy-library/coq/
-@@ -115,5 +112,6 @@
-       http://mowgli.cs.unibo.it/xml/
-       legacy
-     </key>
-+-->
-   </section>
- </helm_registry>
--- 
diff --git a/debian/patches/native-compilers.patch b/debian/patches/native-compilers.patch
deleted file mode 100644
index f6378dc..0000000
--- a/debian/patches/native-compilers.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Enrico Tassi <gareuselesinge at debian.org>
-Date: Tue, 31 May 2011 11:10:17 +0200
-Subject: native-compilers
-
-Disable native compilers on ia64 and alpha.
----
- Makefile.defs.in |   12 +++++++++++-
- 1 files changed, 11 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.defs.in b/Makefile.defs.in
-index d7a7620..b33d5cc 100644
---- a/Makefile.defs.in
-+++ b/Makefile.defs.in
-@@ -5,7 +5,17 @@ OCAMLFIND = @OCAMLFIND@
- 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@
- ANNOT = @ANNOT@
- 
--- 
diff --git a/debian/patches/numbers.patch b/debian/patches/numbers.patch
deleted file mode 100644
index 4ea7ef2..0000000
--- a/debian/patches/numbers.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Enrico Tassi <gareuselesinge at debian.org>
-Date: Tue, 31 May 2011 11:09:49 +0200
-Subject: numbers
-
-Disable Coq numbers.
----
- components/cic_disambiguation/number_notation.ml |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/components/cic_disambiguation/number_notation.ml b/components/cic_disambiguation/number_notation.ml
-index 179725e..7fc320e 100644
---- a/components/cic_disambiguation/number_notation.ml
-+++ b/components/cic_disambiguation/number_notation.ml
-@@ -49,7 +49,7 @@ let interp_natural_number num =
- 
- let _ =
-   DisambiguateChoices.add_num_choice
--    ("natural number", `Num_interp interp_natural_number);
-+    ("natural number", `Num_interp interp_natural_number); (*
-   DisambiguateChoices.add_num_choice
-     ("Coq natural number",
-       `Num_interp (fun num -> HelmLibraryObjects.build_nat (int_of_string num)));
-@@ -76,3 +76,4 @@ let _ =
-             HelmLibraryObjects.build_bin_pos num ]
-         else
-           assert false))
-+          *)
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 07eff40..e8c05a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1 @@
-matita.conf.xml.in.patch
-numbers.patch
-native-compilers.patch
-slist-sep.patch
-Fix-FTBFS-with-camlp5-6.05.patch
+configure
diff --git a/debian/patches/slist-sep.patch b/debian/patches/slist-sep.patch
deleted file mode 100644
index 7d85178..0000000
--- a/debian/patches/slist-sep.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From: Colin Watson <cjwatson at ubuntu.com>
-Date: Tue, 31 May 2011 11:11:01 +0200
-Subject: slist-sep
-
-Port to current OCaml/CamlP5.  r11210 from upstream SVN.
-
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=612891
----
- components/content_pres/cicNotationParser.ml |    4 ++--
- components/grafite_parser/print_grammar.ml   |    6 +++---
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/components/content_pres/cicNotationParser.ml b/components/content_pres/cicNotationParser.ml
-index 3a3e79d..5725dfb 100644
---- a/components/content_pres/cicNotationParser.ml
-+++ b/components/content_pres/cicNotationParser.ml
-@@ -211,8 +211,8 @@ let extract_term_production pattern =
-           match magic with
-           | Ast.List0 (_, None) -> Gramext.Slist0 s
-           | Ast.List1 (_, None) -> Gramext.Slist1 s
--          | Ast.List0 (_, Some l) -> Gramext.Slist0sep (s, gram_of_literal l)
--          | Ast.List1 (_, Some l) -> Gramext.Slist1sep (s, gram_of_literal l)
-+          | Ast.List0 (_, Some l) -> Gramext.Slist0sep (s, gram_of_literal l,false)
-+          | Ast.List1 (_, Some l) -> Gramext.Slist1sep (s, gram_of_literal l,false)
-           | _ -> assert false
-         in
-         [ Env (List.map Env.list_declaration p_names),
-diff --git a/components/grafite_parser/print_grammar.ml b/components/grafite_parser/print_grammar.ml
-index 38750e1..736c850 100644
---- a/components/grafite_parser/print_grammar.ml
-+++ b/components/grafite_parser/print_grammar.ml
-@@ -87,7 +87,7 @@ and is_symbol_dummy = function
-   | Smeta (_, lt, _) -> List.for_all is_symbol_dummy lt
-   | Snterm e | Snterml (e, _) -> is_entry_dummy e
-   | Slist1 x | Slist0 x -> is_symbol_dummy x
--  | Slist1sep (x,y) | Slist0sep (x,y) -> is_symbol_dummy x && is_symbol_dummy y
-+  | Slist1sep (x,y,false) | Slist0sep (x,y,false) -> is_symbol_dummy x && is_symbol_dummy y
-   | Sopt x -> is_symbol_dummy x
-   | Sself | Snext -> false
-   | Stree t -> is_tree_dummy t
-@@ -186,7 +186,7 @@ let visit_description desc fmt self =
-         let todo = visit_symbol symbol todo is_son in
-         Format.fprintf fmt "@]} @ ";
-         todo
--    | Slist0sep (symbol,sep) ->
-+    | Slist0sep (symbol,sep,false) ->
-         Format.fprintf fmt "[@[<hov2> ";
-         let todo = visit_symbol symbol todo is_son in
-         Format.fprintf fmt "{@[<hov2> ";
-@@ -200,7 +200,7 @@ let visit_description desc fmt self =
-         let todo = visit_symbol symbol todo is_son in
-         Format.fprintf fmt "@]}+ @ ";
-         todo 
--    | Slist1sep (symbol,sep) ->
-+    | Slist1sep (symbol,sep,false) ->
-         let todo = visit_symbol symbol todo is_son  in
-         Format.fprintf fmt "{@[<hov2> ";
-         let todo = visit_symbol sep todo is_son in
--- 
diff --git a/debian/rules b/debian/rules
index 465d9e7..f7e979f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,60 +1,44 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+%:
+	dh $@
 
-DEB_CONFIGURE_EXTRA_FLAGS := \
-  --with-runtime-dir=/usr/share/matita \
-	--prefix=/usr/ \
-	--with-dbhost=FAKE_HOST
-DEB_DESTDIR := debian/tmp/
-DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR)
-DEB_DH_COMPRESS_ARGS := -X.pdf
-# don't perform regular installation
-DEB_MAKE_INSTALL_TARGET :=
-OCAMLABI=$(shell ocamlc -version)
+override_dh_auto_configure:
+	autoconf
+	./configure --with-runtime-dir=/usr/share/matita \
+    		--prefix=/usr/ \
+    		--with-dbhost=FAKE_HOST
 
-common-install-arch::
-	# install matita
-	make install-arch DESTDIR=$(DEB_DESTDIR) MATITA_CFLAGS=-noinnertypes
-	# generate manpages
-	mkdir -p $(DEB_DESTDIR)/usr/share/man/man1/
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f Makefile.defs components/extlib/componentsConf.ml config.log config.status configure matita/.depend.opt matita/help/C/version.txt matita/matita.conf.xml matita/matita.glade.utf8
+
+override_dh_auto_install:
+	dh_auto_install --destdir=debian/tmp
+	cp matita/matita.byte debian/matita/usr/bin/ || true
+	cp matita/matitac.byte debian/matita/usr/bin/ || true
+	cp matita/matita.opt debian/matita/usr/bin/ || true
+	cp matita/matitac.opt debian/matita/usr/bin/ || true
+	mkdir -p debian/tmp/usr/share/man/man1/
 	MATITA_RT_BASE_DIR=debian/tmp/usr/share/matita/ \
 	help2man --name="Matita interative theorem prover - batch compiler" -N \
-		$(DEB_DESTDIR)/usr/share/matita/matitac \
-		| gzip -9 > $(DEB_DESTDIR)/usr/share/man/man1/matitac.1.gz
-	MATITA_RT_BASE_DIR=debian/tmp/usr/share/matita/ \
-	help2man --name="Matita interative theorem prover - cleanup tool" -N \
-		$(DEB_DESTDIR)/usr/share/matita/matitaclean \
-		| gzip -9 > $(DEB_DESTDIR)/usr/share/man/man1/matitaclean.1.gz
+ 		debian/tmp/usr/share/matita/matitac \
+ 		| gzip -9 > debian/tmp/usr/share/man/man1/matitac.1.gz
 	MATITA_RT_BASE_DIR=debian/tmp/usr/share/matita/ \
-	help2man --name="Matita interative theorem prover - dependency analyzer" -N \
-		$(DEB_DESTDIR)/usr/share/matita/matitadep \
-		| gzip -9 > $(DEB_DESTDIR)/usr/share/man/man1/matitadep.1.gz
-	if [ -e  $(DEB_DESTDIR)/usr/share/matita/matitac.opt ]; then\
-		ln -s /usr/share/man/man1/matitac.1.gz \
-			$(DEB_DESTDIR)/usr/share/man/man1/matitac.opt.1.gz;\
-	fi
+ 	help2man --name="Matita interative theorem prover - cleanup tool" -N \
+ 		debian/tmp/usr/share/matita/matitaclean \
+ 		| gzip -9 > debian/tmp/usr/share/man/man1/matitaclean.1.gz
+	if [ -e  debian/tmp/usr/share/matita/matitac.opt ]; then\
+ 		ln -s /usr/share/man/man1/matitac.1.gz \
+ 			debian/tmp/usr/share/man/man1/matitac.opt.1.gz;\
+ 	fi
 	# install .opt .byte (symlinks are installed with .install
 	mkdir -p debian/matita/usr/bin/
-	cp matita/matita.byte debian/matita/usr/bin/ || true
-	cp matita/matitac.byte debian/matita/usr/bin/ || true
-	cp matita/matita.opt debian/matita/usr/bin/ || true
-	cp matita/matitac.opt debian/matita/usr/bin/ || true
 	# make depend on the interpreter if needed
 	if [ ! -e matita/matitac.opt ]; then \
-	        echo "interpreter:Depends=ocaml-base-nox-$(OCAMLABI)" \
-	                >> debian/matita.substvars; \
-	else \
-	        echo "interpreter:Depends=" \
-	                >> debian/matita.substvars; \
-	fi
-
-
-common-install-indep::
-	# doc generation and installation
-	mkdir -p debian/matita-doc/usr/share/doc/matita-doc/
-	make -C matita/help/C/ install DESTDIR=$(shell pwd)/debian/matita-doc/usr/share/doc/matita-doc/
-	# install matita library
-	make install-indep DESTDIR=$(DEB_DESTDIR) MATITA_CFLAGS=-noinnertypes
+	        echo "interpreter:Depends=ocaml-base-nox-$(shell ocamlc -version)" \
+ 	                >> debian/matita.substvars; \
+ 	else \
+ 	        echo "interpreter:Depends=" \
+ 	                >> debian/matita.substvars; \
+ 	fi
diff --git a/matita/.depend.opt b/matita/.depend.opt
deleted file mode 100644
index fb48e95..0000000
--- a/matita/.depend.opt
+++ /dev/null
@@ -1,76 +0,0 @@
-applyTransformation.cmo: applyTransformation.cmi
-applyTransformation.cmx: applyTransformation.cmi
-buildTimeConf.cmo:
-buildTimeConf.cmx:
-cicMathView.cmo: matitaMisc.cmi matitaGuiTypes.cmi matitaGtkMisc.cmi \
-    buildTimeConf.cmx applyTransformation.cmi cicMathView.cmi
-cicMathView.cmx: matitaMisc.cmx matitaGuiTypes.cmi matitaGtkMisc.cmx \
-    buildTimeConf.cmx applyTransformation.cmx cicMathView.cmi
-lablGraphviz.cmo: lablGraphviz.cmi
-lablGraphviz.cmx: lablGraphviz.cmi
-matitaclean.cmo: matitaMisc.cmi matitaInit.cmi matitaclean.cmi
-matitaclean.cmx: matitaMisc.cmx matitaInit.cmx matitaclean.cmi
-matitac.cmo: matitaclean.cmi matitaMisc.cmi matitaInit.cmi matitaExcPp.cmi \
-    matitaEngine.cmi
-matitac.cmx: matitaclean.cmx matitaMisc.cmx matitaInit.cmx matitaExcPp.cmx \
-    matitaEngine.cmx
-matitaEngine.cmo: applyTransformation.cmi matitaEngine.cmi
-matitaEngine.cmx: applyTransformation.cmx matitaEngine.cmi
-matitaExcPp.cmo: matitaEngine.cmi matitaExcPp.cmi
-matitaExcPp.cmx: matitaEngine.cmx matitaExcPp.cmi
-matitaGeneratedGui.cmo:
-matitaGeneratedGui.cmx:
-matitaGtkMisc.cmo: matitaTypes.cmi matitaGeneratedGui.cmx buildTimeConf.cmx \
-    matitaGtkMisc.cmi
-matitaGtkMisc.cmx: matitaTypes.cmx matitaGeneratedGui.cmx buildTimeConf.cmx \
-    matitaGtkMisc.cmi
-matitaGui.cmo: matitaTypes.cmi matitaScript.cmi matitaMisc.cmi \
-    matitaMathView.cmi matitaGuiTypes.cmi matitaGtkMisc.cmi \
-    matitaGeneratedGui.cmx matitaExcPp.cmi buildTimeConf.cmx matitaGui.cmi
-matitaGui.cmx: matitaTypes.cmx matitaScript.cmx matitaMisc.cmx \
-    matitaMathView.cmx matitaGuiTypes.cmi matitaGtkMisc.cmx \
-    matitaGeneratedGui.cmx matitaExcPp.cmx buildTimeConf.cmx matitaGui.cmi
-matitaInit.cmo: matitaExcPp.cmi buildTimeConf.cmx matitaInit.cmi
-matitaInit.cmx: matitaExcPp.cmx buildTimeConf.cmx matitaInit.cmi
-matitaMathView.cmo: virtuals.cmi matitaTypes.cmi matitaMisc.cmi \
-    matitaGuiTypes.cmi matitaGtkMisc.cmi matitaGeneratedGui.cmx \
-    matitaExcPp.cmi lablGraphviz.cmi cicMathView.cmi buildTimeConf.cmx \
-    applyTransformation.cmi matitaMathView.cmi
-matitaMathView.cmx: virtuals.cmx matitaTypes.cmx matitaMisc.cmx \
-    matitaGuiTypes.cmi matitaGtkMisc.cmx matitaGeneratedGui.cmx \
-    matitaExcPp.cmx lablGraphviz.cmx cicMathView.cmx buildTimeConf.cmx \
-    applyTransformation.cmx matitaMathView.cmi
-matitaMisc.cmo: matitaGuiTypes.cmi buildTimeConf.cmx matitaMisc.cmi
-matitaMisc.cmx: matitaGuiTypes.cmi buildTimeConf.cmx matitaMisc.cmi
-matita.cmo: predefined_virtuals.cmi matitaScript.cmi matitaInit.cmi \
-    matitaGui.cmi matitaGtkMisc.cmi buildTimeConf.cmx applyTransformation.cmi
-matita.cmx: predefined_virtuals.cmx matitaScript.cmx matitaInit.cmx \
-    matitaGui.cmx matitaGtkMisc.cmx buildTimeConf.cmx applyTransformation.cmx
-matitaScript.cmo: virtuals.cmi matitaTypes.cmi matitaMisc.cmi \
-    matitaMathView.cmi matitaGtkMisc.cmi matitaEngine.cmi cicMathView.cmi \
-    buildTimeConf.cmx matitaScript.cmi
-matitaScript.cmx: virtuals.cmx matitaTypes.cmx matitaMisc.cmx \
-    matitaMathView.cmx matitaGtkMisc.cmx matitaEngine.cmx cicMathView.cmx \
-    buildTimeConf.cmx matitaScript.cmi
-matitaTypes.cmo: matitaTypes.cmi
-matitaTypes.cmx: matitaTypes.cmi
-predefined_virtuals.cmo: virtuals.cmi predefined_virtuals.cmi
-predefined_virtuals.cmx: virtuals.cmx predefined_virtuals.cmi
-virtuals.cmo: virtuals.cmi
-virtuals.cmx: virtuals.cmi
-applyTransformation.cmi:
-cicMathView.cmi: matitaGuiTypes.cmi applyTransformation.cmi
-lablGraphviz.cmi:
-matitaclean.cmi:
-matitaEngine.cmi: applyTransformation.cmi
-matitaExcPp.cmi:
-matitaGtkMisc.cmi: matitaGeneratedGui.cmx
-matitaGui.cmi: matitaGuiTypes.cmi
-matitaGuiTypes.cmi: matitaGeneratedGui.cmx applyTransformation.cmi
-matitaInit.cmi:
-matitaMathView.cmi: matitaTypes.cmi matitaGuiTypes.cmi
-matitaMisc.cmi: matitaGuiTypes.cmi
-matitaScript.cmi:
-matitaTypes.cmi:
-predefined_virtuals.cmi:
-virtuals.cmi:

-- 
matita packaging



More information about the Pkg-ocaml-maint-commits mailing list