[Pkg-ocaml-maint-commits] r6041 - in /trunk/packages/matita/trunk/debian: changelog control matita-doc.doc-base patches/00list patches/manual.dpatch rules

gareuselesinge at users.alioth.debian.org gareuselesinge at users.alioth.debian.org
Sat Nov 22 14:52:26 UTC 2008 

Author: gareuselesinge
Date: Sat Nov 22 14:52:26 2008
New Revision: 6041

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=6041
Log:
matita builds a matita-doc packages and registers it with doc-base

Added:
    trunk/packages/matita/trunk/debian/matita-doc.doc-base
    trunk/packages/matita/trunk/debian/patches/manual.dpatch   (with props)
Modified:
    trunk/packages/matita/trunk/debian/changelog
    trunk/packages/matita/trunk/debian/control
    trunk/packages/matita/trunk/debian/patches/00list
    trunk/packages/matita/trunk/debian/rules

Modified: trunk/packages/matita/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/matita/trunk/debian/changelog?rev=6041&op=diff
==============================================================================
--- trunk/packages/matita/trunk/debian/changelog (original)
+++ trunk/packages/matita/trunk/debian/changelog Sat Nov 22 14:52:26 2008
@@ -1,8 +1,16 @@
-matita (0.5.5-2) UNRELEASED; urgency=low
+matita (0.5.5-2) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * Bumped standards-version to 3.8.0, no changes needed
+  * Added matita-doc package to contain the .html and .pdf versions of 
+    the user manual
+  * Added matita-doc.doc-base to register the user manual shipped by 
+    matita-doc
+  * Relaxed dependency of matita-standard-library to >= making it 
+    bin-nmuable. The bin-nmu is safe only if the OCaml compiler used to
+    build the binary package has the same marshalling convention
+    of the one used to build the arch-all package. (Closes: #454176)
 
- -- Enrico Tassi <gareuselesinge at debian.org>  Mon, 17 Nov 2008 18:49:26 +0100
+ -- Enrico Tassi <gareuselesinge at debian.org>  Sat, 22 Nov 2008 15:45:34 +0100
 
 matita (0.5.5-1) experimental; 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=6041&op=diff
==============================================================================
--- trunk/packages/matita/trunk/debian/control (original)
+++ trunk/packages/matita/trunk/debian/control Sat Nov 22 14:52:26 2008
@@ -4,7 +4,8 @@
 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)
-Standards-Version: 3.7.3
+Build-Depends-Indep: xsltproc, dblatex
+Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/matita/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/matita/trunk/
 Homepage: http://matita.cs.unibo.it
@@ -12,7 +13,7 @@
 Package: matita
 Architecture: any
 Depends: ${shlibs:Depends}, ${interpreter:Depends}
-Recommends: matita-standard-library, graphviz
+Recommends: matita-standard-library, graphviz, yelp
 Description: interactive theorem prover
  Matita is a graphical interactive theorem prover based on the Calculus of
  (Co)Inductive Constructions. 
@@ -26,10 +27,18 @@
 
 Package: matita-standard-library
 Architecture: all
-Depends: matita (= ${source:Version})
+Depends: matita (>= ${source:Version})
 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
+Section: doc
+Description: user manual of the Matita interactive theorem prover
+ This package contains the PDF and HTML formatted Matita user manual.
+

