[Pkg-ocaml-maint-commits] [SCM] cameleon packaging branch, master, updated. debian/1.9.18.svn20090302+691-1-6-g79cb564

[Stephane Glondu]

The following commit has been merged in the master branch:
commit e1fcd9b9320ff7b5c15367d1c47fea55c8905905
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Sep 8 17:02:45 2009 +0200

    Update my e-mail address and remove DMUA
    
    (...and trailing whitespaces)

diff --git a/debian/changelog b/debian/changelog
index 457a599..8933d52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,16 @@
 cameleon (1.9.18.svn20090302+691-2) UNRELEASED; urgency=low
 
+  [ Sylvain Le Gall ]
   * Fix typo and update .pot for manpages
   * Add Format-Specification field to debian/copyright
   * Remove src/*.byte
   * Invert CDBS ocaml.mk and debhelper.mk to avoid generating
     *.debhelper.log
 
- -- Sylvain Le Gall <gildor at debian.org>  Sun, 26 Jul 2009 12:13:36 +0000
+  [ Stéphane Glondu ]
+  * Update my e-mail address and remove DMUA
+
+ -- Stéphane Glondu <glondu at debian.org>  Tue, 08 Sep 2009 17:03:37 +0200
 
 cameleon (1.9.18.svn20090302+691-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c43819c..b25bd63 100644
--- a/debian/control
+++ b/debian/control
@@ -2,17 +2,17 @@ Source: cameleon
 Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Stephane Glondu <steph at glondu.net>, 
+Uploaders:
+ Stéphane Glondu <glondu at debian.org>,
  Sylvain Le Gall <gildor at debian.org>,
- Samuel Mimram <smimram at debian.org>, 
- Stefano Zacchiroli <zack at debian.org> 
-DM-Upload-Allowed: yes
-Build-Depends: cdbs (>= 0.4.23-1.1), 
- quilt, 
- patchutils (>= 0.2.25), 
- cdbs (>= 0.4.27), 
- ocaml-nox (>= 3.11.0-5), 
- po4a, docbook-xml (>= 4.4), docbook-xsl, libxml2-utils, xsltproc, 
+ Samuel Mimram <smimram at debian.org>,
+ Stefano Zacchiroli <zack at debian.org>
+Build-Depends: cdbs (>= 0.4.23-1.1),
+ quilt,
+ patchutils (>= 0.2.25),
+ cdbs (>= 0.4.27),
+ ocaml-nox (>= 3.11.0-5),
+ po4a, docbook-xml (>= 4.4), docbook-xsl, libxml2-utils, xsltproc,
  debhelper (>= 7),
  dh-ocaml (>= 0.4.1),
  camlp4,
@@ -31,7 +31,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/cameleon.git
 Package: cameleon
 Architecture: any
 Depends:
- libcameleon-ocaml-dev (= ${binary:Version}), 
+ libcameleon-ocaml-dev (= ${binary:Version}),
  ocaml-base-nox-${F:OCamlABI},
  ${shlibs:Depends},
  ${misc:Depends}
@@ -83,26 +83,26 @@ Suggests: cameleon-doc
 Provides:
  libreport-ocaml-dev,
  libmlchat-ocaml-dev,
- libocamlcvs-ocaml-dev, 
+ libocamlcvs-ocaml-dev,
  libgpattern-ocaml-dev,
  liboptions-ocaml-dev,
- libokey-ocaml-dev, 
+ libokey-ocaml-dev,
  libconfigwin-ocaml-dev
 Conflicts:
  libreport-ocaml-dev,
  libmlchat-ocaml-dev,
- libocamlcvs-ocaml-dev, 
+ libocamlcvs-ocaml-dev,
  libgpattern-ocaml-dev,
  liboptions-ocaml-dev,
- libokey-ocaml-dev, 
+ libokey-ocaml-dev,
  libconfigwin-ocaml-dev
 Replaces:
  libreport-ocaml-dev,
  libmlchat-ocaml-dev,
- libocamlcvs-ocaml-dev, 
+ libocamlcvs-ocaml-dev,
  libgpattern-ocaml-dev,
  liboptions-ocaml-dev,
- libokey-ocaml-dev, 
+ libokey-ocaml-dev,
  libconfigwin-ocaml-dev
 Description: libraries from Cameleon
  It contains the libraries built with Cameleon:

-- 
cameleon packaging