[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.12.1-2-12-gf62103f

2012-05-14 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 16b3f7868b1ad889933ce5423019408747ba1813
Author: Stephane Glondu st...@glondu.net
Date:   Mon Apr 16 13:40:52 2012 +0200

Avoid package-contains-broken-symlink Lintian tag

This is done by adding explicit dependencies to ocaml-base-nox and
camlp4 where relevant. These dependencies are redundant with the -$ABI
dependencies, but Lintian doesn't check virtual packages... and I
don't think it should (in general).

diff --git a/debian/control b/debian/control
index cf7add4..d914977 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,7 @@ Homepage: http://caml.inria.fr/
 Package: ocaml-nox
 Architecture: any
 Depends:
+ ocaml-base-nox,
  ${shlibs:Depends},
  ${misc:Depends},
  ${ocaml:Depends},
@@ -100,6 +101,7 @@ Description: Pre Processor Pretty Printer for OCaml
 Package: camlp4-extra
 Architecture: any
 Depends:
+ camlp4,
  ${shlibs:Depends},
  ${misc:Depends},
  ${ocaml:Depends},
@@ -123,6 +125,7 @@ Description: Pre Processor Pretty Printer for OCaml - extras
 Package: ocaml
 Architecture: any
 Depends:
+ ocaml-base-nox,
  ${shlibs:Depends},
  ${misc:Depends},
  ${ocaml:Depends},
@@ -178,6 +181,7 @@ Description: Runtime system for OCaml bytecode executables 
(no X)
 Package: ocaml-base
 Architecture: any
 Depends:
+ ocaml-base-nox,
  ${shlibs:Depends},
  ${misc:Depends},
  ${ocaml:Depends}

-- 
OCaml packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.12.1-2-12-gf62103f

2012-05-14 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit f62103f2965826ad22548af4bc1c3af48a1d144e
Author: Stephane Glondu st...@glondu.net
Date:   Mon May 14 07:52:46 2012 +0200

Update changelog and prepare upload to unstable

diff --git a/debian/changelog b/debian/changelog
index d7fb55a..43242fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-ocaml (3.12.1-3) UNRELEASED; urgency=low
+ocaml (3.12.1-3) unstable; urgency=low
 
+  [ Hendrik Tews ]
   * Fixes in startup and install files of ocaml-mode:
 - symlink *el files into elc dir (Closes: #452340)
 - use debian-pkg-add-load-path-item in emacsen-startup and emacsen-install
@@ -7,7 +8,13 @@ ocaml (3.12.1-3) UNRELEASED; urgency=low
 - compile el files with site-file enabled
 - use debian-emacs-flavor in emacsen-startup (see #662163)
 
- -- Hendrik Tews hend...@askra.de  Fri, 11 May 2012 00:00:35 +0200
+  [ Stéphane Glondu ]
+  * Fix debian/watch so that refman is not reported as a new version
+  * Add some explicit dependencies to avoid spurious Lintian warnings
+about broken symlinks
+  * Remove duplicate upstream changelog
+
+ -- Stéphane Glondu glo...@debian.org  Mon, 14 May 2012 07:52:40 +0200
 
 ocaml (3.12.1-2) unstable; urgency=low
 

-- 
OCaml packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits