[Pkg-erlang-commits] r1288 - in erlang/branches/experimental/debian: . patches

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Sat Oct 30 20:50:21 UTC 2010 

Author: sgolovan
Date: 2010-10-30 20:50:10 +0000 (Sat, 30 Oct 2010)
New Revision: 1288

Removed:
   erlang/branches/experimental/debian/patches/build-options.patch
Modified:
   erlang/branches/experimental/debian/changelog
   erlang/branches/experimental/debian/patches/clean.patch
   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/m68k.patch
   erlang/branches/experimental/debian/patches/man.patch
   erlang/branches/experimental/debian/patches/native.patch
   erlang/branches/experimental/debian/patches/powerpc.patch
   erlang/branches/experimental/debian/patches/rpath.patch
   erlang/branches/experimental/debian/patches/series
   erlang/branches/experimental/debian/patches/sparc.patch
   erlang/branches/experimental/debian/patches/ssl.patch
   erlang/branches/experimental/debian/rules
Log:
[erlang-experimental]
  * New upstream release.


Modified: erlang/branches/experimental/debian/changelog
===================================================================
--- erlang/branches/experimental/debian/changelog	2010-10-25 04:44:59 UTC (rev 1287)
+++ erlang/branches/experimental/debian/changelog	2010-10-30 20:50:10 UTC (rev 1288)
@@ -1,9 +1,8 @@
-erlang (1:14.a-dfsg-3) UNRELEASED; urgency=low
+erlang (1:14.b-dfsg-1) experimental; urgency=low
 
