[Pkg-ocaml-maint-commits] r3501 - in /trunk/packages/headache/trunk/debian: changelog control rules watch xml-man/Makefile xml-man/headache.xml

gildor at users.alioth.debian.org gildor at users.alioth.debian.org
Sun Jan 7 22:57:21 CET 2007


Author: gildor
Date: Sun Jan  7 22:57:21 2007
New Revision: 3501

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3501
Log:
[copy and past changelog]
* Upgrade debian/watch version to 3,
* Rewrite and relicense debian/xml-man/headache.xml
-- SLG

Modified:
    trunk/packages/headache/trunk/debian/changelog
    trunk/packages/headache/trunk/debian/control
    trunk/packages/headache/trunk/debian/rules
    trunk/packages/headache/trunk/debian/watch
    trunk/packages/headache/trunk/debian/xml-man/Makefile
    trunk/packages/headache/trunk/debian/xml-man/headache.xml

Modified: trunk/packages/headache/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/headache/trunk/debian/changelog?rev=3501&op=diff
==============================================================================
--- trunk/packages/headache/trunk/debian/changelog (original)
+++ trunk/packages/headache/trunk/debian/changelog Sun Jan  7 22:57:21 2007
@@ -1,3 +1,10 @@
+headache (1.03-10) UNRELEASED; urgency=low
+
+  * Upgrade debian/watch version to 3,
+  * Rewrite and relicense debian/xml-man/headache.xml,
+
+ -- Sylvain Le Gall <gildor at debian.org>  Sun,  5 Nov 2006 16:23:30 +0100
+
 headache (1.03-9) unstable; urgency=low
 
   * Update upstream mail,

Modified: trunk/packages/headache/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/headache/trunk/debian/control?rev=3501&op=diff
==============================================================================
--- trunk/packages/headache/trunk/debian/control (original)
+++ trunk/packages/headache/trunk/debian/control Sun Jan  7 22:57:21 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Sylvain Le Gall <gildor at debian.org>
 Build-Depends-Indep: ocaml-nox-3.09.2, po-debconf, xsltproc, docbook-xsl, docbook-xml
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.09.2-7)
 Standards-Version: 3.7.2
 XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/headache
 

Modified: trunk/packages/headache/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/headache/trunk/debian/rules?rev=3501&op=diff
==============================================================================
--- trunk/packages/headache/trunk/debian/rules (original)
+++ trunk/packages/headache/trunk/debian/rules Sun Jan  7 22:57:21 2007
@@ -23,16 +23,16 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/class/ocaml.mk
 
 DEB_MAKE_CLEAN_TARGET    := clean
 DEB_MAKE_BUILD_TARGET    := 
 DEB_MAKE_INSTALL_TARGET  := install INSTALLDIR="$(DEB_DESTDIR)/usr/bin"
 
+CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.09.2-7),$(CDBS_BUILD_DEPENDS))
+
 clean::
-	-$(DEB_MAKE_ENVVARS) $(MAKE) -C debian/xml-man clean
+	-$(DEB_MAKE_ENVVARS) $(MAKE) -C $(CURDIR)/debian/xml-man clean
 
 build/headache::
-	$(DEB_MAKE_ENVVARS) $(MAKE) -C debian/xml-man all
-
-OCAMLABI                = $(shell ocamlc -version)
-DEB_DH_GENCONTROL_ARGS += -- -VF:OCamlABI="$(OCAMLABI)"
+	$(DEB_MAKE_ENVVARS) $(MAKE) -C $(CURDIR)/debian/xml-man all

Modified: trunk/packages/headache/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/headache/trunk/debian/watch?rev=3501&op=diff
==============================================================================
--- trunk/packages/headache/trunk/debian/watch (original)
+++ trunk/packages/headache/trunk/debian/watch Sun Jan  7 22:57:21 2007
@@ -1,2 +1,2 @@
-version=2
+version=3
 http://pauillac.inria.fr/~simonet/soft/headache/headache-(.*)\.tar\.gz

Modified: trunk/packages/headache/trunk/debian/xml-man/Makefile
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/headache/trunk/debian/xml-man/Makefile?rev=3501&op=diff
==============================================================================
--- trunk/packages/headache/trunk/debian/xml-man/Makefile (original)
+++ trunk/packages/headache/trunk/debian/xml-man/Makefile Sun Jan  7 22:57:21 2007
@@ -1,8 +1,17 @@
-
-%.1: %.xml
-	xsltproc --nonet /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl $^
+# Makefile for building headache manpages.
+# GNU Copyright 2003-2006, by Sylvain Le Gall <gildor at debian.org>.
 
 all: headache.1
 
 clean:
