[Pkg-ocaml-maint-commits] r958 - in packages/hevea/trunk/debian: . patches
Ralf Treinen
treinen@costa.debian.org
Mon, 07 Feb 2005 19:48:55 +0100
Author: treinen
Date: 2005-02-07 19:48:55 +0100 (Mon, 07 Feb 2005)
New Revision: 958
Added:
packages/hevea/trunk/debian/patches/05_license.dpatch
Modified:
packages/hevea/trunk/debian/changelog
packages/hevea/trunk/debian/control
packages/hevea/trunk/debian/copyright
packages/hevea/trunk/debian/patches/00list
Log:
hevea 1.07-5
Modified: packages/hevea/trunk/debian/changelog
===================================================================
--- packages/hevea/trunk/debian/changelog 2005-02-07 18:47:54 UTC (rev 957)
+++ packages/hevea/trunk/debian/changelog 2005-02-07 18:48:55 UTC (rev 958)
@@ -1,3 +1,16 @@
+hevea (1.07-5) unstable; urgency=low
+
+ * New licence received from upstream author by email : Clause 6c of
+ QPL does not apply, and no choice of venue (patch 05_license)
+ * Distinguish "licence" and "copyright" in debian/copyright
+ (closes: Bug#290174)
+ * New uploader Samuel Mimram
+ * Short description starts now on a lower case letter, and is now an
+ appositive clause
+ * Corrected url of upstream web page in long description
+
+ -- Ralf Treinen <treinen@debian.org> Thu, 20 Jan 2005 09:03:15 +0100
+
hevea (1.07-4) unstable; urgency=low
* No longer suggest netpbm-nonfree (closes: Bug#271682).
Modified: packages/hevea/trunk/debian/control
===================================================================
--- packages/hevea/trunk/debian/control 2005-02-07 18:47:54 UTC (rev 957)
+++ packages/hevea/trunk/debian/control 2005-02-07 18:48:55 UTC (rev 958)
@@ -2,7 +2,7 @@
Section: tex
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
-Uploaders: Ralf Treinen <treinen@debian.org>, Sven Luther <luther@debian.org>, Jerome Marant <jerome@debian.org>, Remi Vanicat <vanicat@debian.org>, Stefano Zacchiroli <zack@debian.org>
+Uploaders: Ralf Treinen <treinen@debian.org>, Sven Luther <luther@debian.org>, Jerome Marant <jerome@debian.org>, Remi Vanicat <vanicat@debian.org>, Stefano Zacchiroli <zack@debian.org>, Samuel Mimram <smimram@debian.org>
Build-Depends-Indep: debhelper (>= 4.0), ocaml-nox-3.08, dpatch
Standards-Version: 3.6.1
@@ -10,7 +10,7 @@
Architecture: all
Depends: gs, netpbm(>=2:9.10-1), tetex-bin, ocaml-base-nox-3.08
Suggests: hevea-doc
-Description: Translator from LaTeX to HTML, info, or text
+Description: translates from LaTeX to HTML, info, or text
Its remarkable features are
- It produces good output. By default (can be turned off) it uses
in case of HTML output the symbol face for math symbols. Either way it
@@ -22,4 +22,4 @@
This version of HeVeA is patched to generate by default picture files
in the PNG format instead of the GIF format.
.
- See also http://para.inria.fr/~maranget/hevea/index.html.
+ See also http://pauillac.inria.fr/hevea/.
Modified: packages/hevea/trunk/debian/copyright
===================================================================
--- packages/hevea/trunk/debian/copyright 2005-02-07 18:47:54 UTC (rev 957)
+++ packages/hevea/trunk/debian/copyright 2005-02-07 18:48:55 UTC (rev 958)
@@ -7,12 +7,23 @@
Copyright:
+Copyright 1998, 1999, 2001 Institut National de Recherche en Informatique
+et Automatique
+
+License:
+
All source files marked "Copyright INRIA" in this distribution are
distributed under the terms of the Q Public License version 1.0
(included below).
----------------------------------------------------------------------
+ As a special exception to the Q Public Licence, you may develop
+ application programs, reusable components and other software items
+ that link with the original or modified versions of the Software
+ and are not made available to the general public, without any of the
+ additional requirements listed in clause 6c of the Q Public licence.
+
THE Q PUBLIC LICENSE version 1.0
Copyright (C) 1999 Troll Tech AS, Norway.
@@ -114,5 +125,4 @@
Choice of Law
-This license is governed by the Laws of France. Disputes shall be
-settled by the Court of Versailles.
+This license is governed by the Laws of France.
Modified: packages/hevea/trunk/debian/patches/00list
===================================================================
--- packages/hevea/trunk/debian/patches/00list 2005-02-07 18:47:54 UTC (rev 957)
+++ packages/hevea/trunk/debian/patches/00list 2005-02-07 18:48:55 UTC (rev 958)
@@ -2,3 +2,4 @@
02_nogif
03_charset
04_rawtext
+05_license
\ No newline at end of file
Added: packages/hevea/trunk/debian/patches/05_license.dpatch
===================================================================
--- packages/hevea/trunk/debian/patches/05_license.dpatch 2005-02-07 18:47:54 UTC (rev 957)
+++ packages/hevea/trunk/debian/patches/05_license.dpatch 2005-02-07 18:48:55 UTC (rev 958)
@@ -0,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_license.dpatch by Ralf Treinen <treinen@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes to license as received from upstream author Luc Maranget
+## DP: by email on Tue, 18 Jan 2005 15:21:46 +0100
+
+@DPATCH@
+diff -urNad hevea-1.07/LICENSE /tmp/dpep.ihb6hP/hevea-1.07/LICENSE
+--- hevea-1.07/LICENSE 1999-12-01 20:04:34.000000000 +0100
++++ /tmp/dpep.ihb6hP/hevea-1.07/LICENSE 2005-01-20 08:19:14.000000000 +0100
+@@ -13,6 +13,12 @@
+
+ ----------------------------------------------------------------------
+
++ As a special exception to the Q Public Licence, you may develop
++ application programs, reusable components and other software items
++ that link with the original or modified versions of the Software
++ and are not made available to the general public, without any of the
++ additional requirements listed in clause 6c of the Q Public licence.
++
+ THE Q PUBLIC LICENSE version 1.0
+
+ Copyright (C) 1999 Troll Tech AS, Norway.
+@@ -114,8 +120,7 @@
+
+ Choice of Law
+
+-This license is governed by the Laws of France. Disputes shall be
+-settled by the Court of Versailles.
++This license is governed by the Laws of France.
+
+ ----------------------------------------------------------------------
+
Property changes on: packages/hevea/trunk/debian/patches/05_license.dpatch
___________________________________________________________________
Name: svn:executable
+ *