-  * Fixed a few spelling errors in packages descriptions and Debian changelog
-    entries (closes: #592995).
+  * New upstream release.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sun, 15 Aug 2010 09:09:43 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Sun, 31 Oct 2010 00:48:47 +0400
 
 erlang (1:14.a-dfsg-2) unstable; urgency=low
 

Deleted: erlang/branches/experimental/debian/patches/build-options.patch
===================================================================
--- erlang/branches/experimental/debian/patches/build-options.patch	2010-10-25 04:44:59 UTC (rev 1287)
+++ erlang/branches/experimental/debian/patches/build-options.patch	2010-10-30 20:50:10 UTC (rev 1288)
@@ -1,88 +0,0 @@
-build-options.patch by James Henstridge <james.henstridge at canonical.com>
-and Sergei Golovan
-
-Set ERL_COMPILE_FLAGS based on DEB_BUILD_OPTIONS instead of hard coding
-it based on the platform.  By default, we'll generate compressed stripped
-BEAM files.
-
-Also, add debug info to VM binaries if DEB_BUILD_OPTIONS contains "debug".
-
---- erlang-14.a-dfsg.orig/Makefile.in
-+++ erlang-14.a-dfsg/Makefile.in
-@@ -16,6 +16,9 @@
- #
- # %CopyrightEnd%
- 
-+ifeq ($(TYPE),debug)
-+TYPEMARKER = .debug
-+endif
- # Toplevel makefile for building the Erlang system
- #
- 
---- erlang-14.a-dfsg.orig/erts/etc/common/Makefile.in
-+++ erlang-14.a-dfsg/erts/etc/common/Makefile.in
-@@ -499,13 +499,13 @@
- 
- Install:	../unix/Install.src ../../vsn.mk $(TARGET)/Makefile
- 	sed -e 's;%I_VSN%;$(VSN);' \
--	    -e 's;%EMULATOR%;$(EMULATOR);' \
-+	    -e 's;%EMULATOR%;$(EMULATOR)$(TYPEMARKER);' \
-             -e 's;%EMULATOR_NUMBER%;$(EMULATOR_NUMBER);' \
- 	    -e 's;%I_SYSTEM_VSN%;$(SYSTEM_VSN);' \
-           ../unix/Install.src > Install
- 
- erl.src: ../unix/erl.src.src ../../vsn.mk $(TARGET)/Makefile
--	sed -e 's;%EMULATOR%;$(EMULATOR);' \
-+	sed -e 's;%EMULATOR%;$(EMULATOR)$(TYPEMARKER);' \
-             -e 's;%EMULATOR_NUMBER%;$(EMULATOR_NUMBER);' \
-             -e 's;%VSN%;$(VSN);' \
-                   ../unix/erl.src.src > erl.src
---- erlang-14.a-dfsg.orig/erts/emulator/Makefile.in
-+++ erlang-14.a-dfsg/erts/emulator/Makefile.in
-@@ -258,7 +258,7 @@
- CS_CFLAGS = $(CS_CFLAGS_)
- endif
- CS_LDFLAGS = $(LDFLAGS)
--CS_LIBS = -L../lib/internal/$(TARGET) -lerts_internal @ERTS_INTERNAL_X_LIBS@
-+CS_LIBS = -L../lib/internal/$(TARGET) -lerts_internal$(TYPEMARKER) @ERTS_INTERNAL_X_LIBS@
- 
- LIBS	+= @TERMCAP_LIB@ -L../lib/internal/$(TARGET) @ERTS_INTERNAL_X_LIBS@
- 
-@@ -284,7 +284,7 @@
- LIBS    += $(ERL_TOP)/erts/emulator/pcre/obj/$(TARGET)/$(TYPE)/libepcre.a
- DEPLIBS += \
- 	$(ERL_TOP)/erts/emulator/pcre/obj/$(TARGET)/$(TYPE)/libepcre.a \
--	$(ERL_TOP)/erts/lib/internal/$(TARGET)/liberts_internal.a 
-+	$(ERL_TOP)/erts/lib/internal/$(TARGET)/liberts_internal$(TYPEMARKER).a 
- # rem liberts_internal.a
- endif
- 
---- erlang-14.a-dfsg.orig/make/otp.mk.in
-+++ erlang-14.a-dfsg/make/otp.mk.in
-@@ -72,18 +72,17 @@
- #	Erlang language section
- # ----------------------------------------------------
- EMULATOR = beam
--ifeq ($(findstring vxworks,$(TARGET)),vxworks)
--# VxWorks object files should be compressed.
--# Other object files should have debug_info.
--  ERL_COMPILE_FLAGS += +compressed
-+ifdef BOOTSTRAP
-+  ERL_COMPILE_FLAGS += +slim
- else
--  ifeq ($(findstring ose_ppc750,$(TARGET)),ose_ppc750)
--    ERL_COMPILE_FLAGS += +compressed
-+  ERL_COMPILE_FLAGS += +compressed
-+  ifeq ($(findstring debug,$(DEB_BUILD_OPTIONS)),debug)
-+    ERL_COMPILE_FLAGS += +debug_info
-   else
--    ifdef BOOTSTRAP
--      ERL_COMPILE_FLAGS += +slim
--    else
-+    ifeq ($(findstring nostrip,$(DEB_BUILD_OPTIONS)),nostrip)
-       ERL_COMPILE_FLAGS += +debug_info
-+    else
-+      ERL_COMPILE_FLAGS += +slim
-     endif
-   endif
- endif

Modified: erlang/branches/experimental/debian/patches/clean.patch
===================================================================
--- erlang/branches/experimental/debian/patches/clean.patch	2010-10-25 04:44:59 UTC (rev 1287)
+++ erlang/branches/experimental/debian/patches/clean.patch	2010-10-30 20:50:10 UTC (rev 1288)
@@ -3,9 +3,9 @@
 Erlang leaves many files after make clean. This patch contains
 a hack to remove them.
 
---- erlang-14.a-dfsg.orig/Makefile.in
-+++ erlang-14.a-dfsg/Makefile.in
-@@ -999,6 +999,7 @@
+--- erlang-14.b-dfsg.orig/Makefile.in
++++ erlang-14.b-dfsg/Makefile.in
+@@ -992,6 +992,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
-@@ -1033,3 +1034,192 @@
+@@ -1027,3 +1028,191 @@
  		|| $(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT) bootstrap_root_clean
  
  # ----------------------------------------------------------------------
@@ -151,7 +151,6 @@
 +	rm -rf $(ERL_TOP)/lib/snmp/mibs/Makefile
 +	rm -rf $(ERL_TOP)/lib/ssl/c_src/$(TARGET)
 +	rm -rf $(ERL_TOP)/lib/ssl/doc/man6/ssl.6
-+	rm -rf $(ERL_TOP)/lib/ssl/doc/src/using_ssl.xml
 +	rm -rf $(ERL_TOP)/lib/ssl/examples/certs/$(TARGET)
 +	rm -rf $(ERL_TOP)/lib/ssl/pkix/OTP-PKIX.asn1db
 +	rm -rf $(ERL_TOP)/lib/ssl/priv/bin/$(TARGET)

Modified: erlang/branches/experimental/debian/patches/docs.patch
===================================================================
--- erlang/branches/experimental/debian/patches/docs.patch	2010-10-25 04:44:59 UTC (rev 1287)
+++ erlang/branches/experimental/debian/patches/docs.patch	2010-10-30 20:50:10 UTC (rev 1288)
@@ -2,8 +2,8 @@
 Description: Fixes a bug with .RE macro in the Erlang manpages.
 Last-modified:Sat, 27 Feb 2010 09:35:21 +0300
 
---- erlang-14.a-dfsg.orig/lib/erl_docgen/priv/xsl/db_man.xsl
-+++ erlang-14.a-dfsg/lib/erl_docgen/priv/xsl/db_man.xsl
+--- erlang-14.b-dfsg.orig/lib/erl_docgen/priv/xsl/db_man.xsl
++++ erlang-14.b-dfsg/lib/erl_docgen/priv/xsl/db_man.xsl
 @@ -53,7 +53,7 @@
    <xsl:template match="list">
      <xsl:text>&#10;.RS 2</xsl:text>
@@ -49,8 +49,8 @@
    </xsl:template>
  
  
---- erlang-14.a-dfsg.orig/lib/megaco/doc/src/Makefile
-+++ erlang-14.a-dfsg/lib/megaco/doc/src/Makefile
+--- erlang-14.b-dfsg.orig/lib/megaco/doc/src/Makefile
++++ erlang-14.b-dfsg/lib/megaco/doc/src/Makefile
 @@ -247,8 +247,6 @@
  	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
  	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
@@ -69,8 +69,8 @@
  endif
  endif
  
---- erlang-14.a-dfsg.orig/lib/stdlib/doc/src/re.xml
-+++ erlang-14.a-dfsg/lib/stdlib/doc/src/re.xml
+--- erlang-14.b-dfsg.orig/lib/stdlib/doc/src/re.xml
++++ erlang-14.b-dfsg/lib/stdlib/doc/src/re.xml
 @@ -353,7 +353,7 @@
        metacharacter should not match before it. Setting this without
        <c>multiline</c> (at compile time) causes circumflex never to

Modified: erlang/branches/experimental/debian/patches/emacs.patch
===================================================================
--- erlang/branches/experimental/debian/patches/emacs.patch	2010-10-25 04:44:59 UTC (rev 1287)
+++ erlang/branches/experimental/debian/patches/emacs.patch	2010-10-30 20:50:10 UTC (rev 1288)
@@ -3,8 +3,8 @@
 Also, it fixes manpage name regexp matching only 3erl manpages in
 section 3.
 
---- erlang-14.a-dfsg.orig/lib/tools/emacs/erlang.el
-+++ erlang-14.a-dfsg/lib/tools/emacs/erlang.el
+--- erlang-14.b-dfsg.orig/lib/tools/emacs/erlang.el
++++ erlang-14.b-dfsg/lib/tools/emacs/erlang.el
 @@ -492,8 +492,8 @@
  (defvar erlang-man-dirs
    '(("Man - Commands" "/man/man1" t)

Modified: erlang/branches/experimental/debian/patches/gnu.patch
===================================================================
--- erlang/branches/experimental/debian/patches/gnu.patch	2010-10-25 04:44:59 UTC (rev 1287)
+++ erlang/branches/experimental/debian/patches/gnu.patch	2010-10-30 20:50:10 UTC (rev 1288)
@@ -5,12 +5,9 @@
     with 'gnu' substring in OS name. Fixes FTBFS on GNU/kFreeBSD and GNU/Hurd.
 
 (2) Undefines BSD4_4 for os_mon application for GNU/Hurd;
-
-(2) Skips building SSL certificate examples for GNU/Hurd (Debian GNU/Hurd has
-    no a random translator yet).
---- erlang-14.a-dfsg.orig/erts/configure.in
-+++ erlang-14.a-dfsg/erts/configure.in
-@@ -385,7 +385,7 @@
+--- erlang-14.b-dfsg.orig/erts/configure.in
++++ erlang-14.b-dfsg/erts/configure.in
+@@ -378,7 +378,7 @@
  
  dnl NOTE: CPPFLAGS will be included in CFLAGS at the end
  case $host_os in
@@ -19,17 +16,17 @@
      win32)
  	# The ethread library requires _WIN32_WINNT of at least 0x0403.
  	# -D_WIN32_WINNT=* from CPPFLAGS is saved in ETHR_DEFS.
-@@ -1148,7 +1148,7 @@
+@@ -1177,7 +1177,7 @@
  	    solaris*)
  		enable_child_waiter_thread=yes
  		;;
 -	    linux*)
 +	    linux*|*gnu*)
- 		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-14.a-dfsg.orig/lib/os_mon/c_src/memsup.c
-+++ erlang-14.a-dfsg/lib/os_mon/c_src/memsup.c
+ 		if test "x$ETHR_THR_LIB_BASE_TYPE" != "xposix_nptl"; then
+ 		    AC_DEFINE(ERTS_NEED_DLOPEN_BEFORE_DLERROR,[1],
+--- erlang-14.b-dfsg.orig/lib/os_mon/c_src/memsup.c
++++ erlang-14.b-dfsg/lib/os_mon/c_src/memsup.c
 @@ -110,6 +110,11 @@
  #include <memLib.h>
  #endif
@@ -42,21 +39,3 @@
  #ifdef BSD4_4
  #include <sys/types.h>
  #include <sys/sysctl.h>
---- erlang-14.a-dfsg.orig/lib/ssl/Makefile
-+++ erlang-14.a-dfsg/lib/ssl/Makefile
-@@ -32,8 +32,15 @@
- SKIP_BUILDING_BINARIES := true
- endif
- else
-+ifeq ($(HOST_OS),)
-+HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess)
-+endif
-+ifeq ($(findstring gnu0.3,$(HOST_OS)),gnu0.3)
-+SKIP_BUILDING_BINARIES := true
-+else
- SKIP_BUILDING_BINARIES := false
- endif
-+endif
- 
- ifeq ($(SKIP_BUILDING_BINARIES), true)
- SUB_DIRECTORIES = src c_src doc/src 