Added: trunk/packages/matita/trunk/debian/matita-doc.doc-base
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/matita/trunk/debian/matita-doc.doc-base?rev=6041&op=file
==============================================================================
--- trunk/packages/matita/trunk/debian/matita-doc.doc-base (added)
+++ trunk/packages/matita/trunk/debian/matita-doc.doc-base Sat Nov 22 14:52:26 2008
@@ -1,0 +1,12 @@
+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/*

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=6041&op=diff
==============================================================================
--- trunk/packages/matita/trunk/debian/patches/00list (original)
+++ trunk/packages/matita/trunk/debian/patches/00list Sat Nov 22 14:52:26 2008
@@ -1,3 +1,4 @@
 matita.conf.xml.in.dpatch
 numbers.dpatch
 native-compilers.dpatch
+manual.dpatch

Added: trunk/packages/matita/trunk/debian/patches/manual.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/matita/trunk/debian/patches/manual.dpatch?rev=6041&op=file
==============================================================================
--- trunk/packages/matita/trunk/debian/patches/manual.dpatch (added)
+++ trunk/packages/matita/trunk/debian/patches/manual.dpatch Sat Nov 22 14:52:26 2008
@@ -1,0 +1,137 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## manual.dpatch by Enrico Tassi <gareuselesinge at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: picked from upstream commit 9231, uses dblatex to generate .pdf
+
+ at DPATCH@
+diff -urNad trunk~/matita/help/C/Makefile trunk/matita/help/C/Makefile
+--- trunk~/matita/help/C/Makefile	2007-05-23 16:13:22.000000000 +0200
++++ trunk/matita/help/C/Makefile	2008-11-22 15:02:45.000000000 +0100
+@@ -3,103 +3,47 @@
+ 
+ XSLTPROC=xsltproc
+ XHTML_XSL=xsl/matita-xhtml.xsl
+-FO_XSL=xsl/matita-fo.xsl
+-TEX_XSL=xsl/matita-tex.xsl
+-TEX_UNICODE_PATH=$(SRCROOT)/share/texmf/unicode
+-TEX_ENV=TEXINPUTS=.:$(TEX_UNICODE_PATH):$(TEX_UNICODE_PATH)/data:
+ MAIN=matita.xml
+ DEPS := $(wildcard *.xml)
+ 
+ DESTDIR = /usr/local/share/doc/matita/
+ 
+-all: quickref
++all: quickref-stamp html-stamp pdf-stamp
+ 
+-quickref: tactics_quickref.xml declarative_tactics_quickref.xml
++quickref-stamp: tactics_quickref.xml declarative_tactics_quickref.xml
++	touch $@
+ 
+ tactics_quickref.xml: xsl/tactic_quickref.xsl sec_tactics.xml
+-	$(XSLTPROC) --param declarative "''" $< matita.xml > tactics_quickref.xml
++	$(XSLTPROC) --param declarative "''" $< matita.xml > $@
+ declarative_tactics_quickref.xml: xsl/tactic_quickref.xsl sec_declarative_tactics.xml
+-	$(XSLTPROC) --param declarative "'declarative_'" $< matita.xml > declarative_tactics_quickref.xml
+-
+-# one of: "fop", "pdflatex"
+-PDF_METHOD=pdflatex
+-
+-# one of: "docbook2tex", "xsl"
+-TEX_METHOD=xsl
+-
+-clean:
+-	rm -f *.html *.fo *.pdf
+-	rm -rf $(filter-out version.txt,$(wildcard *.txt))
+-	rm -f *-stamp
+-	rm -f matita.out matita.log matita.glo matita.dvi matita.idx
+-	rm -f matita.aux matita.tex
+-
+-# test (dumb implementation)
+-test:
+-	SP_ENCODING=UTF-8 docbook2txt matita.xml
+-
+-# XHTMLs generation
++	$(XSLTPROC) --param declarative "'declarative_'" $< matita.xml > $@
+ 
+-.PHONY: html
+-html: html-stamp
++html: quickref-stamp html-stamp
+ html-stamp: $(MAIN) $(DEPS) $(XHTML_XSL)
+ 	$(XSLTPROC) $(XHTML_XSL) $<
+ 	touch $@
+ 
+-# TXTs generation
+-
+-TXTS = $(patsubst %.html,%.txt,$(wildcard *.html))
+-.PHONY: txt
+-txt: txt-stamp
+-txt-stamp: html-stamp
+-	$(MAKE) txt-stamp-rec
+-	touch $@
+-txt-stamp-rec: $(TXTS)
+-%.txt: %.html
+-	w3m -dump -no-graph $< > $@
+-
+-# PDF generation
+-
+-pdf: pdf-stamp
++pdf: quickref-stamp pdf-stamp
+ pdf-stamp: $(patsubst %.xml,%.pdf,$(MAIN))
+ 	touch $@
+ 
+-%.fo: %.xml
+-	$(XSLTPROC) $(FO_XSL) $< | xmllint --format - > $@
+-ifeq ($(TEX_METHOD),docbook2tex)
+-%.tex: %.xml $(DEPS)
+-	docbook2tex $<
+-else ifeq ($(TEX_METHOD),xsl)
+-%.tex: %.xml $(TEX_XSL) $(DEPS)
+-	$(XSLTPROC) $(TEX_XSL) $< > $@
+-endif
+-
+-ifeq ($(PDF_METHOD),fop)
+-%.pdf: %.fo
+-	fop $< $@
+-else ifeq ($(PDF_METHOD),pdflatex)
+-%.pdf: %.tex
+-	$(TEX_ENV) pdflatex $<
+-endif
+-
+-%.dvi: %.tex
+-	$(TEX_ENV) latex $<
+-%.ps: %.dvi
+-	dvips $<
+-
+-# installation
++%.pdf: %.xml
++	dblatex -tpdf $<
++%.dvi: %.xml
++	dblatex -tdvi $<
++%.ps: %.xml
++	dblatex -tps $<
+ 
+ install: install-html
+-install-html: html-stamp
+-	cp *.html *.css $(DESTDIR)
+-	test -d $(DESTDIR)/figures || mkdir $(DESTDIR)/figures
+-	cp figures/* $(DESTDIR)/figures/
+-
+-# shotcuts
+-
+-tex: $(patsubst %.xml,%.tex,$(MAIN))
+-dvi: $(patsubst %.xml,%.dvi,$(MAIN))
+-ps: $(patsubst %.xml,%.ps,$(MAIN))
++install-html: html-stamp pdf-stamp
++	mkdir -p $(DESTDIR)/html
++	cp *.html *.css $(DESTDIR)/html
++	test -d $(DESTDIR)/html/figures || mkdir $(DESTDIR)/html/figures
++	cp figures/* $(DESTDIR)/html/figures/
++	mkdir -p $(DESTDIR)/pdf
++	cp matita.pdf $(DESTDIR)/pdf
+ 
+-.PRECIOUS: matita.tex matita.dvi
++clean:
++	rm -f *.html *.pdf *.ps *.dvi *.tex
++	rm -f *-stamp 
+ 

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

Modified: trunk/packages/matita/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/matita/trunk/debian/rules?rev=6041&op=diff
==============================================================================
--- trunk/packages/matita/trunk/debian/rules (original)
+++ trunk/packages/matita/trunk/debian/rules Sat Nov 22 14:52:26 2008
@@ -11,6 +11,7 @@
 	--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)
@@ -53,5 +54,8 @@
 
 
 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

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