[Pkg-ocaml-maint-commits] [SCM] hevea packaging branch, master, updated. debian/1.10-11-2-g3fc59a7

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 3fc59a7d90f465229c02d30ce0c579209842a4c9
Merge: eaab0d19a908046230e93eab31f5e522ead8add1 7fa49ef4f589adecb19cc2b38c4456796b6dd323
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue Jun 1 09:20:34 2010 +0200

    Merge branch 'master' of git+ssh://git.debian.org//git/pkg-ocaml-maint/packages/hevea
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index b1e0ec4,5cbc66d..a3606d7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,9 +1,17 @@@
 -hevea (1.10-11) UNRELEASED; urgency=low
++hevea (1.10-12) UNRELEASED; urgency=low
+ 
+   * debian/control: update my e-mail address
+ 
+  -- Stéphane Glondu <glondu at debian.org>  Mon, 08 Feb 2010 13:56:29 +0100
+ 
 +hevea (1.10-11) unstable; urgency=low
 +
 +  * Standards-Version 3.8.4 (no change)
 +  * Recompiled with ocaml 3.11.2
 +  * Do not use asterisks in debian/NEWS to separate items.
 +
 + -- Ralf Treinen <treinen at debian.org>  Mon, 08 Feb 2010 00:02:31 +0100
 +
  hevea (1.10-10) unstable; urgency=low
  
    * Standards-version 3.8.3 (no change)
diff --combined debian/control
index b169a1c,0724be8..219c2cf
--- a/debian/control
+++ b/debian/control
@@@ -8,10 -8,10 +8,10 @@@ Uploaders
   Stefano Zacchiroli <zack at debian.org>,
   Samuel Mimram <smimram at debian.org>,
   Sylvain Le Gall <gildor at debian.org>,
-  Stephane Glondu <steph at glondu.net>
+  Stéphane Glondu <glondu at debian.org>
  Build-Depends-Indep:  ocaml-nox (>= 3.07), 
  Build-Depends: debhelper (>= 7.0), tex-common, cdbs, dh-ocaml
 -Standards-Version: 3.8.3
 +Standards-Version: 3.8.4
  Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/hevea.git
  Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/hevea.git
  Homepage: http://hevea.inria.fr/

-- 
hevea packaging