[Pkg-erlang-commits] r1307 - in erlang/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Tue Mar 29 17:08:36 UTC 2011
Author: sgolovan
Date: 2011-03-29 17:08:26 +0000 (Tue, 29 Mar 2011)
New Revision: 1307
Modified:
erlang/trunk/debian/changelog
erlang/trunk/debian/patches/clean.patch
erlang/trunk/debian/patches/docs.patch
erlang/trunk/debian/patches/emacs.patch
erlang/trunk/debian/patches/gnu.patch
erlang/trunk/debian/patches/hppa.patch
erlang/trunk/debian/patches/java.patch
erlang/trunk/debian/patches/m68k.patch
erlang/trunk/debian/patches/man.patch
erlang/trunk/debian/patches/native.patch
erlang/trunk/debian/patches/powerpc.patch
erlang/trunk/debian/patches/rpath.patch
erlang/trunk/debian/patches/sparc.patch
erlang/trunk/debian/patches/ssl.patch
erlang/trunk/debian/rules
Log:
[erlang]
* New upstream release.
* Refreshed patches.
Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog 2011-03-29 09:30:19 UTC (rev 1306)
+++ erlang/trunk/debian/changelog 2011-03-29 17:08:26 UTC (rev 1307)
@@ -1,8 +1,9 @@
-erlang (1:14.b.1-dfsg-2) unstable; urgency=low
+erlang (1:14.b.2-dfsg-1) unstable; urgency=low
+ * New upstream release (closes: #607233, #619857).
* Removed patches which are no longer needed.
- -- Sergei Golovan <sgolovan at debian.org> Sun, 06 Mar 2011 08:51:54 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Tue, 29 Mar 2011 21:07:33 +0400
erlang (1:14.b.1-dfsg-1) experimental; urgency=low
Modified: erlang/trunk/debian/patches/clean.patch
===================================================================
--- erlang/trunk/debian/patches/clean.patch 2011-03-29 09:30:19 UTC (rev 1306)
+++ erlang/trunk/debian/patches/clean.patch 2011-03-29 17:08:26 UTC (rev 1307)
@@ -3,8 +3,8 @@
Erlang leaves many files after make clean. This patch contains
a hack to remove them.
---- erlang-14.b.1-dfsg.orig/Makefile.in
-+++ erlang-14.b.1-dfsg/Makefile.in
+--- erlang-14.b.2-dfsg.orig/Makefile.in
++++ erlang-14.b.2-dfsg/Makefile.in
@@ -995,6 +995,7 @@
cd erts && ERL_TOP=$(ERL_TOP) $(MAKE) clean
cd lib && ERL_TOP=$(ERL_TOP) $(MAKE) clean BUILD_ALL=true
Modified: erlang/trunk/debian/patches/docs.patch
===================================================================
--- erlang/trunk/debian/patches/docs.patch 2011-03-29 09:30:19 UTC (rev 1306)
+++ erlang/trunk/debian/patches/docs.patch 2011-03-29 17:08:26 UTC (rev 1307)
@@ -3,8 +3,8 @@
and a few bugs with docs installation.
Last-modified: Thu, 09 Dec 2010 10:45:56 +0300
---- erlang-14.b.1-dfsg.orig/Makefile.in
-+++ erlang-14.b.1-dfsg/Makefile.in
+--- erlang-14.b.2-dfsg.orig/Makefile.in
++++ erlang-14.b.2-dfsg/Makefile.in
@@ -409,7 +409,7 @@
ERL_TOP=$(ERL_TOP) $(MAKE) TESTROOT=$(RELEASE_ROOT) $@
@@ -14,8 +14,8 @@
# ----------------------------------------------------------------------
ERLANG_EARS=$(BOOTSTRAP_ROOT)/bootstrap/erts
---- erlang-14.b.1-dfsg.orig/lib/erl_docgen/priv/xsl/db_man.xsl
-+++ erlang-14.b.1-dfsg/lib/erl_docgen/priv/xsl/db_man.xsl
+--- erlang-14.b.2-dfsg.orig/lib/erl_docgen/priv/xsl/db_man.xsl
++++ erlang-14.b.2-dfsg/lib/erl_docgen/priv/xsl/db_man.xsl
@@ -361,7 +361,7 @@
<xsl:text> .RS 2</xsl:text>
<xsl:text> .LP .LP </xsl:text>
@@ -43,8 +43,8 @@
</xsl:template>
---- erlang-14.b.1-dfsg.orig/lib/megaco/doc/src/Makefile
-+++ erlang-14.b.1-dfsg/lib/megaco/doc/src/Makefile
+--- erlang-14.b.2-dfsg.orig/lib/megaco/doc/src/Makefile
++++ erlang-14.b.2-dfsg/lib/megaco/doc/src/Makefile
@@ -247,8 +247,6 @@
$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
@@ -63,8 +63,8 @@
endif
endif
---- erlang-14.b.1-dfsg.orig/lib/stdlib/doc/src/re.xml
-+++ erlang-14.b.1-dfsg/lib/stdlib/doc/src/re.xml
+--- erlang-14.b.2-dfsg.orig/lib/stdlib/doc/src/re.xml
++++ erlang-14.b.2-dfsg/lib/stdlib/doc/src/re.xml
@@ -348,7 +348,7 @@
metacharacter should not match before it. Setting this without
<c>multiline</c> (at compile time) causes circumflex never to
Modified: erlang/trunk/debian/patches/emacs.patch
===================================================================
--- erlang/trunk/debian/patches/emacs.patch 2011-03-29 09:30:19 UTC (rev 1306)
+++ erlang/trunk/debian/patches/emacs.patch 2011-03-29 17:08:26 UTC (rev 1307)
@@ -3,9 +3,9 @@
Also, it fixes manpage name regexp matching only 3erl manpages in
section 3.
---- erlang-14.b.1-dfsg.orig/lib/tools/emacs/erlang.el
-+++ erlang-14.b.1-dfsg/lib/tools/emacs/erlang.el
-@@ -492,8 +492,8 @@
+--- erlang-14.b.2-dfsg.orig/lib/tools/emacs/erlang.el
++++ erlang-14.b.2-dfsg/lib/tools/emacs/erlang.el
+@@ -495,8 +495,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
-@@ -1176,23 +1176,22 @@
+@@ -1179,23 +1179,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
;; backwardscompatibility reasons.
-@@ -1935,7 +1934,7 @@
+@@ -1938,7 +1937,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 '()
-@@ -1946,7 +1945,7 @@
+@@ -1949,7 +1948,7 @@
(defun erlang-man-get-files (dir)
"Return files in directory DIR."
@@ -62,7 +62,7 @@
(defun erlang-man-module (&optional module)
-@@ -1966,7 +1965,7 @@
+@@ -1969,7 +1968,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))
-@@ -2107,9 +2106,9 @@
+@@ -2110,9 +2109,9 @@
(error nil))
(if file
(let ((process-environment (copy-sequence process-environment)))
Modified: erlang/trunk/debian/patches/gnu.patch
===================================================================
--- erlang/trunk/debian/patches/gnu.patch 2011-03-29 09:30:19 UTC (rev 1306)
+++ erlang/trunk/debian/patches/gnu.patch 2011-03-29 17:08:26 UTC (rev 1307)
@@ -6,8 +6,8 @@
(2) Undefines BSD4_4 for os_mon application for GNU/Hurd;
---- erlang-14.b.1-dfsg.orig/erts/configure.in
-+++ erlang-14.b.1-dfsg/erts/configure.in
+--- erlang-14.b.2-dfsg.orig/erts/configure.in
++++ erlang-14.b.2-dfsg/erts/configure.in
@@ -385,7 +385,7 @@
dnl NOTE: CPPFLAGS will be included in CFLAGS at the end
@@ -17,7 +17,7 @@
win32)
# The ethread library requires _WIN32_WINNT of at least 0x0403.
# -D_WIN32_WINNT=* from CPPFLAGS is saved in ETHR_DEFS.
-@@ -1184,7 +1184,7 @@
+@@ -1189,7 +1189,7 @@
solaris*)
enable_child_waiter_thread=yes
;;
@@ -26,8 +26,8 @@
AC_MSG_CHECKING([whether dlopen() needs to be called before first call to dlerror()])
if test "x$ETHR_THR_LIB_BASE_TYPE" != "xposix_nptl"; then
AC_DEFINE(ERTS_NEED_DLOPEN_BEFORE_DLERROR,[1],
---- erlang-14.b.1-dfsg.orig/lib/os_mon/c_src/memsup.c
-+++ erlang-14.b.1-dfsg/lib/os_mon/c_src/memsup.c
+--- erlang-14.b.2-dfsg.orig/lib/os_mon/c_src/memsup.c
++++ erlang-14.b.2-dfsg/lib/os_mon/c_src/memsup.c
@@ -110,6 +110,11 @@
#include <memLib.h>
#endif
Modified: erlang/trunk/debian/patches/hppa.patch
===================================================================
--- erlang/trunk/debian/patches/hppa.patch 2011-03-29 09:30:19 UTC (rev 1306)
+++ erlang/trunk/debian/patches/hppa.patch 2011-03-29 17:08:26 UTC (rev 1307)
@@ -6,9 +6,9 @@
Forwarded: no
Last-updated: Mon, 22 Feb 2010 10:34:34 +0300
---- erlang-14.b.1-dfsg.orig/erts/configure.in
-+++ erlang-14.b.1-dfsg/erts/configure.in
-@@ -1802,6 +1802,14 @@
+--- erlang-14.b.2-dfsg.orig/erts/configure.in
++++ erlang-14.b.2-dfsg/erts/configure.in
+@@ -1807,6 +1807,14 @@
AC_FUNC_SETVBUF_REVERSED
disable_vfork=false
Modified: erlang/trunk/debian/patches/java.patch
===================================================================
--- erlang/trunk/debian/patches/java.patch 2011-03-29 09:30:19 UTC (rev 1306)
+++ erlang/trunk/debian/patches/java.patch 2011-03-29 17:08:26 UTC (rev 1307)
@@ -6,9 +6,9 @@
Forwarded: yes
Last-updated: Sat, 13 Feb 2010 10:08:42 +0300
---- erlang-14.b.1-dfsg.orig/erts/configure.in
-+++ erlang-14.b.1-dfsg/erts/configure.in
-@@ -4101,7 +4101,8 @@
+--- erlang-14.b.2-dfsg.orig/erts/configure.in
++++ erlang-14.b.2-dfsg/erts/configure.in
+@@ -4106,7 +4106,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,
@@ -18,8 +18,8 @@
ac_cv_prog_javac_ver_1_5=yes, ac_cv_prog_javac_ver_1_5=no)])
if test $ac_cv_prog_javac_ver_1_5 = no; then
unset -v JAVAC
---- erlang-14.b.1-dfsg.orig/lib/test_server/src/configure.in
-+++ erlang-14.b.1-dfsg/lib/test_server/src/configure.in
+--- erlang-14.b.2-dfsg.orig/lib/test_server/src/configure.in
++++ erlang-14.b.2-dfsg/lib/test_server/src/configure.in
@@ -399,7 +399,8 @@
dnl Make sure it's at least JDK 1.5
AC_CACHE_CHECK(for JDK version 1.5,
Modified: erlang/trunk/debian/patches/m68k.patch
===================================================================
--- erlang/trunk/debian/patches/m68k.patch 2011-03-29 09:30:19 UTC (rev 1306)
+++ erlang/trunk/debian/patches/m68k.patch 2011-03-29 17:08:26 UTC (rev 1307)
@@ -7,8 +7,8 @@
(2) Non-working networking besause of blind conversion of long to a pointer.
---- erlang-14.b.1-dfsg.orig/erts/emulator/beam/binary.c
-+++ erlang-14.b.1-dfsg/erts/emulator/beam/binary.c
+--- erlang-14.b.2-dfsg.orig/erts/emulator/beam/binary.c
++++ erlang-14.b.2-dfsg/erts/emulator/beam/binary.c
@@ -31,6 +31,10 @@
#include "erl_binary.h"
#include "erl_bits.h"
@@ -20,9 +20,9 @@
#ifdef DEBUG
static int list_to_bitstr_buf(Eterm obj, char* buf, int len);
#else
---- erlang-14.b.1-dfsg.orig/erts/emulator/beam/erl_driver.h
-+++ erlang-14.b.1-dfsg/erts/emulator/beam/erl_driver.h
-@@ -562,7 +562,7 @@
+--- erlang-14.b.2-dfsg.orig/erts/emulator/beam/erl_driver.h
++++ erlang-14.b.2-dfsg/erts/emulator/beam/erl_driver.h
+@@ -563,7 +563,7 @@
EXTERN ErlDrvTermData driver_caller(ErlDrvPort);
extern const ErlDrvTermData driver_term_nil;
EXTERN ErlDrvTermData driver_mk_term_nil(void);
Modified: erlang/trunk/debian/patches/man.patch
===================================================================
--- erlang/trunk/debian/patches/man.patch 2011-03-29 09:30:19 UTC (rev 1306)
+++ erlang/trunk/debian/patches/man.patch 2011-03-29 17:08:26 UTC (rev 1307)
@@ -4,8 +4,8 @@
(Erlang manual pages are placed to /usr/share/man/ hierarchy
as required by Debian policy.)
---- erlang-14.b.1-dfsg.orig/erts/etc/common/erlexec.c
-+++ erlang-14.b.1-dfsg/erts/etc/common/erlexec.c
+--- erlang-14.b.2-dfsg.orig/erts/etc/common/erlexec.c
++++ erlang-14.b.2-dfsg/erts/etc/common/erlexec.c
@@ -720,8 +720,10 @@
error("-man not supported on Windows");
#else
Modified: erlang/trunk/debian/patches/native.patch
===================================================================
--- erlang/trunk/debian/patches/native.patch 2011-03-29 09:30:19 UTC (rev 1306)
+++ erlang/trunk/debian/patches/native.patch 2011-03-29 17:08:26 UTC (rev 1307)
@@ -2,8 +2,8 @@
Adds native code to all Erlang binaries if HiPE is enabled.
---- erlang-14.b.1-dfsg.orig/make/otp.mk.in
-+++ erlang-14.b.1-dfsg/make/otp.mk.in
+--- erlang-14.b.2-dfsg.orig/make/otp.mk.in
++++ erlang-14.b.2-dfsg/make/otp.mk.in
@@ -89,6 +89,11 @@
ERL_COMPILE_FLAGS += +slim
else
Modified: erlang/trunk/debian/patches/powerpc.patch
===================================================================
--- erlang/trunk/debian/patches/powerpc.patch 2011-03-29 09:30:19 UTC (rev 1306)
+++ erlang/trunk/debian/patches/powerpc.patch 2011-03-29 17:08:26 UTC (rev 1307)
@@ -2,9 +2,9 @@
Description: Patch defines HiPE architecture ppc for powerpc arch.
Last-Modified: Mon, 08 Mar 2010 12:23:16 +0300
---- erlang-14.b.1-dfsg.orig/erts/configure.in
-+++ erlang-14.b.1-dfsg/erts/configure.in
-@@ -620,6 +620,7 @@
+--- erlang-14.b.2-dfsg.orig/erts/configure.in
++++ erlang-14.b.2-dfsg/erts/configure.in
+@@ -625,6 +625,7 @@
x86_64) ARCH=amd64;;
amd64) ARCH=amd64;;
macppc) ARCH=ppc;;
Modified: erlang/trunk/debian/patches/rpath.patch
===================================================================
--- erlang/trunk/debian/patches/rpath.patch 2011-03-29 09:30:19 UTC (rev 1306)
+++ erlang/trunk/debian/patches/rpath.patch 2011-03-29 17:08:26 UTC (rev 1307)
@@ -4,9 +4,9 @@
Forwarded: no
Last-modified:Sat, 27 Feb 2010 09:34:43 +0300
---- erlang-14.b.1-dfsg.orig/erts/configure.in
-+++ erlang-14.b.1-dfsg/erts/configure.in
-@@ -3957,9 +3957,9 @@
+--- erlang-14.b.2-dfsg.orig/erts/configure.in
++++ erlang-14.b.2-dfsg/erts/configure.in
+@@ -3962,9 +3962,9 @@
SSL_CC_RUNTIME_LIBRARY_PATH=
SSL_LD_RUNTIME_LIBRARY_PATH=
SSL_DED_LD_RUNTIME_LIBRARY_PATH=
Modified: erlang/trunk/debian/patches/sparc.patch
===================================================================
--- erlang/trunk/debian/patches/sparc.patch 2011-03-29 09:30:19 UTC (rev 1306)
+++ erlang/trunk/debian/patches/sparc.patch 2011-03-29 17:08:26 UTC (rev 1307)
@@ -5,9 +5,9 @@
(2) Fixes FTBFS(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=328031).
---- erlang-14.b.1-dfsg.orig/erts/configure.in
-+++ erlang-14.b.1-dfsg/erts/configure.in
-@@ -609,7 +609,7 @@
+--- erlang-14.b.2-dfsg.orig/erts/configure.in
++++ erlang-14.b.2-dfsg/erts/configure.in
+@@ -614,7 +614,7 @@
fi
case $chk_arch_ in
@@ -16,9 +16,9 @@
sparc64) ARCH=sparc64;;
sun4v) ARCH=ultrasparc;;
i86pc) ARCH=x86;;
---- erlang-14.b.1-dfsg.orig/erts/emulator/beam/beam_emu.c
-+++ erlang-14.b.1-dfsg/erts/emulator/beam/beam_emu.c
-@@ -1022,16 +1022,6 @@
+--- erlang-14.b.2-dfsg.orig/erts/emulator/beam/beam_emu.c
++++ erlang-14.b.2-dfsg/erts/emulator/beam/beam_emu.c
+@@ -1060,16 +1060,6 @@
* in registers.
*/
@@ -35,7 +35,7 @@
# define REG_x0
# define REG_xregs
# define REG_htop
-@@ -1040,7 +1030,6 @@
+@@ -1078,7 +1068,6 @@
# define REG_fcalls
# define REG_tmp_arg1
# define REG_tmp_arg2
Modified: erlang/trunk/debian/patches/ssl.patch
===================================================================
--- erlang/trunk/debian/patches/ssl.patch 2011-03-29 09:30:19 UTC (rev 1306)
+++ erlang/trunk/debian/patches/ssl.patch 2011-03-29 17:08:26 UTC (rev 1307)
@@ -2,9 +2,9 @@
Patch adds support for IPv6 to the ssl application.
---- erlang-14.b.1-dfsg.orig/erts/configure.in
-+++ erlang-14.b.1-dfsg/erts/configure.in
-@@ -1785,6 +1785,8 @@
+--- erlang-14.b.2-dfsg.orig/erts/configure.in
++++ erlang-14.b.2-dfsg/erts/configure.in
+@@ -1790,6 +1790,8 @@
AC_CHECK_FUNCS([getipnodebyname getipnodebyaddr gethostbyname2])
@@ -13,9 +13,9 @@
AC_CHECK_FUNCS([ieee_handler fpsetmask finite isnan isinf res_gethostbyname dlopen \
pread pwrite writev memmove strerror strerror_r strncasecmp \
---- erlang-14.b.1-dfsg.orig/erts/config.h.in
-+++ erlang-14.b.1-dfsg/erts/config.h.in
-@@ -290,6 +290,9 @@
+--- erlang-14.b.2-dfsg.orig/erts/config.h.in
++++ erlang-14.b.2-dfsg/erts/config.h.in
+@@ -326,6 +326,9 @@
/* Define if ipv6 is present */
#undef HAVE_IN6
@@ -25,7 +25,7 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
-@@ -485,6 +488,9 @@
+@@ -521,6 +524,9 @@
/* Define to 1 if `ssf_data' is member of `struct sctp_send_failed'. */
#undef HAVE_STRUCT_SCTP_SEND_FAILED_SSF_DATA
@@ -35,8 +35,8 @@
/* Define to 1 if you have the <syslog.h> header file. */
#undef HAVE_SYSLOG_H
---- erlang-14.b.1-dfsg.orig/lib/ssl/c_src/esock.c
-+++ erlang-14.b.1-dfsg/lib/ssl/c_src/esock.c
+--- erlang-14.b.2-dfsg.orig/lib/ssl/c_src/esock.c
++++ erlang-14.b.2-dfsg/lib/ssl/c_src/esock.c
@@ -132,6 +132,11 @@
#define INADDR_NONE 0xffffffff /* Should be in <netinet/in.h>. */
#endif
@@ -304,8 +304,8 @@
static Connection *new_connection(int state, FD fd)
{
Connection *cp;
---- erlang-14.b.1-dfsg.orig/lib/ssl/src/ssl_broker.erl
-+++ erlang-14.b.1-dfsg/lib/ssl/src/ssl_broker.erl
+--- erlang-14.b.2-dfsg.orig/lib/ssl/src/ssl_broker.erl
++++ erlang-14.b.2-dfsg/lib/ssl/src/ssl_broker.erl
@@ -471,7 +471,7 @@
debug(St, "peername: client = ~w~n", [Client]),
Reply = case ssl_server:peername(St#st.fd) of
@@ -428,8 +428,8 @@
get_tagged_opt(Tag, Opts, Default) ->
case lists:keysearch(Tag, 1, Opts) of
{value, {_, Value}} ->
---- erlang-14.b.1-dfsg.orig/lib/ssl/src/ssl_prim.erl
-+++ erlang-14.b.1-dfsg/lib/ssl/src/ssl_prim.erl
+--- erlang-14.b.2-dfsg.orig/lib/ssl/src/ssl_prim.erl
++++ erlang-14.b.2-dfsg/lib/ssl/src/ssl_prim.erl
@@ -118,7 +118,7 @@
peername(#st{fd = Fd, status = open}) ->
case ssl_server:peername_prim(ssl_server_prim, Fd) of
@@ -448,8 +448,8 @@
{ok, {At, Port}};
Error ->
Error
---- erlang-14.b.1-dfsg.orig/lib/ssl/src/ssl_server.erl
-+++ erlang-14.b.1-dfsg/lib/ssl/src/ssl_server.erl
+--- erlang-14.b.2-dfsg.orig/lib/ssl/src/ssl_server.erl
++++ erlang-14.b.2-dfsg/lib/ssl/src/ssl_server.erl
@@ -1363,7 +1363,10 @@
ip_to_string({A,B,C,D}) ->
Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules 2011-03-29 09:30:19 UTC (rev 1306)
+++ erlang/trunk/debian/rules 2011-03-29 17:08:26 UTC (rev 1307)
@@ -504,8 +504,8 @@
binary: binary-indep binary-arch
-REL=R14B01
-DEB_REL=14.b.1-dfsg
+REL=R14B02
+DEB_REL=14.b.2-dfsg
get-orig-source:
CURDIR=`pwd` && TMPDIR=`mktemp -d /tmp/erlang.XXXXXX` && \
More information about the Pkg-erlang-commits
mailing list