[Pkg-ocaml-maint-commits] [SCM] camlidl packaging branch, master, updated. debian/1.05-12-3-gf9d64a7

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 50609da62bae0a146e005d6ee7de57d37f3e3dfb
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Jul 3 18:32:32 2010 +0200

    Various updates

diff --git a/debian/changelog b/debian/changelog
index 0b010ec..ef38142 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,9 @@ camlidl (1.05-13) UNRELEASED; urgency=low
   * debian/control:
     - adapt to new dh-ocaml
     - move to section ocaml
-    - update Standards-Version to 3.8.2
+    - add myself to Uploaders; remove Remi, Stefano and Sven
+    - remove Conflicts to camlidl-doc (older than oldstable)
+    - update Standards-Version to 3.9.0
   * debian/rules: fix order of CDBS includes
 
  -- Stephane Glondu <steph at glondu.net>  Sun, 26 Jul 2009 03:30:59 +0200
diff --git a/debian/control b/debian/control
index 5f023bf..1d106fb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,13 @@ Source: camlidl
 Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders:  Ralf Treinen <treinen at debian.org>, Remi Vanicat <vanicat at debian.org>, Samuel Mimram <smimram at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sven Luther <luther at debian.org>, Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1),
+Uploaders:
+ Stéphane Glondu <glondu at debian.org>
+ Ralf Treinen <treinen at debian.org>,
+ Samuel Mimram <smimram at debian.org>,
+ Sylvain Le Gall <gildor at debian.org>
+Build-Depends:
+ cdbs (>= 0.4.23-1.1),
  dpatch,
  ocaml-nox (>= 3.11),
  po4a,
@@ -15,7 +20,7 @@ Build-Depends: cdbs (>= 0.4.23-1.1),
  cpp,
  binutils,
  dh-ocaml (>= 0.9)
-Standards-Version: 3.8.2
+Standards-Version: 3.9.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camlidl.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camlidl.git
 
@@ -27,7 +32,6 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends}
 Provides: ${ocaml:Provides}
-Conflicts: camlidl-doc (<< 1.04)
 Description: Stub code generator for Objective Caml
  CamlIDL generates stub code for interfacing Caml with C from an IDL
  description of the C functions.  Thus, CamlIDL automates the most
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index ce339cb..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,31 +0,0 @@
-Source: camlidl
-Section: ocaml
-Priority: optional
-Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: @OCamlTeam@
-Build-Depends: @cdbs@,
- debhelper (>= 7),
- cpp,
- binutils,
- dh-ocaml (>= 0.9)
-Standards-Version: 3.8.2
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camlidl.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camlidl.git
-
-Package: camlidl
-Architecture: any
-Suggests: camlidl-doc
-Depends:
- ${ocaml:Depends},
- ${shlibs:Depends},
- ${misc:Depends}
-Conflicts: camlidl-doc (<< 1.04)
-Description: Stub code generator for Objective Caml
- CamlIDL generates stub code for interfacing Caml with C from an IDL
- description of the C functions.  Thus, CamlIDL automates the most
- tedious task in interfacing C libraries with Caml programs.
- .
- It can also be used to interface Caml programs with other languages, as
- long as those languages have a well-defined C interface.
- .
- This package contains the CamlIDL executable.

-- 
camlidl packaging