Modified: erlang/branches/experimental/debian/patches/hppa.patch
===================================================================
--- erlang/branches/experimental/debian/patches/hppa.patch	2010-10-25 04:44:59 UTC (rev 1287)
+++ erlang/branches/experimental/debian/patches/hppa.patch	2010-10-30 20:50:10 UTC (rev 1288)
@@ -6,9 +6,9 @@
 Forwarded: no
 Last-updated: Mon, 22 Feb 2010 10:34:34 +0300
 
---- erlang-14.a-dfsg.orig/erts/configure.in
-+++ erlang-14.a-dfsg/erts/configure.in
-@@ -1706,6 +1706,14 @@
+--- erlang-14.b-dfsg.orig/erts/configure.in
++++ erlang-14.b-dfsg/erts/configure.in
+@@ -1730,6 +1730,14 @@
  AC_FUNC_SETVBUF_REVERSED	
  
  disable_vfork=false

Modified: erlang/branches/experimental/debian/patches/java.patch
===================================================================
--- erlang/branches/experimental/debian/patches/java.patch	2010-10-25 04:44:59 UTC (rev 1287)
+++ erlang/branches/experimental/debian/patches/java.patch	2010-10-30 20:50:10 UTC (rev 1288)
@@ -6,9 +6,9 @@
 Forwarded: yes
 Last-updated: Sat, 13 Feb 2010 10:08:42 +0300
 
