[Pkg-erlang-commits] r1205 - in erlang/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Mon Mar 8 11:15:34 UTC 2010
Author: sgolovan
Date: 2010-03-08 11:15:32 +0000 (Mon, 08 Mar 2010)
New Revision: 1205
Added:
erlang/trunk/debian/patches/powerpc.patch
Modified:
erlang/trunk/debian/changelog
erlang/trunk/debian/control
erlang/trunk/debian/patches/build-options.patch
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/rpath.patch
erlang/trunk/debian/patches/series
erlang/trunk/debian/patches/sparc.patch
erlang/trunk/debian/patches/ssl.patch
erlang/trunk/debian/rules
Log:
* Fixed HiPE architecture recognition for powerpc Debian architecture.
* Moved xsltproc and fop to build-depends-indep and do not build
documentation if only architecture-specific packages are built.
* Refreshed all patches.
Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog 2010-03-05 08:55:52 UTC (rev 1204)
+++ erlang/trunk/debian/changelog 2010-03-08 11:15:32 UTC (rev 1205)
@@ -1,8 +1,11 @@
-erlang (1:13.b.4-dfsg-2) UNRELEASED; urgency=low
+erlang (1:13.b.4-dfsg-2) unstable; urgency=low
- * NOT RELEASED YET
+ * Fixed HiPE architecture recognition for powerpc Debian architecture.
+ * Moved xsltproc and fop to build-depends-indep and do not build
+ documentation if only architecture-specific packages are built.
+ * Refreshed all patches.
- -- Sergei Golovan <sgolovan at debian.org> Fri, 05 Mar 2010 11:55:50 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Mon, 08 Mar 2010 13:29:36 +0300
erlang (1:13.b.4-dfsg-1) unstable; urgency=low
Modified: erlang/trunk/debian/control
===================================================================
--- erlang/trunk/debian/control 2010-03-05 08:55:52 UTC (rev 1204)
+++ erlang/trunk/debian/control 2010-03-08 11:15:32 UTC (rev 1205)
@@ -6,11 +6,12 @@
Standards-Version: 3.8.4
Build-Depends: debhelper (>= 5.0.0), autoconf (>= 2.50), openssl, libssl-dev, m4,
libncurses5-dev, quilt, autotools-dev, unixodbc-dev, bison, flex,
- libwxgtk2.8-dev, dctrl-tools, xsltproc, fop,
+ libwxgtk2.8-dev, dctrl-tools,
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
+Build-Depends-Indep: xsltproc, fop
Build-Conflicts: autoconf2.13, libwxgtk2.4-dev, libwxgtk2.6-dev
Homepage: http://www.erlang.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-erlang/erlang/trunk/
Modified: erlang/trunk/debian/patches/build-options.patch
===================================================================
--- erlang/trunk/debian/patches/build-options.patch 2010-03-05 08:55:52 UTC (rev 1204)
+++ erlang/trunk/debian/patches/build-options.patch 2010-03-08 11:15:32 UTC (rev 1205)
@@ -7,10 +7,10 @@
Also, add debug info to VM binaries if DEB_BUILD_OPTIONS contains "debug".
---- erlang-13.b.3-dfsg.orig/Makefile.in
-+++ erlang-13.b.3-dfsg/Makefile.in
+--- erlang-13.b.4-dfsg.orig/Makefile.in
++++ erlang-13.b.4-dfsg/Makefile.in
@@ -16,6 +16,9 @@
- #
+ #
# %CopyrightEnd%
+ifeq ($(TYPE),debug)
@@ -19,9 +19,9 @@
# Toplevel makefile for building the Erlang system
#
---- erlang-13.b.3-dfsg.orig/erts/etc/common/Makefile.in
-+++ erlang-13.b.3-dfsg/erts/etc/common/Makefile.in
-@@ -494,13 +494,13 @@
+--- erlang-13.b.4-dfsg.orig/erts/etc/common/Makefile.in
++++ erlang-13.b.4-dfsg/erts/etc/common/Makefile.in
+@@ -491,13 +491,13 @@
Install: ../unix/Install.src ../../vsn.mk $(TARGET)/Makefile
sed -e 's;%I_VSN%;$(VSN);' \
@@ -37,9 +37,9 @@
-e 's;%EMULATOR_NUMBER%;$(EMULATOR_NUMBER);' \
-e 's;%VSN%;$(VSN);' \
../unix/erl.src.src > erl.src
---- erlang-13.b.3-dfsg.orig/erts/emulator/Makefile.in
-+++ erlang-13.b.3-dfsg/erts/emulator/Makefile.in
-@@ -258,7 +258,7 @@
+--- erlang-13.b.4-dfsg.orig/erts/emulator/Makefile.in
++++ erlang-13.b.4-dfsg/erts/emulator/Makefile.in
+@@ -262,7 +262,7 @@
CS_CFLAGS = $(CS_CFLAGS_)
endif
CS_LDFLAGS = $(LDFLAGS)
@@ -48,7 +48,7 @@
LIBS += @TERMCAP_LIB@ -L../lib/internal/$(TARGET) @ERTS_INTERNAL_X_LIBS@
-@@ -284,7 +284,7 @@
+@@ -288,7 +288,7 @@
LIBS += $(ERL_TOP)/erts/emulator/pcre/obj/$(TARGET)/$(TYPE)/libepcre.a
DEPLIBS += \
$(ERL_TOP)/erts/emulator/pcre/obj/$(TARGET)/$(TYPE)/libepcre.a \
@@ -57,9 +57,9 @@
# rem liberts_internal.a
endif
---- erlang-13.b.3-dfsg.orig/make/otp.mk.in
-+++ erlang-13.b.3-dfsg/make/otp.mk.in
-@@ -71,18 +71,17 @@
+--- erlang-13.b.4-dfsg.orig/make/otp.mk.in
++++ erlang-13.b.4-dfsg/make/otp.mk.in
+@@ -72,18 +72,17 @@
# Erlang language section
# ----------------------------------------------------
EMULATOR = beam
Modified: erlang/trunk/debian/patches/clean.patch
===================================================================
--- erlang/trunk/debian/patches/clean.patch 2010-03-05 08:55:52 UTC (rev 1204)
+++ erlang/trunk/debian/patches/clean.patch 2010-03-08 11:15:32 UTC (rev 1205)
@@ -3,9 +3,9 @@
Erlang leaves many files after make clean. This patch contains
a hack to remove them.
---- erlang-13.b.3-dfsg.orig/Makefile.in
-+++ erlang-13.b.3-dfsg/Makefile.in
-@@ -777,6 +777,7 @@
+--- erlang-13.b.4-dfsg.orig/Makefile.in
++++ erlang-13.b.4-dfsg/Makefile.in
+@@ -1038,6 +1038,7 @@
cd erts && ERL_TOP=$(ERL_TOP) $(MAKE) clean
cd lib && ERL_TOP=$(ERL_TOP) $(MAKE) clean BUILD_ALL=true
cd lib/dialyzer && ERL_TOP=$(ERL_TOP) $(MAKE) clean
@@ -13,7 +13,7 @@
#
# Just wipe out emulator, not libraries
-@@ -811,3 +812,171 @@
+@@ -1072,3 +1073,171 @@
|| $(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT) bootstrap_root_clean
# ----------------------------------------------------------------------
Modified: erlang/trunk/debian/patches/docs.patch
===================================================================
--- erlang/trunk/debian/patches/docs.patch 2010-03-05 08:55:52 UTC (rev 1204)
+++ erlang/trunk/debian/patches/docs.patch 2010-03-08 11:15:32 UTC (rev 1205)
@@ -57,7 +57,7 @@
$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
- $(INSTALL_DIR) $(RELSYSDIR)/doc/standard
- $(INSTALL_DATA) $(STANDARDS) $(RELSYSDIR)/doc/standard
-
+
else
@@ -264,8 +262,6 @@
Modified: erlang/trunk/debian/patches/emacs.patch
===================================================================
--- erlang/trunk/debian/patches/emacs.patch 2010-03-05 08:55:52 UTC (rev 1204)
+++ erlang/trunk/debian/patches/emacs.patch 2010-03-08 11:15:32 UTC (rev 1205)
@@ -3,9 +3,9 @@
Also, it fixes manpage name regexp matching only 3erl manpages in
section 3.
---- erlang-13.b.3-dfsg.orig/lib/tools/emacs/erlang.el
-+++ erlang-13.b.3-dfsg/lib/tools/emacs/erlang.el
-@@ -1132,23 +1132,22 @@
+--- erlang-13.b.4-dfsg.orig/lib/tools/emacs/erlang.el
++++ erlang-13.b.4-dfsg/lib/tools/emacs/erlang.el
+@@ -1129,23 +1129,22 @@
(or (fboundp 'eval-when-compile)
(defmacro eval-when-compile (&rest rest) nil))
Modified: erlang/trunk/debian/patches/gnu.patch
===================================================================
--- erlang/trunk/debian/patches/gnu.patch 2010-03-05 08:55:52 UTC (rev 1204)
+++ erlang/trunk/debian/patches/gnu.patch 2010-03-08 11:15:32 UTC (rev 1205)
@@ -10,9 +10,9 @@
(4) Skips building SSL certificate examples for GNU/Hurd (Debian GNU/Hurd has
no a random translator yet).
---- erlang-13.b.3-dfsg.orig/erts/configure.in
-+++ erlang-13.b.3-dfsg/erts/configure.in
-@@ -339,7 +339,7 @@
+--- erlang-13.b.4-dfsg.orig/erts/configure.in
++++ erlang-13.b.4-dfsg/erts/configure.in
+@@ -377,7 +377,7 @@
dnl NOTE: CPPFLAGS will be included in CFLAGS at the end
case $host_os in
@@ -21,7 +21,7 @@
win32)
# The ethread library requires _WIN32_WINNT of at least 0x0403.
# -D_WIN32_WINNT=* from CPPFLAGS is saved in ETHR_DEFS.
-@@ -996,7 +996,7 @@
+@@ -1119,7 +1119,7 @@
solaris*)
enable_child_waiter_thread=yes
;;
@@ -30,8 +30,8 @@
AC_DEFINE(USE_RECURSIVE_MALLOC_MUTEX,[1],
[Define if malloc should use a recursive mutex])
AC_MSG_CHECKING([whether dlopen() needs to be called before first call to dlerror()])
---- erlang-13.b.3-dfsg.orig/lib/common_test/Makefile
-+++ erlang-13.b.3-dfsg/lib/common_test/Makefile
+--- erlang-13.b.4-dfsg.orig/lib/common_test/Makefile
++++ erlang-13.b.4-dfsg/lib/common_test/Makefile
@@ -30,9 +30,13 @@
ifeq ($(findstring solaris,$(TARGET)),solaris)
SUB_DIRECTORIES = doc/src src priv
@@ -46,8 +46,8 @@
include vsn.mk
VSN = $(COMMON_TEST_VSN)
---- erlang-13.b.3-dfsg.orig/lib/common_test/priv/Makefile.in
-+++ erlang-13.b.3-dfsg/lib/common_test/priv/Makefile.in
+--- erlang-13.b.4-dfsg.orig/lib/common_test/priv/Makefile.in
++++ erlang-13.b.4-dfsg/lib/common_test/priv/Makefile.in
@@ -43,9 +43,13 @@
ifeq ($(findstring solaris,$(TARGET)),solaris)
XNIX = true
@@ -62,8 +62,8 @@
ifneq ($(findstring win32,$(TARGET)),win32)
---- erlang-13.b.3-dfsg.orig/lib/os_mon/c_src/memsup.c
-+++ erlang-13.b.3-dfsg/lib/os_mon/c_src/memsup.c
+--- erlang-13.b.4-dfsg.orig/lib/os_mon/c_src/memsup.c
++++ erlang-13.b.4-dfsg/lib/os_mon/c_src/memsup.c
@@ -110,6 +110,11 @@
#include <memLib.h>
#endif
@@ -76,8 +76,8 @@
#ifdef BSD4_4
#include <sys/types.h>
#include <sys/sysctl.h>
---- erlang-13.b.3-dfsg.orig/lib/ssl/Makefile
-+++ erlang-13.b.3-dfsg/lib/ssl/Makefile
+--- erlang-13.b.4-dfsg.orig/lib/ssl/Makefile
++++ erlang-13.b.4-dfsg/lib/ssl/Makefile
@@ -32,8 +32,15 @@
SKIP_BUILDING_BINARIES := true
endif
Modified: erlang/trunk/debian/patches/hppa.patch
===================================================================
--- erlang/trunk/debian/patches/hppa.patch 2010-03-05 08:55:52 UTC (rev 1204)
+++ erlang/trunk/debian/patches/hppa.patch 2010-03-08 11:15:32 UTC (rev 1205)
@@ -6,9 +6,9 @@
Forwarded: no
Last-updated: Mon, 22 Feb 2010 10:34:34 +0300
---- erlang-13.b.3-dfsg.orig/erts/configure.in
-+++ erlang-13.b.3-dfsg/erts/configure.in
-@@ -1591,6 +1591,14 @@
+--- erlang-13.b.4-dfsg.orig/erts/configure.in
++++ erlang-13.b.4-dfsg/erts/configure.in
+@@ -1677,6 +1677,14 @@
AC_FUNC_SETVBUF_REVERSED
disable_vfork=false
Modified: erlang/trunk/debian/patches/java.patch
===================================================================
--- erlang/trunk/debian/patches/java.patch 2010-03-05 08:55:52 UTC (rev 1204)
+++ erlang/trunk/debian/patches/java.patch 2010-03-08 11:15:32 UTC (rev 1205)
@@ -6,9 +6,9 @@
Forwarded: yes
Last-updated: Sat, 13 Feb 2010 10:08:42 +0300
---- erlang-13.b.3-dfsg.orig/erts/configure.in
-+++ erlang-13.b.3-dfsg/erts/configure.in
-@@ -3611,7 +3611,8 @@
+--- erlang-13.b.4-dfsg.orig/erts/configure.in
++++ erlang-13.b.4-dfsg/erts/configure.in
+@@ -3975,7 +3975,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-13.b.3-dfsg.orig/lib/test_server/src/configure.in
-+++ erlang-13.b.3-dfsg/lib/test_server/src/configure.in
+--- erlang-13.b.4-dfsg.orig/lib/test_server/src/configure.in
++++ erlang-13.b.4-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 2010-03-05 08:55:52 UTC (rev 1204)
+++ erlang/trunk/debian/patches/m68k.patch 2010-03-08 11:15:32 UTC (rev 1205)
@@ -7,8 +7,8 @@
(2) Non-working networking besause of blind conversion of long to a pointer.
---- erlang-13.b.3-dfsg.orig/erts/emulator/beam/binary.c
-+++ erlang-13.b.3-dfsg/erts/emulator/beam/binary.c
+--- erlang-13.b.4-dfsg.orig/erts/emulator/beam/binary.c
++++ erlang-13.b.4-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-13.b.3-dfsg.orig/erts/emulator/beam/erl_driver.h
-+++ erlang-13.b.3-dfsg/erts/emulator/beam/erl_driver.h
-@@ -570,7 +570,7 @@
+--- erlang-13.b.4-dfsg.orig/erts/emulator/beam/erl_driver.h
++++ erlang-13.b.4-dfsg/erts/emulator/beam/erl_driver.h
+@@ -553,7 +553,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 2010-03-05 08:55:52 UTC (rev 1204)
+++ erlang/trunk/debian/patches/man.patch 2010-03-08 11:15:32 UTC (rev 1205)
@@ -4,9 +4,9 @@
(Erlang manual pages are placed to /usr/share/man/ hierarchy
as required by Debian policy.)
---- erlang-13.b.3-dfsg.orig/erts/etc/common/erlexec.c
-+++ erlang-13.b.3-dfsg/erts/etc/common/erlexec.c
-@@ -699,8 +699,10 @@
+--- erlang-13.b.4-dfsg.orig/erts/etc/common/erlexec.c
++++ erlang-13.b.4-dfsg/erts/etc/common/erlexec.c
+@@ -707,8 +707,10 @@
error("-man not supported on Windows");
#else
argv[i] = "man";
Modified: erlang/trunk/debian/patches/native.patch
===================================================================
--- erlang/trunk/debian/patches/native.patch 2010-03-05 08:55:52 UTC (rev 1204)
+++ erlang/trunk/debian/patches/native.patch 2010-03-08 11:15:32 UTC (rev 1205)
@@ -2,9 +2,9 @@
Adds native code to all Erlang binaries if HiPE is enabled.
---- erlang-13.b.3-dfsg.orig/make/otp.mk.in
-+++ erlang-13.b.3-dfsg/make/otp.mk.in
-@@ -83,6 +83,11 @@
+--- erlang-13.b.4-dfsg.orig/make/otp.mk.in
++++ erlang-13.b.4-dfsg/make/otp.mk.in
+@@ -84,6 +84,11 @@
ERL_COMPILE_FLAGS += +slim
else
ERL_COMPILE_FLAGS += +debug_info
Added: erlang/trunk/debian/patches/powerpc.patch
===================================================================
--- erlang/trunk/debian/patches/powerpc.patch (rev 0)
+++ erlang/trunk/debian/patches/powerpc.patch 2010-03-08 11:15:32 UTC (rev 1205)
@@ -0,0 +1,14 @@
+Author: Sergei Golovan <sgolovan at debian.org>
+Description: Patch defines HiPE architecture ppc for powerpc arch.
+Last-Modified: Mon, 08 Mar 2010 12:23:16 +0300
+
+--- erlang-13.b.3-dfsg.orig/erts/configure.in
++++ erlang-13.b.3-dfsg/erts/configure.in
+@@ -612,7 +612,8 @@
+ x86_64) ARCH=amd64;;
+ amd64) ARCH=amd64;;
+ macppc) ARCH=ppc;;
++ powerpc) ARCH=ppc;;
+ ppc) ARCH=ppc;;
+ ppc64) ARCH=ppc64;;
+ "Power Macintosh") ARCH=ppc;;
Modified: erlang/trunk/debian/patches/rpath.patch
===================================================================
--- erlang/trunk/debian/patches/rpath.patch 2010-03-05 08:55:52 UTC (rev 1204)
+++ erlang/trunk/debian/patches/rpath.patch 2010-03-08 11:15:32 UTC (rev 1205)
@@ -4,7 +4,7 @@
Forwarded: no
Last-modified:Sat, 27 Feb 2010 09:34:43 +0300
--- erlang-13.b.4-dfsg.orig/erts/configure.in
---- erlang-13.b.4-dfsg/erts/configure.in
++++ erlang-13.b.4-dfsg/erts/configure.in
@@ -3831,9 +3831,9 @@
SSL_CC_RUNTIME_LIBRARY_PATH=
SSL_LD_RUNTIME_LIBRARY_PATH=
Modified: erlang/trunk/debian/patches/series
===================================================================
--- erlang/trunk/debian/patches/series 2010-03-05 08:55:52 UTC (rev 1204)
+++ erlang/trunk/debian/patches/series 2010-03-08 11:15:32 UTC (rev 1205)
@@ -9,5 +9,6 @@
docs.patch
java.patch
hppa.patch
+powerpc.patch
#native.patch
#build-options.patch
Modified: erlang/trunk/debian/patches/sparc.patch
===================================================================
--- erlang/trunk/debian/patches/sparc.patch 2010-03-05 08:55:52 UTC (rev 1204)
+++ erlang/trunk/debian/patches/sparc.patch 2010-03-08 11:15:32 UTC (rev 1205)
@@ -5,20 +5,20 @@
(2) Fixes FTBFS(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=328031).
---- erlang-13.b.3-dfsg.orig/erts/configure.in
-+++ erlang-13.b.3-dfsg/erts/configure.in
-@@ -497,7 +497,7 @@
- chk_arch_=`uname -m`
+--- erlang-13.b.4-dfsg.orig/erts/configure.in
++++ erlang-13.b.4-dfsg/erts/configure.in
+@@ -601,7 +601,7 @@
fi
+
case $chk_arch_ in
- sun4u) ARCH=ultrasparc;;
+ sun4u|sparc*) ARCH=ultrasparc;;
sparc64) ARCH=sparc64;;
sun4v) ARCH=ultrasparc;;
i86pc) ARCH=x86;;
---- erlang-13.b.3-dfsg.orig/erts/emulator/beam/beam_emu.c
-+++ erlang-13.b.3-dfsg/erts/emulator/beam/beam_emu.c
-@@ -997,16 +997,6 @@
+--- erlang-13.b.4-dfsg.orig/erts/emulator/beam/beam_emu.c
++++ erlang-13.b.4-dfsg/erts/emulator/beam/beam_emu.c
+@@ -1011,16 +1011,6 @@
* in registers.
*/
@@ -35,7 +35,7 @@
# define REG_x0
# define REG_xregs
# define REG_htop
-@@ -1015,7 +1005,6 @@
+@@ -1029,7 +1019,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 2010-03-05 08:55:52 UTC (rev 1204)
+++ erlang/trunk/debian/patches/ssl.patch 2010-03-08 11:15:32 UTC (rev 1205)
@@ -2,10 +2,10 @@
Patch adds support for IPv6 to the ssl application.
---- erlang-13.b.3-dfsg.orig/erts/configure.in
-+++ erlang-13.b.3-dfsg/erts/configure.in
-@@ -1577,6 +1577,8 @@
- fi
+--- erlang-13.b.4-dfsg.orig/erts/configure.in
++++ erlang-13.b.4-dfsg/erts/configure.in
+@@ -1663,6 +1663,8 @@
+ esac
fi
AC_CHECK_FUNCS([getnameinfo getipnodebyname getipnodebyaddr gethostbyname2])
+AC_CHECK_FUNCS([inet_pton])
@@ -13,8 +13,8 @@
AC_CHECK_FUNCS([ieee_handler fpsetmask finite isnan isinf res_gethostbyname dlopen \
pread pwrite writev memmove strerror strerror_r strncasecmp \
---- erlang-13.b.3-dfsg.orig/erts/config.h.in
-+++ erlang-13.b.3-dfsg/erts/config.h.in
+--- erlang-13.b.4-dfsg.orig/erts/config.h.in
++++ erlang-13.b.4-dfsg/erts/config.h.in
@@ -253,6 +253,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
-@@ -424,6 +427,9 @@
+@@ -436,6 +439,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-13.b.3-dfsg.orig/lib/ssl/c_src/esock.c
-+++ erlang-13.b.3-dfsg/lib/ssl/c_src/esock.c
+--- erlang-13.b.4-dfsg.orig/lib/ssl/c_src/esock.c
++++ erlang-13.b.4-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-13.b.3-dfsg.orig/lib/ssl/src/ssl_broker.erl
-+++ erlang-13.b.3-dfsg/lib/ssl/src/ssl_broker.erl
+--- erlang-13.b.4-dfsg.orig/lib/ssl/src/ssl_broker.erl
++++ erlang-13.b.4-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-13.b.3-dfsg.orig/lib/ssl/src/ssl_prim.erl
-+++ erlang-13.b.3-dfsg/lib/ssl/src/ssl_prim.erl
+--- erlang-13.b.4-dfsg.orig/lib/ssl/src/ssl_prim.erl
++++ erlang-13.b.4-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-13.b.3-dfsg.orig/lib/ssl/src/ssl_server.erl
-+++ erlang-13.b.3-dfsg/lib/ssl/src/ssl_server.erl
+--- erlang-13.b.4-dfsg.orig/lib/ssl/src/ssl_server.erl
++++ erlang-13.b.4-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 2010-03-05 08:55:52 UTC (rev 1204)
+++ erlang/trunk/debian/rules 2010-03-08 11:15:32 UTC (rev 1205)
@@ -314,7 +314,7 @@
touch build-stnd-stamp
docs: docs-stamp
-docs-stamp: $(INSTALL_RULE)
+docs-stamp: $(INSTALL_RULE)
dh_testdir
PATH=$(ROOT_DIR)/bin:$$PATH $(MAKE) docs
$(MAKE) DESTDIR=$(ROOT_DIR)/debian/erlang-docs install-docs
@@ -342,7 +342,7 @@
build: build-arch build-indep
build-arch: build-stamp
-build-indep: build-stamp docs-stamp
+build-indep: build-stamp
build-stamp: $(INSTALL_RULE)
dh_testdir
#
More information about the Pkg-erlang-commits
mailing list