-	rm -rf *.1
+	-$(RM) *.1
+
+%.1: %.xml
+	# Verification
+	-xmllint --nonet --noout --postvalid --xinclude $^
+	# Compilation
+	xsltproc --nonet --xinclude \
+	  /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
+	  $^
+
+

Modified: trunk/packages/headache/trunk/debian/xml-man/headache.xml
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/headache/trunk/debian/xml-man/headache.xml?rev=3501&op=diff
==============================================================================
--- trunk/packages/headache/trunk/debian/xml-man/headache.xml (original)
+++ trunk/packages/headache/trunk/debian/xml-man/headache.xml Sun Jan  7 22:57:21 2007
@@ -1,234 +1,268 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" 
-  "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd" [
-  <!ENTITY debian      "<!--productname-->Debian GNU/Linux<!--/productname-->">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" 
+  "/usr/share/sgml/docbook/dtd/xml/4.4/docbookx.dtd" [
+  <!ENTITY debian      "Debian GNU/Linux">
   <!ENTITY dhprg       "<command>headache</command>">
 ]>
 
+<!--**********************************************************************-->
+<!-- Headache manpage                                                     -->
+<!--                                                                      -->
+<!-- Copyright (C) 2003-2006 Sylvain Le Gall <gildor at debian.org>          -->
+<!--                                                                      -->
+<!-- This library is free software; you can redistribute it and/or        -->
+<!-- modify it under the terms of the GNU Lesser General Public           -->
+<!-- License as published by the Free Software Foundation; either         -->
+<!-- version 2.1 of the License, or (at your option) any later version;   -->
+<!-- with the OCaml static compilation exception.                         -->
+<!--                                                                      -->
+<!-- This library 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    -->
+<!-- Lesser General Public License for more details.                      -->
+<!--                                                                      -->
+<!-- You should have received a copy of the GNU Lesser General Public     -->
+<!-- License along with this library; if not, write to the Free Software  -->
+<!-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               -->
+<!-- MA 02110-1301, USA.                                                  -->
+<!--                                                                      -->
+<!-- Contact: gildor at debian.org                                           -->
+<!--**********************************************************************-->
+
 <refentry>
 
-<refentryinfo>
-        <address><email>sylvain.le-gall at polytechnique.org</email></address>
-        <author>
-                <firstname>Sylvain</firstname>
-                <surname>LE GALL</surname>
-        </author>
-        <copyright>
-                <year>2003</year>
-                <holder>Sylvain LE GALL</holder>
-        </copyright>
-        <date>Feb 15, 2004</date>
-</refentryinfo>
-
-<refmeta>
-        <refentrytitle>HEADACHE</refentrytitle>
-        <manvolnum>1</manvolnum>
-</refmeta>
-
-<refnamediv>
-        <refname>&dhprg;</refname>
-
-        <refpurpose>A program to manage the license of your source
-	file.</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<cmdsynopsis>
+  <refentryinfo>
+    <author>
+      <firstname>Sylvain</firstname>
+      <surname>Le Gall</surname>
+      <email>gildor at debian.org</email>
+      </author>
+      <copyright>
+        <year>2003, 2004, 2005, 2006</year>
+        <holder>Sylvain Le Gall</holder>
+      </copyright>
+      <date>Feb 15, 2004</date>
+    </refentryinfo>
+    
+    <refmeta>
+      <refentrytitle>HEADACHE</refentrytitle>
+      <manvolnum>1</manvolnum>
+    </refmeta>
+    
+    <refnamediv>
+      <refname>&dhprg;</refname>
+
+      <refpurpose>A program to manage the license of your source
+        file.</refpurpose>
+    </refnamediv>
+    
+    <refsynopsisdiv>
+      <cmdsynopsis>
         &dhprg; 
-	<arg>-h <filename>file</filename></arg>
-	<arg>-c <filename>file</filename></arg>
-	<arg>-r</arg>
-	<arg>-help <replaceable>--help</replaceable></arg>
-	<filename>files</filename>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1>
-        <title>DESCRIPTION</title>
-
-        <para>This manual page documents briefly the &dhprg; command.</para>
-
-        <para>This manual page was written for the &debian; distribution
-        because the original program does not have a manual page.</para>
-
-	<para>It is a common usage to put at the beginning of source code files a
-        short header giving, for instance, some copyright informations. &dhprg;
-        is a simple and lightweight tool for managing easily these headers.
-        Among its functionalities, one may mention:
-	<itemizedlist>
-	  <listitem>
-	  	  <para>Headers must generally be generated as comments in source  code
-                  files. &dhprg; deals with different files types and generates  for
-                  each of them headers in an appropriate format.</para>
-	  </listitem>
-	  <listitem>
-	  	  <para>Headers automatically detects existing headers and removes them. 
-                  Thus, you can use it to update headers in a set of files.</para>
+        <arg>-h 
+          <replaceable>file</replaceable>
+        </arg>
+        <arg>-c 
+          <replaceable>file</replaceable>
+        </arg>
+        <arg>-r</arg>
+        <group>
+          <arg choice="plain">-help</arg>
+          <arg choice="plain">--help</arg>
+        </group>
+        <arg choice="plain" rep="repeat">
+          <replaceable>file</replaceable>
+        </arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the &dhprg; command.</para>
+
+    <para>This manual page was written for the &debian; distribution
+      because the original program does not have a manual page.</para>
+  
+    <para>It is a common usage to put at the beginning of source code files a
+      short header giving, for instance, some copyright informations. &dhprg;
+      is a simple and lightweight tool for managing easily these headers.
+      Among its functionalities, one may mention:
+    
+      <itemizedlist>
+        <listitem>
+          <para>Headers must generally be generated as comments in source  code
+            files. &dhprg; deals with different files types and generates  for
+            each of them headers in an appropriate format.</para>
           </listitem>
-	</itemizedlist>
-        </para>
-</refsect1>
-
-<refsect1>
-	<title>COMMAND LINE OPTIONS</title>
-
-	<variablelist>
-	<varlistentry>
-		<term><filename>file</filename></term>
-		<listitem>
-			<para>Name of one file to process</para>
-		</listitem>
-	</varlistentry>
-  	<varlistentry>
-		<term>-h <filename>file</filename></term>
-		<listitem>
-			<para>Create a header with text coming from 
-			<filename>file</filename></para>
-		</listitem>
-	</varlistentry>
-   	<varlistentry>
-		<term>-c <filename>file</filename></term>
-		<listitem>
-			<para>Read the given configuration
-			<filename>file</filename></para>
-		</listitem>
-	</varlistentry>
-    	<varlistentry>
-		<term>-help <replaceable>--help</replaceable></term>
-		<listitem>
-			<para>Display the option list of &dhprg;</para>
-		</listitem>
-	</varlistentry>
-	</variablelist>
-  
-</refsect1>
-
-<refsect1>
-	<title>USAGE</title>
-	
-        <para>Let us illustrate the use of this tool with a small example. Assume
-	you have a small project mixing C and Caml code consisting in three
-	files 'foo.c', 'bar.ml' and 'bar.mli'', and you want to equip them with
-	some header. First of all, write a header  file, i.e. a plain text file
-	including the information headers must mention. An example of such a
-	file is given in figure 1. In the following, we assume this file is
-	named 'myheader' and is in the same directory as source files.</para>
-
-	<para>
-	Then, in order to generate headers, just run the command : 
-	<command>&dhprg; -h <filename>myheader</filename>
-		<filename>foo.c</filename>
-		<filename>bar.ml</filename>
-		<filename>bar.mli</filename>
-	</command>
-	</para>
-
-	<para>Each file is equipped with an header including the text given in the
-	header file 'myheader', surrounded by some extra characters depending on
-	its format making it a comment (e.g. '(*' and '*)' in '.ml' files). If
-	you update informations in the header file 'myheader', you simply need
-	to re-run the above command to update headers in source code files:
-	existing ones are automatically removed.
-	</para>
-	
-	<para>
-	Similarly, running : 
-	<command>&dhprg; -r 
-		<filename>foo.c</filename>
-		<filename>bar.ml</filename>
-		<filename>bar.mli</filename>
-	</command>
-	removes any existing in files 'foo.c', 'bar.ml' and 'bar.mli'. Files
-	which do not have a header are kept unchanged.
-	</para>
-
-</refsect1>
-
-<refsect1>
-	<title>CONFIGURATION FILE</title>
-
-	<para>File types and format of header may be specified by a configuration
-	file. By default, the default builtin configuration file given in figure
-	2 is used. You can also use your own configuration file thanks to the
-	<arg>-c</arg> option : 
-	<command>&dhprg; 
-		-c <filename>myconfig</filename>
-		-h <filename>myheader</filename>
-		<filename>foo.c</filename>
-		<filename>bar.ml</filename>
-		<filename>bar.mli</filename>
-	</command>
-	</para>
-  
-	<para>In order to write your own configuration, you can follow the example
-	given in figure 2. A configuration file consists in a list of entries
-	separated by the character '|'. Each of them is made of two parts
-	separated by an '->'.</para>
-	
-	<para>The first one is a regular expression. (Regular  expression are
-	enclosed within double quotes and have the same  syntax as in Gnu
-	Emacs.) &dhprg; determines file types according to  file basenames;
-	thus, each file is dealt with using the first line  its name matches.
-	</para>
-	
-	<para>The second one describes the format of headers for files of this 
-	type. It consists of the name of a model (e.g.   'frame'), possibly
-	followed by a list of arguments. Arguments  are named: 'open:"(*"'
-	means that the value of the argument  'open' is '(*'. 
-	&dhprg; currently supports three models:</para>
-	
-	<variablelist>
-		<varlistentry>
-			<term>frame</term>
-			<listitem>
-			<para>With this model, headers are generated in a  frame. This
-			model requires three arguments: 'open' and  'close' (the opening and
-			closing sequences for comments) and  'line' (the character used to
-			make the horizontal lines of the  frame). Two optional arguments may
-			be used 'margin' (a string  printed between the left and right side
-			of the frame and the border,  by default two spaces) and 'width' (the
-			width of the inside of  the frame, default is 68).</para>
-			</listitem>
-		</varlistentry>
-		<varlistentry>
-			<term>lines</term>
-			<listitem>
-			<para>Headers are typeset between two lines. Three  arguments must
-			be provided: 'open' and 'close' (the  opening and closing sequences
-			for comments), 'line' (the  character used to make the horizontal
-			lines). Three optional  arguments are allowd: 'begin' (a string
-			typeset at the  beginning of each line, by default two spaces),
-			'last' (a  string typeset at the beginning of the last line) and
-			'width'  (the width of the lines, default is 70).</para>
-			</listitem>
-		</varlistentry>
-		<varlistentry>
-			<term>no</term>
-			<listitem>
-			<para>This model generates no header and has no argument.</para>
-			</listitem>
-		</varlistentry>
-	</variablelist>
-</refsect1>
-
-<refsect1>
-        <title>SEE ALSO</title>
-
-        <para><filename>/usr/share/doc/headache/manual.html</filename></para>
-</refsect1>
-
-<refsect1>
-        <title>AUTHOR</title>
-
-        <para>This manual page was written by Sylvain LE GALL 
-        <email>sylvain.le-gall at polytechnique.org</email> for
-        the <!--productname-->Debian GNU/Linux<!--/productname--> system 
-        (but may be used by others).  Permission is
-        granted to copy, distribute and/or modify this document under
-        the terms of the <acronym>GNU</acronym> General Public 
-        License, Version 2.0 or any later version published by the Free
-        Software Foundation.</para>
-</refsect1>
+          <listitem>
+            <para>Headers automatically detects existing headers and removes them. 
+              Thus, you can use it to update headers in a set of files.</para>
+          </listitem>
+      </itemizedlist>
+    </para>
+  </refsect1>
+  
+  <refsect1>
+    <title>COMMAND LINE OPTIONS</title>
+  
+    <variablelist>
+      <varlistentry>
+        <term><filename>file</filename></term>
+        <listitem>
+          <para>Name of one file to process</para>
+        </listitem>
+      </varlistentry>    
+      <varlistentry>
+        <term>-h <filename>file</filename></term>
+        <listitem>
+          <para>Create a header with text coming from 
+            <filename>file</filename></para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>-c <filename>file</filename></term>
+        <listitem>
+          <para>Read the given configuration
+            <filename>file</filename></para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>-help</term>
+        <term>--help</term>
+        <listitem>
+          <para>Display the option list of &dhprg;</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  
+  </refsect1>
+  
+  <refsect1>
+    <title>USAGE</title>
+
+    <para>Let us illustrate the use of this tool with a small example. Assume
+      you have a small project mixing C and Caml code consisting in three
+      files 'foo.c', 'bar.ml' and 'bar.mli'', and you want to equip them with
+      some header. First of all, write a header  file, i.e. a plain text file
+      including the information headers must mention. An example of such a
+      file is given in figure 1. In the following, we assume this file is
+      named 'myheader' and is in the same directory as source files.</para>
+
+    <para>Then, in order to generate headers, just run the command : 
+      <command>&dhprg; -h <filename>myheader</filename>
+        <filename>foo.c</filename>
+        <filename>bar.ml</filename>
+        <filename>bar.mli</filename>
+      </command>
+    </para>
+
+    <para>Each file is equipped with an header including the text given in the
+      header file 'myheader', surrounded by some extra characters depending on
+      its format making it a comment (e.g. '(*' and '*)' in '.ml' files). If
+      you update informations in the header file 'myheader', you simply need
+      to re-run the above command to update headers in source code files:
+      existing ones are automatically removed.</para>
+    
+    <para>Similarly, running :
+      <command>&dhprg; -r 
+        <filename>foo.c</filename>
+        <filename>bar.ml</filename>
+        <filename>bar.mli</filename>
+      </command>
+      removes any existing in files 'foo.c', 'bar.ml' and 'bar.mli'. Files
+      which do not have a header are kept unchanged.</para>
+
+  </refsect1>
+
+  <refsect1>
+    <title>CONFIGURATION FILE</title>
+
+    <para>File types and format of header may be specified by a configuration
+      file. By default, the default builtin configuration file given in figure
+      2 is used. You can also use your own configuration file thanks to the
+      <option>-c</option> option : 
+      <command>&dhprg; 
+        -c <filename>myconfig</filename>
+        -h <filename>myheader</filename>
+        <filename>foo.c</filename>
+        <filename>bar.ml</filename>
+        <filename>bar.mli</filename>
+      </command></para>
+    
+    <para>In order to write your own configuration, you can follow the example
+      given in figure 2. A configuration file consists in a list of entries
+      separated by the character '|'. Each of them is made of two parts
+      separated by an '->'.</para>
+    
+    <para>The first one is a regular expression. (Regular  expression are
+      enclosed within double quotes and have the same  syntax as in Gnu
+      Emacs.) &dhprg; determines file types according to  file basenames;
+      thus, each file is dealt with using the first line  its name matches.
+    </para>
+    
+    <para>The second one describes the format of headers for files of this 
+      type. It consists of the name of a model (e.g.   'frame'), possibly
+      followed by a list of arguments. Arguments  are named: 'open:"(*"'
+      means that the value of the argument  'open' is '(*'. 
+      &dhprg; currently supports three models:</para>
+      
+    <variablelist>
+      <varlistentry>
+        <term>frame</term>
+        <listitem>
+          <para>With this model, headers are generated in a  frame. This
+            model requires three arguments: 'open' and  'close' (the opening and
+            closing sequences for comments) and  'line' (the character used to
+            make the horizontal lines of the  frame). Two optional arguments may
+            be used 'margin' (a string  printed between the left and right side
+            of the frame and the border,  by default two spaces) and 'width' (the
+            width of the inside of  the frame, default is 68).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>lines</term>
+        <listitem>
+          <para>Headers are typeset between two lines. Three  arguments must
+            be provided: 'open' and 'close' (the  opening and closing sequences
+            for comments), 'line' (the  character used to make the horizontal
+            lines). Three optional  arguments are allowd: 'begin' (a string
+            typeset at the  beginning of each line, by default two spaces),
+            'last' (a  string typeset at the beginning of the last line) and
+            'width'  (the width of the lines, default is 70).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>no</term>
+        <listitem>
+          <para>This model generates no header and has no argument.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para><filename>/usr/share/doc/headache/manual.html</filename></para>
+  </refsect1>
+
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by 
+      <personname>
+        <firstname>Sylvain</firstname>
+        <surname>Le Gall</surname>
+      </personname>
+      <email>gildor at debian.org</email> 
+      Permission is granted to copy, distribute and/or modify this document
+      under the terms of the <acronym>GNU</acronym> Lesser General Public
+      License, Version 2.1 or any later version published by the Free Software
+      Foundation; considering as source code all the file that enable the
+      production of this manpage.</para>
+
+  </refsect1>
 
 </refentry>
 




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