---- erlang-14.a-dfsg.orig/erts/configure.in
-+++ erlang-14.a-dfsg/erts/configure.in
-@@ -4002,7 +4002,8 @@
+--- erlang-14.b-dfsg.orig/erts/configure.in
++++ erlang-14.b-dfsg/erts/configure.in
+@@ -4005,7 +4005,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.a-dfsg.orig/lib/test_server/src/configure.in
-+++ erlang-14.a-dfsg/lib/test_server/src/configure.in
+--- erlang-14.b-dfsg.orig/lib/test_server/src/configure.in
++++ erlang-14.b-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/branches/experimental/debian/patches/m68k.patch
===================================================================
--- erlang/branches/experimental/debian/patches/m68k.patch	2010-10-25 04:44:59 UTC (rev 1287)
+++ erlang/branches/experimental/debian/patches/m68k.patch	2010-10-30 20:50:10 UTC (rev 1288)
@@ -7,8 +7,8 @@
 
 (2) Non-working networking besause of blind conversion of long to a pointer.
 
---- erlang-14.a-dfsg.orig/erts/emulator/beam/binary.c
-+++ erlang-14.a-dfsg/erts/emulator/beam/binary.c
+--- erlang-14.b-dfsg.orig/erts/emulator/beam/binary.c
++++ erlang-14.b-dfsg/erts/emulator/beam/binary.c
 @@ -31,6 +31,10 @@
  #include "erl_binary.h"
  #include "erl_bits.h"
@@ -20,8 +20,8 @@
  #ifdef DEBUG
  static int list_to_bitstr_buf(Eterm obj, char* buf, int len);
  #else
---- erlang-14.a-dfsg.orig/erts/emulator/beam/erl_driver.h
-+++ erlang-14.a-dfsg/erts/emulator/beam/erl_driver.h
+--- erlang-14.b-dfsg.orig/erts/emulator/beam/erl_driver.h
++++ erlang-14.b-dfsg/erts/emulator/beam/erl_driver.h
 @@ -562,7 +562,7 @@
  EXTERN ErlDrvTermData driver_caller(ErlDrvPort);
  extern const ErlDrvTermData driver_term_nil;

Modified: erlang/branches/experimental/debian/patches/man.patch
===================================================================
--- erlang/branches/experimental/debian/patches/man.patch	2010-10-25 04:44:59 UTC (rev 1287)
+++ erlang/branches/experimental/debian/patches/man.patch	2010-10-30 20:50:10 UTC (rev 1288)
@@ -4,9 +4,9 @@
 (Erlang manual pages are placed to /usr/share/man/ hierarchy
 as required by Debian policy.)
 
---- erlang-14.a-dfsg.orig/erts/etc/common/erlexec.c
-+++ erlang-14.a-dfsg/erts/etc/common/erlexec.c
-@@ -707,8 +707,10 @@
+--- erlang-14.b-dfsg.orig/erts/etc/common/erlexec.c
++++ erlang-14.b-dfsg/erts/etc/common/erlexec.c
+@@ -714,8 +714,10 @@
  			error("-man not supported on Windows");
  #else
  			argv[i] = "man";

Modified: erlang/branches/experimental/debian/patches/native.patch
===================================================================
--- erlang/branches/experimental/debian/patches/native.patch	2010-10-25 04:44:59 UTC (rev 1287)
+++ erlang/branches/experimental/debian/patches/native.patch	2010-10-30 20:50:10 UTC (rev 1288)
@@ -2,9 +2,9 @@
 
 Adds native code to all Erlang binaries if HiPE is enabled.
 
---- erlang-14.a-dfsg.orig/make/otp.mk.in
-+++ erlang-14.a-dfsg/make/otp.mk.in
-@@ -84,6 +84,11 @@
+--- erlang-14.b-dfsg.orig/make/otp.mk.in
++++ erlang-14.b-dfsg/make/otp.mk.in
+@@ -89,6 +89,11 @@
        ERL_COMPILE_FLAGS += +slim
      else
        ERL_COMPILE_FLAGS += +debug_info

Modified: erlang/branches/experimental/debian/patches/powerpc.patch
===================================================================
--- erlang/branches/experimental/debian/patches/powerpc.patch	2010-10-25 04:44:59 UTC (rev 1287)
+++ erlang/branches/experimental/debian/patches/powerpc.patch	2010-10-30 20:50:10 UTC (rev 1288)
@@ -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.a-dfsg.orig/erts/configure.in
-+++ erlang-14.a-dfsg/erts/configure.in
-@@ -620,6 +620,7 @@
+--- erlang-14.b-dfsg.orig/erts/configure.in
++++ erlang-14.b-dfsg/erts/configure.in
+@@ -613,6 +613,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	2010-10-25 04:44:59 UTC (rev 1287)
+++ erlang/branches/experimental/debian/patches/rpath.patch	2010-10-30 20:50:10 UTC (rev 1288)
@@ -3,9 +3,9 @@
  satisfy Debian policy.
 Forwarded: no
 Last-modified:Sat, 27 Feb 2010 09:34:43 +0300
---- erlang-14.a-dfsg.orig/erts/configure.in
-+++ erlang-14.a-dfsg/erts/configure.in
-@@ -3858,9 +3858,9 @@
+--- erlang-14.b-dfsg.orig/erts/configure.in
++++ erlang-14.b-dfsg/erts/configure.in
+@@ -3861,9 +3861,9 @@
  SSL_CC_RUNTIME_LIBRARY_PATH=
  SSL_LD_RUNTIME_LIBRARY_PATH=
  SSL_DED_LD_RUNTIME_LIBRARY_PATH=

Modified: erlang/branches/experimental/debian/patches/series
===================================================================
--- erlang/branches/experimental/debian/patches/series	2010-10-25 04:44:59 UTC (rev 1287)
+++ erlang/branches/experimental/debian/patches/series	2010-10-30 20:50:10 UTC (rev 1288)
@@ -11,4 +11,3 @@
 hppa.patch
 powerpc.patch
 #native.patch
-#build-options.patch

Modified: erlang/branches/experimental/debian/patches/sparc.patch
===================================================================
--- erlang/branches/experimental/debian/patches/sparc.patch	2010-10-25 04:44:59 UTC (rev 1287)
+++ erlang/branches/experimental/debian/patches/sparc.patch	2010-10-30 20:50:10 UTC (rev 1288)
@@ -5,9 +5,9 @@
 
 (2) Fixes FTBFS(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=328031).
 
---- erlang-14.a-dfsg.orig/erts/configure.in
-+++ erlang-14.a-dfsg/erts/configure.in
-@@ -609,7 +609,7 @@
+--- erlang-14.b-dfsg.orig/erts/configure.in
++++ erlang-14.b-dfsg/erts/configure.in
+@@ -602,7 +602,7 @@
  fi
  
  case $chk_arch_ in
