[Pkg-ocaml-maint-commits] [SCM] tuareg-mode packaging branch, master, updated. debian/1%2.0.4-3-6-ge8d7973

2012-05-06 Thread Ralf Treinen
The following commit has been merged in the master branch:
commit 529f96f7df952bdf5ace0c0270be5bdc123b0cc2
Author: Ralf Treinen trei...@free.fr
Date:   Sun May 6 12:22:06 2012 +0200

improve short description

diff --git a/debian/changelog b/debian/changelog
index c57b60a..4279354 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ tuareg-mode (1:2.0.4-4) unstable; urgency=low
 These two files were left in version 2.0.1 due to an accident.
 This brings also back upstream's fix of the filename pattern in
 append-tuareg.el (closes: #671558).
+  * debian/control: drop starting article in short description
 
- -- Ralf Treinen trei...@debian.org  Sun, 06 May 2012 12:19:06 +0200
+ -- Ralf Treinen trei...@debian.org  Sun, 06 May 2012 12:21:46 +0200
 
 tuareg-mode (1:2.0.4-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 8edcf95..e65d744 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Depends: xemacs21-nomule | emacsen, ${misc:Depends}
 Recommends: ocaml-interp, ocaml-mode
 Enhances: ocaml-interp
 Conflicts: ocaml-tools (= 1.1-2)
-Description: An emacs-mode for ocaml programs
+Description: emacs-mode for ocaml programs
  It handles automatic indentation of Objective Caml and Caml-Light
  code.  Key parts of the code are highlighted using Font-Lock. It
  provides support to run an interactive OCaml toplevel and debugger.

-- 
tuareg-mode packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] tuareg-mode packaging branch, master, updated. debian/1%2.0.4-3-6-ge8d7973

2012-05-06 Thread Ralf Treinen
The following commit has been merged in the master branch:
commit 649ddb56ab22f838d1c76d45eee353028322d3bf
Author: Ralf Treinen trei...@free.fr
Date:   Sun May 6 12:05:36 2012 +0200

synchronized master branch with upstream branch

The master branch contained two files from version 2.0.1 of turag-mode,
probably du to some accident with git-build-package.

diff --git a/append-tuareg.el b/append-tuareg.el
index e43070a..b038156 100644
--- a/append-tuareg.el
+++ b/append-tuareg.el
@@ -1,7 +1,7 @@
 ;;;
 ;; append-tuareg.el - Tuareg quick installation: Append this file to .emacs.
 
-(add-to-list 'auto-mode-alist '(\\.ml\\w? . tuareg-mode))
+(add-to-list 'auto-mode-alist '(\\.ml[iylp]? . tuareg-mode))
 (autoload 'tuareg-mode tuareg Major mode for editing Caml code t)
 (autoload 'camldebug camldebug Run the Caml debugger t)
 (dolist (ext '(.cmo .cmx .cma .cmxa .cmi))
diff --git a/debian/changelog b/debian/changelog
index 4e620c2..c57b60a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tuareg-mode (1:2.0.4-4) unstable; urgency=low
+
+  * Bring files tuareg.el and append-tuareg.el to upstream version 2.0.4.
+These two files were left in version 2.0.1 due to an accident.
+This brings also back upstream's fix of the filename pattern in
+append-tuareg.el (closes: #671558).
+
+ -- Ralf Treinen trei...@debian.org  Sun, 06 May 2012 12:19:06 +0200
+
 tuareg-mode (1:2.0.4-3) unstable; urgency=low
 
   * Really upload to sid.
diff --git a/tuareg.el b/tuareg.el
index f18b576..9a25d59 100644
--- a/tuareg.el
+++ b/tuareg.el
@@ -22,7 +22,7 @@
 (require 'easymenu)
 
 (defconst tuareg-mode-version
-  (concat Tuareg Version 2.0.1 (
+  (concat Tuareg Version 2.0.4 (
   (eval-when-compile
 (let ((file (or (and (boundp 'byte-compile-current-file)
  byte-compile-current-file)
@@ -41,6 +41,8 @@
  (call-process hg nil t nil id -i --debug))
 ((file-directory-p .svn)
  (shell-command svn info | grep Revision: | sed 
's/Revision: //' t))
+   ((file-directory-p .bzr)
+ (shell-command bzr log -l -1 | grep revno: t))
 (t (insert unknown\n)
 (buffer-substring-no-properties
  (point-min) (1- (point-max))
@@ -1013,10 +1015,12 @@ Regexp match data 0 points to the chars.
 (define-key map \C-c.t 'tuareg-insert-try-form)
 (when tuareg-with-caml-mode-p
   ;; Trigger caml-types
-  (define-key map [?\C-c ?\C-t] 'caml-types-show-type)
+  (define-key map [?\C-c ?\C-t] 'caml-types-show-type)  ; type
+  (define-key map [?\C-c ?\C-f] 'caml-types-show-call)  ; function
+  (define-key map [?\C-c ?\C-l] 'caml-types-show-ident) ; let
   ;; To prevent misbehavior in case of error during exploration.
-  (define-key map [(control mouse-2)] 'caml-types-mouse-ignore)
-  (define-key map [(control down-mouse-2)] 'caml-types-explore)
+  (define-key map [?\C-c mouse-1] 'caml-types-mouse-ignore)
+  (define-key map [?\C-c down-mouse-1] 'caml-types-explore)
   ;; Trigger caml-help
   (define-key map [?\C-c ?i] 'ocaml-add-path)
   (define-key map [?\C-c ?\[] 'ocaml-open-module)
@@ -1361,7 +1365,7 @@ For synchronous programming.)
 tuareg-keyword-regexp))
 
 (defconst tuareg-match-pipe-kwop-regexp
-  (concat (tuareg-ro and fun function type with parse parser)
+  (concat (tuareg-ro and function type with parse parser)
   \\|[[({=]\\||[^!])
   Regexp for keywords supporting case match.)
 
@@ -3682,6 +3686,8 @@ Short cuts for interaction within the toplevel:
  ---
  [ Show type at point caml-types-show-type
tuareg-with-caml-mode-p]
+ [ Show fully qualified ident at point caml-types-show-ident
+   tuareg-with-caml-mode-p]
  ---
  [ Complete identifier caml-complete
tuareg-with-caml-mode-p]

-- 
tuareg-mode packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] tuareg-mode packaging branch, master, updated. debian/1%2.0.4-3-6-ge8d7973

2012-05-06 Thread Ralf Treinen
The following commit has been merged in the master branch:
commit 4de088164f466cdfbd483f022e80263080ff72b3
Author: Ralf Treinen trei...@free.fr
Date:   Sun May 6 12:44:33 2012 +0200

debian/copyright: format 1.0

diff --git a/debian/changelog b/debian/changelog
index 4279354..7cc3fce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ tuareg-mode (1:2.0.4-4) unstable; urgency=low
 This brings also back upstream's fix of the filename pattern in
 append-tuareg.el (closes: #671558).
   * debian/control: drop starting article in short description
-
- -- Ralf Treinen trei...@debian.org  Sun, 06 May 2012 12:21:46 +0200
+  * standards-version 3.9.3
+- debian/copyright: migrate to machine-readable format 1.0
+  
+ -- Ralf Treinen trei...@debian.org  Sun, 06 May 2012 12:45:16 +0200
 
 tuareg-mode (1:2.0.4-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index e65d744..2ea9bc8 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders:
  Stéphane Glondu glo...@debian.org,
  Sylvain Le Gall gil...@debian.org
 Build-Depends: debhelper (= 7.0.50~)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/tuareg-mode.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/tuareg-mode.git
 Homepage: http://tuareg.forge.ocamlcore.org/
diff --git a/debian/copyright b/debian/copyright
index fcee08e..8af7e2d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,51 +1,52 @@
-Packaged-By: Ralf Treinen trei...@debian.org
-Packaged-Date: Fri, 19 Oct 2001 20:53:43 +0200
-Original-Source-Location: http://tuareg.forge.ocamlcore.org/
-Upstream-Author: Albert Cohen albert.co...@inria.fr
-
-Files: *
-Copyright: © 1997-2006 Albert Cohen albert.co...@inria.fr
-   © 2009-2010 Jane Street Holding, LLC
-License: GPL-2
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  On Debian systems, the full text of the GNU General Public License
-  can be found in /usr/share/common-licenses/GPL-2.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: tuareg
+Upstream-Contact: tua...@janestreet.com
+Source: https://forge.ocamlcore.org/projects/tuareg/
 
 Files: ocamlspot.el
 Copyright: © 2008-2009 Jun Furuse
 License: LGPL-2 | other
-
-  This file is distributed under the terms of the GNU Library General
-  Public License, with the special exception on linking described in
-  file LICENSE.
-
-  As a special exception to the GNU Library General Public License,
-  you may link, statically or dynamically, a work that uses the
-  Library with a publicly distributed version of the Library to
-  produce an executable file containing portions of the Library, and
-  distribute that executable file under terms of your choice, without
-  any of the additional requirements listed in clause 6 of the GNU
-  Library General Public License.  By a publicly distributed version
-  of the Library, we mean either the unmodified Library as
-  distributed by INRIA, or a modified version of the Library that is
-  distributed under the conditions defined in clause 3 of the GNU
-  Library General Public License.  This exception does not however
-  invalidate any other reasons why the executable file might be
-  covered by the GNU Library General Public License.
-
-  On Debian systems, the full text of the GNU Library General Public
-  License can be found in /usr/share/common-licenses/LGPL-2.
+ This file is distributed under the terms of the GNU Library General
+ Public License, with the special exception on linking described in
+ file LICENSE.
+ .
+ As a special exception to the GNU Library General Public License,
+ you may link, statically or dynamically, a work that uses the
+ Library with a publicly distributed version of the Library to
+ produce an executable file containing portions of the Library, and
+ distribute that executable file under terms of your choice, without
+ any of the additional requirements listed in clause 6 of the GNU
+ Library General Public License.  By a publicly distributed version
+ of the Library, we mean either the unmodified Library as
+ distributed by INRIA, or a modified version of the Library that is
+ distributed under the conditions defined in clause 3 of the GNU
+ Library General Public License.  This exception does not however
+ invalidate any other reasons why the executable file might be
+ covered by the GNU Library General Public License.
+ .
+ On Debian systems, the full text of the GNU Library 

[Pkg-ocaml-maint-commits] [SCM] tuareg-mode packaging branch, master, updated. debian/1%2.0.4-3-6-ge8d7973

2012-05-06 Thread Ralf Treinen
The following commit has been merged in the master branch:
commit b47ffaaf2e35721dabb5b7c59b2e1aacd84af642
Author: Ralf Treinen trei...@free.fr
Date:   Sun May 6 14:46:50 2012 +0200

set emacs load-path using debian-pkg-add-load-path-item

diff --git a/debian/changelog b/debian/changelog
index 7cc3fce..ea4bf13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,11 @@ tuareg-mode (1:2.0.4-4) unstable; urgency=low
   * debian/control: drop starting article in short description
   * standards-version 3.9.3
 - debian/copyright: migrate to machine-readable format 1.0
-  
- -- Ralf Treinen trei...@debian.org  Sun, 06 May 2012 12:45:16 +0200
+  * debian/emacsen-setloadpath: use debian-pkg-add-load-path-item, instead
+of explicit setting of the load-path variable, to extend the load path
+(closes: # 671557).
+
+ -- Ralf Treinen trei...@debian.org  Sun, 06 May 2012 14:45:23 +0200
 
 tuareg-mode (1:2.0.4-3) unstable; urgency=low
 
diff --git a/debian/emacsen-setloadpath b/debian/emacsen-setloadpath
index 6b44a67..846ccbe 100644
--- a/debian/emacsen-setloadpath
+++ b/debian/emacsen-setloadpath
@@ -1,7 +1,6 @@
-
-(setq load-path
-  (cons
-   (concat /usr/share/ (symbol-name flavor) /site-lisp/tuareg-mode)
-   load-path))
+(debian-pkg-add-load-path-item
+ (concat /usr/share/
+(symbol-name debian-emacs-flavor)
+/site-lisp/tuareg-mode))
 
 

-- 
tuareg-mode packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] tuareg-mode packaging branch, master, updated. debian/1%2.0.4-3-6-ge8d7973

2012-05-06 Thread Ralf Treinen
The following commit has been merged in the master branch:
commit 2a6eecd46bddf8313d1c2ff3f775a638c533de0f
Author: Ralf Treinen trei...@free.fr
Date:   Sun May 6 15:01:49 2012 +0200

autoload regexp must apply only at the end of filename

diff --git a/debian/changelog b/debian/changelog
index ea4bf13..656ffe7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,14 +2,14 @@ tuareg-mode (1:2.0.4-4) unstable; urgency=low
 
   * Bring files tuareg.el and append-tuareg.el to upstream version 2.0.4.
 These two files were left in version 2.0.1 due to an accident.
-This brings also back upstream's fix of the filename pattern in
-append-tuareg.el (closes: #671558).
+  * Patch 0003-narrow-down-auto-alist: regexp must apply only at the end
+of a filename. Thanks to Kevin Ryde for the patch (closes: #671558).
   * debian/control: drop starting article in short description
   * standards-version 3.9.3
 - debian/copyright: migrate to machine-readable format 1.0
   * debian/emacsen-setloadpath: use debian-pkg-add-load-path-item, instead
 of explicit setting of the load-path variable, to extend the load path
-(closes: # 671557).
+(closes: #671557).
 
  -- Ralf Treinen trei...@debian.org  Sun, 06 May 2012 14:45:23 +0200
 
diff --git a/debian/patches/0003-narrow-down-auto-alist 
b/debian/patches/0003-narrow-down-auto-alist
new file mode 100644
index 000..535bfc2
--- /dev/null
+++ b/debian/patches/0003-narrow-down-auto-alist
@@ -0,0 +1,17 @@
+Author: Kevin Ryde use...@zip.com.au
+Description: narrow down auto-alist to match only at the end of a filename
+Debian-bug: #671558
+
+Index: tuareg-mode/append-tuareg.el
+===
+--- tuareg-mode.orig/append-tuareg.el  2012-05-06 14:55:03.0 +0200
 tuareg-mode/append-tuareg.el   2012-05-06 14:56:37.0 +0200
+@@ -1,7 +1,7 @@
+ 
;;;
+ ;; append-tuareg.el - Tuareg quick installation: Append this file to .emacs.
+ 
+-(add-to-list 'auto-mode-alist '(\\.ml[iylp]? . tuareg-mode))
++(add-to-list 'auto-mode-alist '(\\.ml[iylp]?\\' . tuareg-mode))
+ (autoload 'tuareg-mode tuareg Major mode for editing Caml code t)
+ (autoload 'camldebug camldebug-tuareg Run the Caml debugger t)
+ (dolist (ext '(.cmo .cmx .cma .cmxa .cmi))
diff --git a/debian/patches/series b/debian/patches/series
index 4f75233..3ffc710 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-camldebug-of-tuareg-mode-is-renamed-to-camldebug-tua.patch
 0002-Use-locally-installed-documentation-when-possible.patch
+0003-narrow-down-auto-alist

-- 
tuareg-mode packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] tuareg-mode packaging branch, master, updated. debian/1%2.0.4-3-6-ge8d7973

2012-05-06 Thread Ralf Treinen
The following commit has been merged in the master branch:
commit e8d7973c3c29b92831547531ea03b3f1decd9704
Author: Ralf Treinen trei...@free.fr
Date:   Sun May 6 15:02:42 2012 +0200

refresh patch

diff --git 
a/debian/patches/0002-Use-locally-installed-documentation-when-possible.patch 
b/debian/patches/0002-Use-locally-installed-documentation-when-possible.patch
index 873..77fa678 100644
--- 
a/debian/patches/0002-Use-locally-installed-documentation-when-possible.patch
+++ 
b/debian/patches/0002-Use-locally-installed-documentation-when-possible.patch
@@ -8,9 +8,9 @@ Subject: [PATCH] Use locally installed documentation when 
possible
 
 Index: tuareg-mode/tuareg.el
 ===
 tuareg-mode.orig/tuareg.el 2010-05-27 07:35:49.0 +0200
-+++ tuareg-mode/tuareg.el  2010-05-27 07:44:21.0 +0200
-@@ -364,7 +364,11 @@
+--- tuareg-mode.orig/tuareg.el 2012-05-06 12:05:11.0 +0200
 tuareg-mode/tuareg.el  2012-05-06 14:55:03.0 +0200
+@@ -366,7 +366,11 @@
*Non nil means pop up the Caml toplevel when evaluating code.
:group 'tuareg :type 'boolean)
  
@@ -23,7 +23,7 @@ Index: tuareg-mode/tuareg.el
*URL to the Caml reference manual.
:group 'tuareg :type 'string)
  
-@@ -373,7 +377,7 @@
+@@ -375,7 +379,7 @@
  Valid names are `browse-url', `browse-url-firefox', etc.
:group 'tuareg)
  

-- 
tuareg-mode packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] tuareg-mode packaging annotated tag, debian/1%2.0.4-4, created. debian/1%2.0.4-4

2012-05-06 Thread Ralf Treinen
The annotated tag, debian/1%2.0.4-4 has been created
at  c4d8599a99b0b24202dbc67001614d198a1e2e03 (tag)
   tagging  e8d7973c3c29b92831547531ea03b3f1decd9704 (commit)
  replaces  debian/1%2.0.4-3
 tagged by  Ralf Treinen
on  Sun May 6 15:13:25 2012 +0200

- Shortlog 
Debian release 1:2.0.4-4

Ralf Treinen (6):
  synchronized master branch with upstream branch
  improve short description
  debian/copyright: format 1.0
  set emacs load-path using debian-pkg-add-load-path-item
  autoload regexp must apply only at the end of filename
  refresh patch

---

-- 
tuareg-mode packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits


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

2012-05-06 Thread Enrico Tassi
The following commit has been merged in the master branch:
commit 3f142ce931e841a6dc57fbc9e2e5b8491f20cf90
Merge: 81f446c547f03a0d007be3a1802ee6075a0e20e2 
2c65a3dc9da1af0ca1810d6e23a5bb8bcdd64115
Author: Enrico Tassi gareuselesi...@debian.org
Date:   Sun May 6 18:10:31 2012 +0200

Merge tag 'upstream/0.99.1'

Upstream version 0.99.1


-- 
matita packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits


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

2012-05-06 Thread Enrico Tassi
The following commit has been merged in the master branch:
commit 156f5288de051c68fb6157ff66edf874bca1d6d0
Author: Enrico Tassi gareuselesi...@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 gareuselesi...@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..000
--- 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..000
--- 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..000
--- 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 000..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 

[Pkg-ocaml-maint-commits] [SCM] matita packaging branch, pristine-tar, updated. 630839b06fe2ed5e849f097ee8e33434b804811a

2012-05-06 Thread Enrico Tassi
The following commit has been merged in the pristine-tar branch:
commit 630839b06fe2ed5e849f097ee8e33434b804811a
Author: Enrico Tassi gareuselesi...@debian.org
Date:   Sun May 6 18:10:30 2012 +0200

pristine-tar data for matita_0.99.1.orig.tar.gz

diff --git a/matita_0.99.1.orig.tar.gz.delta b/matita_0.99.1.orig.tar.gz.delta
new file mode 100644
index 000..2149263
Binary files /dev/null and b/matita_0.99.1.orig.tar.gz.delta differ
diff --git a/matita_0.99.1.orig.tar.gz.id b/matita_0.99.1.orig.tar.gz.id
new file mode 100644
index 000..ab4a52b
--- /dev/null
+++ b/matita_0.99.1.orig.tar.gz.id
@@ -0,0 +1 @@
+4f52531a98e725c6a71ea4be08f083cc0e6aab6a

-- 
matita packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] matita packaging annotated tag, debian/0.99.1-1, created. debian/0.99.1-1

2012-05-06 Thread Enrico Tassi
The annotated tag, debian/0.99.1-1 has been created
at  b36e49fafd1f86136182de768113e56bca8251a5 (tag)
   tagging  156f5288de051c68fb6157ff66edf874bca1d6d0 (commit)
  replaces  debian/0.5.8-4
 tagged by  Enrico Tassi
on  Sun May 6 22:54:31 2012 +0200

- Shortlog 
Debian release 0.99.1-1

Enrico Tassi (3):
  Imported Upstream version 0.99.1
  Merge tag 'upstream/0.99.1'
  Matita 0.99.1 packaged

---

-- 
matita packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] matita packaging annotated tag, upstream/0.99.1, created. upstream/0.99.1

2012-05-06 Thread Enrico Tassi
The annotated tag, upstream/0.99.1 has been created
at  b60bff185235a2664be9c120eacc37240d9d2de4 (tag)
   tagging  2c65a3dc9da1af0ca1810d6e23a5bb8bcdd64115 (commit)
  replaces  upstream/0.5.8
 tagged by  Enrico Tassi
on  Sun May 6 18:10:31 2012 +0200

- Shortlog 
Upstream version 0.99.1

Enrico Tassi (1):
  Imported Upstream version 0.99.1

---

-- 
matita packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits