[Pkg-erlang-commits] r1250 - erlang/trunk/debian

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2010-06-09 12:29:17 +0000 (Wed, 09 Jun 2010)
New Revision: 1250

Modified:
   erlang/trunk/debian/changelog
   erlang/trunk/debian/control
Log:
[erlang]
  * Added conflict of erlang-doc package with older erlang-base and
    erlang-base-hipe packages to prevent broken situation with erlang-base
    from stable (1:12.b.5) and erlang-doc from testing (1:13.b.4).
  * Added sun-java6-jdk as an alternative build dependency to make backporting
    to lenny and building on a headless machine possible.


Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog	2010-05-30 03:40:35 UTC (rev 1249)
+++ erlang/trunk/debian/changelog	2010-06-09 12:29:17 UTC (rev 1250)
@@ -1,8 +1,13 @@
-erlang (1:13.b.4-dfsg-6) UNRELEASED; urgency=low
+erlang (1:13.b.4-dfsg-6) unstable; urgency=low
 
   * Fixed bashism in debian/rules (closes: #581450).
+  * Added conflict of erlang-doc package with older erlang-base and
+    erlang-base-hipe packages to prevent broken situation with erlang-base
+    from stable (1:12.b.5) and erlang-doc from testing (1:13.b.4).
+  * Added sun-java6-jdk as an alternative build dependency to make backporting
+    to lenny and building on a headless machine possible.
 
- -- Sergei Golovan <sgolovan at debian.org>  Thu, 13 May 2010 09:17:45 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 09 Jun 2010 16:28:42 +0400
 
 erlang (1:13.b.4-dfsg-5) unstable; urgency=low
 

Modified: erlang/trunk/debian/control
===================================================================
--- erlang/trunk/debian/control	2010-05-30 03:40:35 UTC (rev 1249)
+++ erlang/trunk/debian/control	2010-06-09 12:29:17 UTC (rev 1250)
@@ -10,7 +10,7 @@
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
  libsctp-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !solaris-i386],
  kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
- default-jdk
+ default-jdk | sun-java6-jdk
 Build-Depends-Indep: fop
 Build-Conflicts: autoconf2.13, libwxgtk2.4-dev, libwxgtk2.6-dev
 Homepage: http://www.erlang.org/
@@ -165,7 +165,7 @@
 Architecture: all
 Depends: ${misc:Depends}
 Suggests: erlang
-Conflicts: erlang-doc-html
+Conflicts: erlang-doc-html, erlang-base (<< 1:13.b.4), erlang-base-hipe (<< 1:13.b.4)
 Replaces: erlang-doc-html
 Provides: erlang-doc-html
 Description: Erlang/OTP HTML/PDF documentation