@@ -16,8 +16,8 @@
      sparc64)	ARCH=sparc64;;
      sun4v)	ARCH=ultrasparc;;
      i86pc)	ARCH=x86;;
---- erlang-14.a-dfsg.orig/erts/emulator/beam/beam_emu.c
-+++ erlang-14.a-dfsg/erts/emulator/beam/beam_emu.c
+--- erlang-14.b-dfsg.orig/erts/emulator/beam/beam_emu.c
++++ erlang-14.b-dfsg/erts/emulator/beam/beam_emu.c
 @@ -1022,16 +1022,6 @@
   * in registers.
   */

Modified: erlang/branches/experimental/debian/patches/ssl.patch
===================================================================
--- erlang/branches/experimental/debian/patches/ssl.patch	2010-10-25 04:44:59 UTC (rev 1287)
+++ erlang/branches/experimental/debian/patches/ssl.patch	2010-10-30 20:50:10 UTC (rev 1288)
@@ -2,9 +2,9 @@
 
 Patch adds support for IPv6 to the ssl application.
 
---- erlang-14.a-dfsg.orig/erts/configure.in
-+++ erlang-14.a-dfsg/erts/configure.in
-@@ -1692,6 +1692,8 @@
+--- erlang-14.b-dfsg.orig/erts/configure.in
++++ erlang-14.b-dfsg/erts/configure.in
+@@ -1713,6 +1713,8 @@
  	esac
  fi
  AC_CHECK_FUNCS([getnameinfo 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.a-dfsg.orig/erts/config.h.in
-+++ erlang-14.a-dfsg/erts/config.h.in
-@@ -272,6 +272,9 @@
+--- erlang-14.b-dfsg.orig/erts/config.h.in
++++ erlang-14.b-dfsg/erts/config.h.in
+@@ -287,6 +287,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
  
-@@ -458,6 +461,9 @@
+@@ -476,6 +479,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.a-dfsg.orig/lib/ssl/c_src/esock.c
-+++ erlang-14.a-dfsg/lib/ssl/c_src/esock.c
+--- erlang-14.b-dfsg.orig/lib/ssl/c_src/esock.c
++++ erlang-14.b-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.a-dfsg.orig/lib/ssl/src/ssl_broker.erl
-+++ erlang-14.a-dfsg/lib/ssl/src/ssl_broker.erl
+--- erlang-14.b-dfsg.orig/lib/ssl/src/ssl_broker.erl
++++ erlang-14.b-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.a-dfsg.orig/lib/ssl/src/ssl_prim.erl
-+++ erlang-14.a-dfsg/lib/ssl/src/ssl_prim.erl
+--- erlang-14.b-dfsg.orig/lib/ssl/src/ssl_prim.erl
++++ erlang-14.b-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.a-dfsg.orig/lib/ssl/src/ssl_server.erl
-+++ erlang-14.a-dfsg/lib/ssl/src/ssl_server.erl
+--- erlang-14.b-dfsg.orig/lib/ssl/src/ssl_server.erl
++++ erlang-14.b-dfsg/lib/ssl/src/ssl_server.erl
 @@ -1363,7 +1363,10 @@
  
  ip_to_string({A,B,C,D}) ->

Modified: erlang/branches/experimental/debian/rules
===================================================================
--- erlang/branches/experimental/debian/rules	2010-10-25 04:44:59 UTC (rev 1287)
+++ erlang/branches/experimental/debian/rules	2010-10-30 20:50:10 UTC (rev 1288)
@@ -504,8 +504,8 @@
 
 binary: binary-indep binary-arch
 
-REL=R14A
-DEB_REL=14.a-dfsg
+REL=R14B
+DEB_REL=14.b-dfsg
 
 get-orig-source:
 	CURDIR=`pwd` && TMPDIR=`mktemp -d /tmp/erlang.XXXXXX` && \

More information about the Pkg-erlang-commits mailing list