[Pkg-ocaml-maint-commits] r6448 - in /trunk/packages/matita: tarballs/ trunk/debian/ trunk/debian/patches/

gareuselesinge at users.alioth.debian.org gareuselesinge at users.alioth.debian.org
Tue Nov 10 18:22:03 UTC 2009


Author: gareuselesinge
Date: Tue Nov 10 18:22:02 2009
New Revision: 6448

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=6448
Log:
matita almost OK for lablgtk2.14

Added:
    trunk/packages/matita/tarballs/matita_0.5.8~rc1.orig.tar.gz   (with props)
    trunk/packages/matita/trunk/debian/patches/lablgtk2.14.dpatch   (with props)
Modified:
    trunk/packages/matita/trunk/debian/changelog
    trunk/packages/matita/trunk/debian/control
    trunk/packages/matita/trunk/debian/matita.install
    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

Added: trunk/packages/matita/tarballs/matita_0.5.8~rc1.orig.tar.gz
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/matita/tarballs/matita_0.5.8%7Erc1.orig.tar.gz?rev=6448&op=file
==============================================================================
Binary file - no diff available.

Propchange: trunk/packages/matita/tarballs/matita_0.5.8~rc1.orig.tar.gz
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: trunk/packages/matita/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/matita/trunk/debian/changelog?rev=6448&op=diff
==============================================================================
--- trunk/packages/matita/trunk/debian/changelog (original)
+++ trunk/packages/matita/trunk/debian/changelog Tue Nov 10 18:22:02 2009
@@ -1,9 +1,9 @@
-matita (0.5.7-3) unstable; urgency=low
+matita (0.5.8~rc1-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * new upstream release candidate
   * Added docbook-xsl and docbook-xml as build-depend-indep (Closes: #532289)
 
- -- Enrico Tassi <gareuselesinge at debian.org>  Fri, 20 Mar 2009 22:12:35 +0100
+ -- Enrico Tassi <gareuselesinge at debian.org>  Tue, 10 Nov 2009 18:09:47 +0100
 
 matita (0.5.7-2) unstable; urgency=low
 

Modified: trunk/packages/matita/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/matita/trunk/debian/control?rev=6448&op=diff
==============================================================================
--- trunk/packages/matita/trunk/debian/control (original)
+++ trunk/packages/matita/trunk/debian/control Tue Nov 10 18:22:02 2009
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Enrico Tassi <gareuselesinge at debian.org>, Stefano Zacchiroli <zack at debian.org>
-Build-Depends: ocaml (>= 3.10.2), 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, cdbs, libmysql-ocaml-dev, camlp5 (>= 5.04), liblablgtksourceview-ocaml-dev, dpatch, help2man, libgtkmathview-dev (>= 0.8.0-2)
+Build-Depends: ocaml (>= 3.10.2), 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, cdbs, libmysql-ocaml-dev, camlp5 (>= 5.04), liblablgtksourceview2-ocaml-dev, dpatch, help2man, libgtkmathview-dev (>= 0.8.0-2)
 Build-Depends-Indep: xsltproc, dblatex, docbook-xsl, docbook-xml
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/matita/trunk
@@ -13,7 +13,7 @@
 Package: matita
 Architecture: any
 Depends: ${shlibs:Depends}, ${interpreter:Depends}, ${misc:Depends}
-Recommends: matita-standard-library, graphviz, yelp
+Recommends: graphviz, yelp
 Description: interactive theorem prover
  Matita is a graphical interactive theorem prover based on the Calculus of
  (Co)Inductive Constructions. 
@@ -25,16 +25,6 @@
  supports high quality bidimensional rendering of proofs and formulae
  transformed on-the-fly to MathML markup
 
-Package: matita-standard-library
-Architecture: all
-Depends: matita (>= ${source:Version}), ${misc:Depends}
-Description: standard library for the Matita interactive theorem prover
- Matita is a graphical interactive theorem prover based on the Calculus of
- (Co)Inductive Constructions. 
- .
- This package contains the standard library of theorems of the
- matita interactive theorem prover.
-
 Package: matita-doc
 Architecture: all
 Suggests: matita, yelp

Modified: trunk/packages/matita/trunk/debian/matita.install
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/matita/trunk/debian/matita.install?rev=6448&op=diff
==============================================================================
--- trunk/packages/matita/trunk/debian/matita.install (original)
+++ trunk/packages/matita/trunk/debian/matita.install Tue Nov 10 18:22:02 2009
@@ -12,3 +12,4 @@
 usr/share/matita/matitadep usr/bin/
 usr/share/matita/matitaclean usr/bin/
 usr/share/man/* usr/share/man/
+/usr/share/matita/ma/

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=6448&op=diff
==============================================================================
--- trunk/packages/matita/trunk/debian/patches/00list (original)
+++ trunk/packages/matita/trunk/debian/patches/00list Tue Nov 10 18:22:02 2009
@@ -1,3 +1,4 @@
 matita.conf.xml.in.dpatch
 numbers.dpatch
 native-compilers.dpatch
+lablgtk2.14.dpatch

Added: trunk/packages/matita/trunk/debian/patches/lablgtk2.14.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/matita/trunk/debian/patches/lablgtk2.14.dpatch?rev=6448&op=file
==============================================================================
--- trunk/packages/matita/trunk/debian/patches/lablgtk2.14.dpatch (added)
+++ trunk/packages/matita/trunk/debian/patches/lablgtk2.14.dpatch Tue Nov 10 18:22:02 2009
@@ -1,0 +1,134 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## lablgtk2.14.dpatch by Enrico Tassi <gareuselesinge at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/matita/matitaGui.ml trunk/matita/matitaGui.ml
+--- trunk~/matita/matitaGui.ml	2009-10-05 13:28:05.000000000 +0200
++++ trunk/matita/matitaGui.ml	2009-11-10 18:11:07.000000000 +0100
+@@ -205,7 +205,7 @@
+ exception UseLibrary;;
+ 
+ let rec interactive_error_interp ~all_passes
+-  (source_buffer:GSourceView.source_buffer) notify_exn offset errorll filename
++  (source_buffer:GSourceView2.source_buffer) notify_exn offset errorll filename
+ = 
+   (* hook to save a script for each disambiguation error *)
+   if false then
+@@ -374,12 +374,12 @@
+     [ main#mainWinEventBox ]
+   in
+   let console = new console ~buffer:main#logTextView#buffer () in
+-  let (source_view: GSourceView.source_view) =
+-    GSourceView.source_view
++  let (source_view: GSourceView2.source_view) =
++    GSourceView2.source_view
+       ~auto_indent:true
+-      ~insert_spaces_instead_of_tabs:true ~tabs_width:2
+-      ~margin:80 ~show_margin:true
+-      ~smart_home_end:true
++      ~insert_spaces_instead_of_tabs:true ~tab_width:2
++      ~right_margin_position:80 ~show_right_margin:true
++      ~smart_home_end:`AFTER
+       ~packing:main#scriptScrolledWin#add
+       ()
+   in
+@@ -575,11 +575,15 @@
+           source_view#misc#grab_focus ()
+       in
+       connect_menu_item main#undoMenuItem safe_undo;
++(*CSC: XXX
+       ignore(source_view#source_buffer#connect#can_undo
+         ~callback:main#undoMenuItem#misc#set_sensitive);
++*) main#undoMenuItem#misc#set_sensitive true;
+       connect_menu_item main#redoMenuItem safe_redo;
++(*CSC: XXX
+       ignore(source_view#source_buffer#connect#can_redo
+         ~callback:main#redoMenuItem#misc#set_sensitive);
++*) main#redoMenuItem#misc#set_sensitive true;
+       ignore(source_view#connect#after#populate_popup
+        ~callback:(fun pre_menu ->
+          let menu = new GMenu.menu pre_menu in
+@@ -883,13 +887,16 @@
+           else raise exn);
+         (* script *)
+       let _ =
+-        match GSourceView.source_language_from_file BuildTimeConf.lang_file with
++        let source_language_manager =
++         GSourceView2.source_language_manager ~default:true in
++        source_language_manager#set_search_path[BuildTimeConf.runtime_base_dir];
++        match source_language_manager#language "grafite" with
+         | None ->
+-            HLog.warn (sprintf "can't load language file %s"
+-              BuildTimeConf.lang_file)
+-        | Some matita_lang ->
++            HLog.warn(sprintf "can't load a language file for \"grafite\" in %s"
++              BuildTimeConf.runtime_base_dir)
++        | Some x as matita_lang ->
+             source_buffer#set_language matita_lang;
+-            source_buffer#set_highlight true
++            source_buffer#set_highlight_syntax true
+       in
+       let disableSave () =
+         (s())#assignFileName None;
+@@ -1289,8 +1296,8 @@
+       self#main#saveMenuItem#misc#set_sensitive true
+         
+     method console = console
+-    method sourceView: GSourceView.source_view =
+-      (source_view: GSourceView.source_view)
++    method sourceView: GSourceView2.source_view =
++      (source_view: GSourceView2.source_view)
+     method fileSel = fileSel
+     method findRepl = findRepl
+     method main = main
+diff -urNad trunk~/matita/matitaGuiTypes.mli trunk/matita/matitaGuiTypes.mli
+--- trunk~/matita/matitaGuiTypes.mli	2009-07-13 05:27:46.000000000 +0200
++++ trunk/matita/matitaGuiTypes.mli	2009-11-10 18:11:07.000000000 +0100
+@@ -52,7 +52,7 @@
+ (*   method toolbar :      MatitaGeneratedGui.toolBarWin *)
+ 
+   method console:       console
+-  method sourceView:    GSourceView.source_view
++  method sourceView:    GSourceView2.source_view
+ 
+     (** {2 Dialogs instantiation}
+      * methods below create a new window on each invocation. You should
+diff -urNad trunk~/matita/matitaMathView.ml trunk/matita/matitaMathView.ml
+--- trunk~/matita/matitaMathView.ml	2009-10-13 13:27:03.000000000 +0200
++++ trunk/matita/matitaMathView.ml	2009-11-10 18:11:07.000000000 +0100
+@@ -981,7 +981,7 @@
+     combo#set_active (aux 0 queries);
+   in
+   let searchText = 
+-    GSourceView.source_view ~auto_indent:false ~editable:false ()
++    GSourceView2.source_view ~auto_indent:false ~editable:false ()
+   in
+   let _ =
+      win#scrolledwinContent#add (searchText :> GObj.widget);
+diff -urNad trunk~/matita/matitaScript.ml trunk/matita/matitaScript.ml
+--- trunk~/matita/matitaScript.ml	2009-10-26 14:03:28.000000000 +0100
++++ trunk/matita/matitaScript.ml	2009-11-10 18:11:07.000000000 +0100
+@@ -691,7 +691,7 @@
+   let i = ref 0 in
+   fun () -> incr i; !i
+ 
+-class script  ~(source_view: GSourceView.source_view)
++class script  ~(source_view: GSourceView2.source_view)
+               ~(mathviewer: MatitaTypes.mathViewer) 
+               ~set_star
+               ~ask_confirmation
+diff -urNad trunk~/matita/matitaScript.mli trunk/matita/matitaScript.mli
+--- trunk~/matita/matitaScript.mli	2009-06-15 13:04:24.000000000 +0200
++++ trunk/matita/matitaScript.mli	2009-11-10 18:11:07.000000000 +0100
+@@ -90,7 +90,7 @@
+   (** @param set_star callback used to set the modified symbol (usually a star
+    * "*") on the side of a script name *)
+ val script: 
+-  source_view:GSourceView.source_view -> 
++  source_view:GSourceView2.source_view -> 
+   mathviewer: MatitaTypes.mathViewer-> 
+   urichooser: (UriManager.uri list -> UriManager.uri list) -> 
+   ask_confirmation: 

Propchange: trunk/packages/matita/trunk/debian/patches/lablgtk2.14.dpatch
------------------------------------------------------------------------------
    svn:executable = *

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=6448&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 Nov 10 18:22:02 2009
@@ -7,8 +7,8 @@
 @DPATCH@
 diff -urNad trunk~/matita/matita.conf.xml.in trunk/matita/matita.conf.xml.in
 --- trunk~/matita/matita.conf.xml.in	2008-01-11 20:13:29.000000000 +0100
-+++ trunk/matita/matita.conf.xml.in	2008-05-01 14:06:45.000000000 +0200
-@@ -50,17 +50,20 @@
++++ trunk/matita/matita.conf.xml.in	2009-10-11 23:20:31.000000000 +0200
+@@ -50,17 +50,18 @@
  
      <!-- The following snippet is used by the helm team
           note that user's tables are named diffrently from library tables,
@@ -23,23 +23,29 @@
      <!-- 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.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
-@@ -100,6 +103,7 @@
+@@ -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 +119,6 @@
+@@ -115,5 +112,6 @@
        http://mowgli.cs.unibo.it/xml/
        legacy
      </key>

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=6448&op=diff
==============================================================================
--- trunk/packages/matita/trunk/debian/patches/numbers.dpatch (original)
+++ trunk/packages/matita/trunk/debian/patches/numbers.dpatch Tue Nov 10 18:22:02 2009
@@ -6,18 +6,18 @@
 
 @DPATCH@
 diff -urNad trunk~/components/cic_disambiguation/number_notation.ml trunk/components/cic_disambiguation/number_notation.ml
---- trunk~/components/cic_disambiguation/number_notation.ml	2008-12-03 23:53:01.000000000 +0100
-+++ trunk/components/cic_disambiguation/number_notation.ml	2009-02-15 16:17:46.000000000 +0100
-@@ -28,7 +28,7 @@
+--- trunk~/components/cic_disambiguation/number_notation.ml	2009-05-14 15:43:55.000000000 +0200
++++ trunk/components/cic_disambiguation/number_notation.ml	2009-10-11 23:06:41.000000000 +0200
+@@ -49,7 +49,7 @@
+ 
  let _ =
    DisambiguateChoices.add_num_choice
-     ("natural number",
--      `Num_interp (fun num -> LibraryObjects.build_nat (int_of_string num)));
-+      `Num_interp (fun num -> LibraryObjects.build_nat (int_of_string num)));(*
+-    ("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)));
-@@ -55,3 +55,4 @@
+@@ -76,3 +76,4 @@
              HelmLibraryObjects.build_bin_pos num ]
          else
            assert false))




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