[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 
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   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 
b/debian/patches/Fix-FTBFS-with-camlp5-6.05.patch
deleted file mode 100644
ind

[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 
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