[Pkg-erlang-commits] r1592 - in erlang/branches/experimental/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Sat Feb 1 11:18:47 UTC 2014
Author: sgolovan
Date: 2014-02-01 11:18:47 +0000 (Sat, 01 Feb 2014)
New Revision: 1592
Modified:
erlang/branches/experimental/debian/changelog
erlang/branches/experimental/debian/patches/docs.patch
erlang/branches/experimental/debian/patches/emacs.patch
erlang/branches/experimental/debian/patches/gnu.patch
erlang/branches/experimental/debian/patches/hppa.patch
erlang/branches/experimental/debian/patches/java.patch
erlang/branches/experimental/debian/patches/man.patch
erlang/branches/experimental/debian/patches/powerpc.patch
erlang/branches/experimental/debian/patches/rpath.patch
erlang/branches/experimental/debian/patches/sparc.patch
erlang/branches/experimental/debian/rules
Log:
* New upstream release candidate.
Modified: erlang/branches/experimental/debian/changelog
===================================================================
--- erlang/branches/experimental/debian/changelog 2014-02-01 10:23:56 UTC (rev 1591)
+++ erlang/branches/experimental/debian/changelog 2014-02-01 11:18:47 UTC (rev 1592)
@@ -1,8 +1,8 @@
-erlang (1:16.b.3.1-dfsg-2) UNRELEASED; urgency=low
+erlang (1:17.0~rc1-dfsg-1) experimental; urgency=low
- * NOT RELEASED YET
+ * New upstream release candidate.
- -- Sergei Golovan <sgolovan at debian.org> Mon, 27 Jan 2014 22:20:03 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Sat, 01 Feb 2014 14:25:33 +0400
erlang (1:16.b.3.1-dfsg-1) unstable; urgency=low
Modified: erlang/branches/experimental/debian/patches/docs.patch
===================================================================
--- erlang/branches/experimental/debian/patches/docs.patch 2014-02-01 10:23:56 UTC (rev 1591)
+++ erlang/branches/experimental/debian/patches/docs.patch 2014-02-01 11:18:47 UTC (rev 1592)
@@ -5,7 +5,7 @@
--- a/lib/erl_docgen/priv/xsl/db_man.xsl
+++ b/lib/erl_docgen/priv/xsl/db_man.xsl
-@@ -508,7 +508,7 @@
+@@ -516,7 +516,7 @@
<xsl:text>
.RS 2</xsl:text>
<xsl:text>
.LP
</xsl:text>
<xsl:value-of select="$content"/>
@@ -14,7 +14,7 @@
</xsl:otherwise>
</xsl:choose>
</xsl:template>
-@@ -816,7 +816,7 @@
+@@ -824,7 +824,7 @@
<xsl:template match="desc">
<xsl:text>
.RS</xsl:text>
<xsl:apply-templates/>
@@ -36,7 +36,7 @@
--- a/lib/stdlib/doc/src/re.xml
+++ b/lib/stdlib/doc/src/re.xml
-@@ -310,7 +310,7 @@
+@@ -372,7 +372,7 @@
metacharacter should not match before it. Setting this without
<c>multiline</c> (at compile time) causes circumflex never to
match. This option only affects the behavior of the circumflex
@@ -45,7 +45,7 @@
<tag><c>noteol</c></tag>
-@@ -319,8 +319,8 @@
+@@ -381,8 +381,8 @@
match it nor (except in multiline mode) a newline immediately
before it. Setting this without <c>multiline</c> (at compile time)
causes dollar never to match. This option affects only the
@@ -54,7 +54,7 @@
+ behavior of the dollar metacharacter. It does not affect \\Z or
+ \\z.</item>
- <tag><c>{offset, integer() >= 0}</c></tag>
+ <tag><c>report_errors</c></tag>
--- a/lib/tools/Makefile
+++ b/lib/tools/Makefile
Modified: erlang/branches/experimental/debian/patches/emacs.patch
===================================================================
--- erlang/branches/experimental/debian/patches/emacs.patch 2014-02-01 10:23:56 UTC (rev 1591)
+++ erlang/branches/experimental/debian/patches/emacs.patch 2014-02-01 11:18:47 UTC (rev 1592)
@@ -5,7 +5,7 @@
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
-@@ -495,8 +495,8 @@
+@@ -497,8 +497,8 @@
(defvar erlang-man-dirs
'(("Man - Commands" "/man/man1" t)
("Man - Modules" "/man/man3" t)
@@ -16,7 +16,7 @@
"*The man directories displayed in the Erlang menu.
Each item in the list should be a list with three elements, the first
-@@ -1282,23 +1282,22 @@
+@@ -1283,23 +1283,22 @@
(or (fboundp 'eval-when-compile)
(defmacro eval-when-compile (&rest rest) nil))
@@ -44,7 +44,7 @@
;; defvar some obsolete variables, which we still support for
;; backwards compatibility reasons.
-@@ -2017,7 +2016,7 @@
+@@ -2018,7 +2017,7 @@
(defun erlang-man-make-menu-item (file)
"Create a menu item containing the name of the man page."
@@ -53,7 +53,7 @@
(let ((page (substring file (match-beginning 1) (match-end 1))))
(list (capitalize page)
(list 'lambda '()
-@@ -2028,7 +2027,7 @@
+@@ -2029,7 +2028,7 @@
(defun erlang-man-get-files (dir)
"Return files in directory DIR."
@@ -62,7 +62,7 @@
(defun erlang-man-module (&optional module)
-@@ -2048,7 +2047,7 @@
+@@ -2049,7 +2048,7 @@
(if (or (null module) (string= module ""))
(error "No Erlang module name given"))
(let ((dir-list erlang-man-dirs)
@@ -71,7 +71,7 @@
(file nil)
file-list)
(while (and dir-list (null file))
-@@ -2189,9 +2188,9 @@
+@@ -2190,9 +2189,9 @@
(error nil))
(if file
(let ((process-environment (copy-sequence process-environment)))
Modified: erlang/branches/experimental/debian/patches/gnu.patch
===================================================================
--- erlang/branches/experimental/debian/patches/gnu.patch 2014-02-01 10:23:56 UTC (rev 1591)
+++ erlang/branches/experimental/debian/patches/gnu.patch 2014-02-01 11:18:47 UTC (rev 1592)
@@ -13,7 +13,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -420,7 +420,7 @@
+@@ -439,7 +439,7 @@
dnl NOTE: CPPFLAGS will be included in CFLAGS at the end
case $host_os in
@@ -22,7 +22,7 @@
win32)
# The ethread library requires _WIN32_WINNT of at least 0x0403.
# -D_WIN32_WINNT=* from CPPFLAGS is saved in ETHR_DEFS.
-@@ -1235,7 +1235,7 @@
+@@ -1271,7 +1271,7 @@
solaris*)
enable_child_waiter_thread=yes
;;
@@ -47,7 +47,7 @@
#include <sys/sysctl.h>
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
-@@ -550,6 +550,11 @@
+@@ -557,6 +557,11 @@
inet_driver_select((d)->port, (ErlDrvEvent)(long)(d)->event, (flags), (onoff)); \
} while(0)
@@ -61,7 +61,7 @@
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
-@@ -1546,7 +1546,7 @@
+@@ -1557,7 +1557,7 @@
if (!bindir) {
/* Determine bindir from absolute path to executable */
char *p;
@@ -70,7 +70,7 @@
strncpy(buffer, argv[0], sizeof(buffer));
buffer[sizeof(buffer)-1] = '\0';
-@@ -1560,7 +1560,7 @@
+@@ -1571,7 +1571,7 @@
if (!rootdir) {
/* Determine rootdir from absolute path to bindir */
char *p;
@@ -81,7 +81,7 @@
--- a/erts/etc/common/escript.c
+++ b/erts/etc/common/escript.c
-@@ -53,7 +53,7 @@
+@@ -54,7 +54,7 @@
# define IS_DIRSEP(c) ((c) == '/')
# define DIRSEPSTR "/"
# define PATHSEPSTR ":"
Modified: erlang/branches/experimental/debian/patches/hppa.patch
===================================================================
--- erlang/branches/experimental/debian/patches/hppa.patch 2014-02-01 10:23:56 UTC (rev 1591)
+++ erlang/branches/experimental/debian/patches/hppa.patch 2014-02-01 11:18:47 UTC (rev 1592)
@@ -8,7 +8,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -2006,6 +2006,14 @@
+@@ -2062,6 +2062,14 @@
AC_CHECK_DECLS([posix2time, time2posix],,,[#include <time.h>])
disable_vfork=false
Modified: erlang/branches/experimental/debian/patches/java.patch
===================================================================
--- erlang/branches/experimental/debian/patches/java.patch 2014-02-01 10:23:56 UTC (rev 1591)
+++ erlang/branches/experimental/debian/patches/java.patch 2014-02-01 11:18:47 UTC (rev 1592)
@@ -8,7 +8,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -4505,7 +4505,8 @@
+@@ -4574,7 +4574,8 @@
dnl Make sure it's at least JDK 1.5
AC_CACHE_CHECK(for JDK version 1.5,
ac_cv_prog_javac_ver_1_5,
@@ -20,7 +20,7 @@
unset -v JAVAC
--- a/lib/test_server/src/configure.in
+++ b/lib/test_server/src/configure.in
-@@ -392,7 +392,8 @@
+@@ -445,7 +445,8 @@
dnl Make sure it's at least JDK 1.5
AC_CACHE_CHECK(for JDK version 1.5,
ac_cv_prog_javac_ver_1_5,
Modified: erlang/branches/experimental/debian/patches/man.patch
===================================================================
--- erlang/branches/experimental/debian/patches/man.patch 2014-02-01 10:23:56 UTC (rev 1591)
+++ erlang/branches/experimental/debian/patches/man.patch 2014-02-01 11:18:47 UTC (rev 1592)
@@ -6,7 +6,7 @@
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
-@@ -721,8 +721,10 @@
+@@ -722,8 +722,10 @@
error("-man not supported on Windows");
#else
argv[i] = "man";
Modified: erlang/branches/experimental/debian/patches/powerpc.patch
===================================================================
--- erlang/branches/experimental/debian/patches/powerpc.patch 2014-02-01 10:23:56 UTC (rev 1591)
+++ erlang/branches/experimental/debian/patches/powerpc.patch 2014-02-01 11:18:47 UTC (rev 1592)
@@ -4,7 +4,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -612,6 +612,7 @@
+@@ -631,6 +631,7 @@
x86_64) ARCH=amd64;;
amd64) ARCH=amd64;;
macppc) ARCH=ppc;;
Modified: erlang/branches/experimental/debian/patches/rpath.patch
===================================================================
--- erlang/branches/experimental/debian/patches/rpath.patch 2014-02-01 10:23:56 UTC (rev 1591)
+++ erlang/branches/experimental/debian/patches/rpath.patch 2014-02-01 11:18:47 UTC (rev 1592)
@@ -6,7 +6,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -4363,9 +4363,9 @@
+@@ -4432,9 +4432,9 @@
SSL_CC_RUNTIME_LIBRARY_PATH=
SSL_LD_RUNTIME_LIBRARY_PATH=
SSL_DED_LD_RUNTIME_LIBRARY_PATH=
Modified: erlang/branches/experimental/debian/patches/sparc.patch
===================================================================
--- erlang/branches/experimental/debian/patches/sparc.patch 2014-02-01 10:23:56 UTC (rev 1591)
+++ erlang/branches/experimental/debian/patches/sparc.patch 2014-02-01 11:18:47 UTC (rev 1592)
@@ -7,7 +7,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -601,7 +601,7 @@
+@@ -620,7 +620,7 @@
fi
case $chk_arch_ in
@@ -18,7 +18,7 @@
i86pc) ARCH=x86;;
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
-@@ -967,16 +967,6 @@
+@@ -988,16 +988,6 @@
* in registers.
*/
@@ -35,7 +35,7 @@
# define REG_x0
# define REG_xregs
# define REG_htop
-@@ -985,7 +975,6 @@
+@@ -1006,7 +996,6 @@
# define REG_fcalls
# define REG_tmp_arg1
# define REG_tmp_arg2
Modified: erlang/branches/experimental/debian/rules
===================================================================
--- erlang/branches/experimental/debian/rules 2014-02-01 10:23:56 UTC (rev 1591)
+++ erlang/branches/experimental/debian/rules 2014-02-01 11:18:47 UTC (rev 1592)
@@ -489,9 +489,9 @@
binary: binary-indep binary-arch
-REL=R16B03-1
-RELDIR=R16B03-1
-DEB_REL=16.b.3.1-dfsg
+REL=17.0-rc1
+RELDIR=17
+DEB_REL=17.0~rc1-dfsg
get-orig-source:
CURDIR=`pwd` && TMPDIR=`mktemp -d /tmp/erlang.XXXXXX` && \
More information about the Pkg-erlang-commits
mailing list