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

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Thu Feb 28 10:28:35 UTC 2013 

Author: sgolovan
Date: 2013-02-28 10:28:34 +0000 (Thu, 28 Feb 2013)
New Revision: 1489

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/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:
[erlang-experimental]
  * New upstream release.


Modified: erlang/branches/experimental/debian/changelog
===================================================================
--- erlang/branches/experimental/debian/changelog	2013-01-27 17:39:38 UTC (rev 1488)
+++ erlang/branches/experimental/debian/changelog	2013-02-28 10:28:34 UTC (rev 1489)
@@ -1,8 +1,8 @@
-erlang (1:15.b.3.1-dfsg-2) UNRELEASED; urgency=low
+erlang (1:16.b-dfsg-1) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
 
- -- Sergei Golovan <sgolovan at debian.org>  Thu, 17 Jan 2013 13:50:18 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 28 Feb 2013 09:08:37 +0400
 
 erlang (1:15.b.3.1-dfsg-1) experimental; urgency=low
 

Modified: erlang/branches/experimental/debian/patches/clean.patch
===================================================================
--- erlang/branches/experimental/debian/patches/clean.patch	2013-01-27 17:39:38 UTC (rev 1488)
+++ erlang/branches/experimental/debian/patches/clean.patch	2013-02-28 10:28:34 UTC (rev 1489)
@@ -3,9 +3,9 @@
 Erlang leaves many files after make clean. This patch contains
 a hack to remove them.
 
---- erlang-15.b.2-dfsg.orig/Makefile.in
-+++ erlang-15.b.2-dfsg/Makefile.in
-@@ -987,6 +987,7 @@
+--- erlang-16.b-dfsg.orig/Makefile.in
++++ erlang-16.b-dfsg/Makefile.in
+@@ -995,6 +995,7 @@
  	find . -type f -name SKIP -print | xargs $(RM)
  	cd erts && ERL_TOP=$(ERL_TOP) $(MAKE) clean
  	cd lib  && ERL_TOP=$(ERL_TOP) $(MAKE) clean BUILD_ALL=true
@@ -13,7 +13,7 @@
  
  #
  # Just wipe out emulator, not libraries
-@@ -1022,3 +1023,181 @@
+@@ -1032,3 +1033,207 @@
  		|| $(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT) bootstrap_root_clean
  
  # ----------------------------------------------------------------------
@@ -24,6 +24,7 @@
 +	rm -rf $(ERL_TOP)/bootstrap/bin/erlc
 +	rm -rf $(ERL_TOP)/bootstrap/bin/escript
 +	rm -rf $(ERL_TOP)/bootstrap/lib/asn1
++	rm -rf $(ERL_TOP)/bootstrap/lib/common_test
 +	rm -rf $(ERL_TOP)/bootstrap/lib/hipe
 +	rm -rf $(ERL_TOP)/bootstrap/lib/ic
 +	rm -rf $(ERL_TOP)/bootstrap/lib/orber
@@ -68,6 +69,18 @@
 +	rm -rf $(ERL_TOP)/erts/start_scripts/tmp
 +	rm -rf $(ERL_TOP)/lib/asn1/priv/lib/$(TARGET)
 +	rm -rf $(ERL_TOP)/lib/asn1/priv/obj/$(TARGET)
++	rm -rf $(ERL_TOP)/lib/asn1/src/asn1ct_eval_ext.erl
++	rm -rf $(ERL_TOP)/lib/asn1/src/asn1ct_eval_per.erl
++	rm -rf $(ERL_TOP)/lib/asn1/src/asn1ct_eval_uper.erl
++	rm -rf $(ERL_TOP)/lib/asn1/src/asn1ct_rtt.erl
++	rm -rf $(ERL_TOP)/lib/asn1/src/asn1rtt_ber.beam
++	rm -rf $(ERL_TOP)/lib/asn1/src/asn1rtt_check.beam
++	rm -rf $(ERL_TOP)/lib/asn1/src/asn1rtt_ext.beam
++	rm -rf $(ERL_TOP)/lib/asn1/src/asn1rtt_per.beam
++	rm -rf $(ERL_TOP)/lib/asn1/src/asn1rtt_per_common.beam
++	rm -rf $(ERL_TOP)/lib/asn1/src/asn1rtt_real_common.beam
++	rm -rf $(ERL_TOP)/lib/asn1/src/asn1rtt_uper.beam
++	rm -rf $(ERL_TOP)/lib/asn1/src/prepare_templates.beam
 +	rm -rf $(ERL_TOP)/lib/common_test/config.log
 +	rm -rf $(ERL_TOP)/lib/common_test/config.status
 +	rm -rf $(ERL_TOP)/lib/common_test/priv/$(TARGET)
@@ -136,13 +149,23 @@
 +	rm -rf $(ERL_TOP)/lib/os_mon/priv/obj/$(TARGET)
 +	rm -rf $(ERL_TOP)/lib/otp_mibs/ebin/otp_mib.beam
 +	rm -rf $(ERL_TOP)/lib/public_key/asn1/PKCS-FRAME.asn1db
++	rm -rf $(ERL_TOP)/lib/public_key/asn1/UsefulDefinitions.asn1db
 +	rm -rf $(ERL_TOP)/lib/runtime_tools/c_src/$(TARGET)
++	rm -rf $(ERL_TOP)/lib/runtime_tools/doc/src/DTRACE.xml
++	rm -rf $(ERL_TOP)/lib/runtime_tools/doc/src/SYSTEMTAP.xml
 +	rm -rf $(ERL_TOP)/lib/runtime_tools/priv/lib/$(TARGET)
 +	rm -rf $(ERL_TOP)/lib/runtime_tools/priv/obj/$(TARGET)
 +	rm -rf $(ERL_TOP)/lib/snmp/config.log
 +	rm -rf $(ERL_TOP)/lib/snmp/config.status
 +	rm -rf $(ERL_TOP)/lib/snmp/mibs/Makefile
++	rm -rf $(ERL_TOP)/lib/ssh/doc/man6/ssh.6
++	rm -rf $(ERL_TOP)/lib/ssh/ebin/ssh_channel.beam
++	rm -rf $(ERL_TOP)/lib/ssh/ebin/ssh_client_key_api.beam
++	rm -rf $(ERL_TOP)/lib/ssh/ebin/ssh_daemon_channel.beam
++	rm -rf $(ERL_TOP)/lib/ssh/ebin/ssh_server_key_api.beam
++	rm -rf $(ERL_TOP)/lib/ssh/ebin/ssh_sftpd_file_api.beam
 +	rm -rf $(ERL_TOP)/lib/ssl/doc/man6/ssl.6
++	rm -rf $(ERL_TOP)/lib/ssl/ebin/ssl_session_cache_api.beam
 +	rm -rf $(ERL_TOP)/lib/test_server/src/configure
 +	rm -rf $(ERL_TOP)/lib/tools/c_src/$(TARGET)
 +	rm -rf $(ERL_TOP)/lib/tools/src/xref_parser.erl
@@ -153,10 +176,12 @@
 +	rm -rf $(ERL_TOP)/lib/wx/c_src/Makefile
 +	rm -rf $(ERL_TOP)/lib/wx/doc/src/ref_man.xml
 +	rm -rf $(ERL_TOP)/lib/wx/$(TARGET)
++	rm -rf $(ERL_TOP)/lib/wx/priv/$(TARGET)
 +	rm -rf $(ERL_TOP)/lib/wx/priv/erl_gl.so
 +	rm -rf $(ERL_TOP)/lib/wx/priv/wxe_driver.so
 +	rm -rf $(ERL_TOP)/lib/xmerl/doc/src/xmerl_ug.xml
 +	rm -rf $(ERL_TOP)/make/emd2exml
++	rm -rf $(ERL_TOP)/make/output.mk
 +	rm -rf $(ERL_TOP)/make/$(TARGET)
 +	rm -rf $(ERL_TOP)/Makefile
 +	rm -rf $(ERL_TOP)/system/doc/html/applications.html
@@ -180,6 +205,7 @@
 +	rm -rf $(ERL_TOP)/system/doc/installation_guide/INSTALL-CROSS.xml
 +	rm -rf $(ERL_TOP)/system/doc/installation_guide/INSTALL-WIN32.xml
 +	rm -rf $(ERL_TOP)/system/doc/installation_guide/INSTALL.xml
++	rm -rf $(ERL_TOP)/system/doc/installation_guide/MARKDOWN.xml
 +	rm -rf $(ERL_TOP)/system/doc/pdf/otp-system-documentation-*.fo
 +	rm -rf $(ERL_TOP)/system/doc/pdf/otp-system-documentation-*.pdf
 +	rm -rf $(ERL_TOP)/system/doc/programming_examples/funs.xml

Modified: erlang/branches/experimental/debian/patches/docs.patch
===================================================================
--- erlang/branches/experimental/debian/patches/docs.patch	2013-01-27 17:39:38 UTC (rev 1488)
+++ erlang/branches/experimental/debian/patches/docs.patch	2013-02-28 10:28:34 UTC (rev 1489)
@@ -3,8 +3,8 @@
  and a few bugs with docs installation.
 Last-modified: Thu, 09 Dec 2010 10:45:56 +0300
 
---- erlang-15.b.2-dfsg.orig/lib/erl_docgen/priv/xsl/db_man.xsl
-+++ erlang-15.b.2-dfsg/lib/erl_docgen/priv/xsl/db_man.xsl
+--- erlang-16.b-dfsg.orig/lib/erl_docgen/priv/xsl/db_man.xsl
++++ erlang-16.b-dfsg/lib/erl_docgen/priv/xsl/db_man.xsl
 @@ -508,7 +508,7 @@
          <xsl:text>
.RS 2</xsl:text>
          <xsl:text>
.LP
</xsl:text>
@@ -23,8 +23,8 @@
    </xsl:template>
  
  
---- erlang-15.b.2-dfsg.orig/lib/megaco/doc/src/Makefile
-+++ erlang-15.b.2-dfsg/lib/megaco/doc/src/Makefile
+--- erlang-16.b-dfsg.orig/lib/megaco/doc/src/Makefile
++++ erlang-16.b-dfsg/lib/megaco/doc/src/Makefile
 @@ -172,8 +172,6 @@
  	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
  	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
@@ -34,9 +34,9 @@
  
  release_spec:
  
---- erlang-15.b.2-dfsg.orig/lib/stdlib/doc/src/re.xml
-+++ erlang-15.b.2-dfsg/lib/stdlib/doc/src/re.xml
-@@ -344,7 +344,7 @@
+--- erlang-16.b-dfsg.orig/lib/stdlib/doc/src/re.xml
++++ erlang-16.b-dfsg/lib/stdlib/doc/src/re.xml
+@@ -310,7 +310,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>
  
-@@ -353,8 +353,8 @@
+@@ -319,8 +319,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
@@ -56,8 +56,8 @@
  
        <tag><c>{offset, integer() >= 0}</c></tag>
  
---- erlang-15.b.2-dfsg.orig/lib/tools/Makefile
-+++ erlang-15.b.2-dfsg/lib/tools/Makefile
+--- erlang-16.b-dfsg.orig/lib/tools/Makefile
++++ erlang-16.b-dfsg/lib/tools/Makefile
 @@ -23,7 +23,7 @@
  # Macros
  # ----------------------------------------------------

Modified: erlang/branches/experimental/debian/patches/emacs.patch
===================================================================
--- erlang/branches/experimental/debian/patches/emacs.patch	2013-01-27 17:39:38 UTC (rev 1488)
+++ erlang/branches/experimental/debian/patches/emacs.patch	2013-02-28 10:28:34 UTC (rev 1489)
@@ -3,9 +3,9 @@
 Also, it fixes manpage name regexp matching only 3erl manpages in
 section 3.
 
---- erlang-15.b.2-dfsg.orig/lib/tools/emacs/erlang.el
-+++ erlang-15.b.2-dfsg/lib/tools/emacs/erlang.el
-@@ -496,8 +496,8 @@
+--- erlang-16.b-dfsg.orig/lib/tools/emacs/erlang.el
++++ erlang-16.b-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
-@@ -1206,23 +1206,22 @@
+@@ -1279,23 +1279,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.
-@@ -1967,7 +1966,7 @@
+@@ -2014,7 +2013,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 '()
-@@ -1978,7 +1977,7 @@
+@@ -2025,7 +2024,7 @@
  
  (defun erlang-man-get-files (dir)
    "Return files in directory DIR."
@@ -62,7 +62,7 @@
  
  
  (defun erlang-man-module (&optional module)
-@@ -1998,7 +1997,7 @@
+@@ -2045,7 +2044,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))
-@@ -2139,9 +2138,9 @@
+@@ -2186,9 +2185,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	2013-01-27 17:39:38 UTC (rev 1488)
+++ erlang/branches/experimental/debian/patches/gnu.patch	2013-02-28 10:28:34 UTC (rev 1489)
@@ -11,8 +11,8 @@
 
 (4) Switch some PATH_MAX occurrences to MAXPATHLEN;
 
---- erlang-15.b.2-dfsg.orig/erts/configure.in
-+++ erlang-15.b.2-dfsg/erts/configure.in
+--- erlang-16.b-dfsg.orig/erts/configure.in
++++ erlang-16.b-dfsg/erts/configure.in
 @@ -425,7 +425,7 @@
  
  dnl NOTE: CPPFLAGS will be included in CFLAGS at the end
@@ -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.
-@@ -1169,7 +1169,7 @@
+@@ -1213,7 +1213,7 @@
  	    solaris*)
  		enable_child_waiter_thread=yes
  		;;
@@ -31,11 +31,11 @@
  		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-15.b.2-dfsg.orig/lib/os_mon/c_src/memsup.c
-+++ erlang-15.b.2-dfsg/lib/os_mon/c_src/memsup.c
-@@ -110,6 +110,11 @@
- #include <memLib.h>
- #endif
+--- erlang-16.b-dfsg.orig/lib/os_mon/c_src/memsup.c
++++ erlang-16.b-dfsg/lib/os_mon/c_src/memsup.c
+@@ -98,6 +98,11 @@
+ #include <time.h>
+ #include <errno.h>
  
 +#ifdef __GNU__
 +#warning "Undefined BSD4_4 for GNU/Hurd"
@@ -45,9 +45,9 @@
  #ifdef BSD4_4
  #include <sys/types.h>
  #include <sys/sysctl.h>
---- erlang-15.b.2-dfsg.orig/erts/emulator/drivers/common/inet_drv.c
-+++ erlang-15.b.2-dfsg/erts/emulator/drivers/common/inet_drv.c
-@@ -532,6 +532,11 @@
+--- erlang-16.b-dfsg.orig/erts/emulator/drivers/common/inet_drv.c
++++ erlang-16.b-dfsg/erts/emulator/drivers/common/inet_drv.c
+@@ -511,6 +511,11 @@
          inet_driver_select((d)->port, (ErlDrvEvent)(long)(d)->event, (flags), (onoff)); \
     } while(0)
  
@@ -59,9 +59,9 @@
  
  #endif /* __WIN32__ */
  
---- erlang-15.b.2-dfsg.orig/erts/etc/common/erlexec.c
-+++ erlang-15.b.2-dfsg/erts/etc/common/erlexec.c
-@@ -1519,7 +1519,7 @@
+--- erlang-16.b-dfsg.orig/erts/etc/common/erlexec.c
++++ erlang-16.b-dfsg/erts/etc/common/erlexec.c
+@@ -1525,7 +1525,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';
  	
-@@ -1533,7 +1533,7 @@
+@@ -1539,7 +1539,7 @@
      if (!rootdir) {
  	/* Determine rootdir from absolute path to bindir */
  	char *p;
@@ -79,8 +79,8 @@
  	strncpy(buffer, bindir, sizeof(buffer));
  	buffer[sizeof(buffer)-1] = '\0';
  	
---- erlang-15.b.2-dfsg.orig/erts/etc/common/escript.c
-+++ erlang-15.b.2-dfsg/erts/etc/common/escript.c
+--- erlang-16.b-dfsg.orig/erts/etc/common/escript.c
++++ erlang-16.b-dfsg/erts/etc/common/escript.c
 @@ -53,7 +53,7 @@
  #  define IS_DIRSEP(c) ((c) == '/')
  #  define DIRSEPSTR "/"
@@ -90,8 +90,8 @@
  #  define ERL_NAME "erl"
  #endif
  
---- erlang-15.b.2-dfsg.orig/erts/etc/unix/dyn_erl.c
-+++ erlang-15.b.2-dfsg/erts/etc/unix/dyn_erl.c
+--- erlang-16.b-dfsg.orig/erts/etc/unix/dyn_erl.c
++++ erlang-16.b-dfsg/erts/etc/unix/dyn_erl.c
 @@ -149,8 +149,8 @@
  static char *
  find_prog(char *origpath)

Modified: erlang/branches/experimental/debian/patches/hppa.patch
===================================================================
--- erlang/branches/experimental/debian/patches/hppa.patch	2013-01-27 17:39:38 UTC (rev 1488)
+++ erlang/branches/experimental/debian/patches/hppa.patch	2013-02-28 10:28:34 UTC (rev 1489)
@@ -6,9 +6,9 @@
 Forwarded: no
 Last-updated: Mon, 22 Feb 2010 10:34:34 +0300
 
---- erlang-15.b.2-dfsg.orig/erts/configure.in
-+++ erlang-15.b.2-dfsg/erts/configure.in
-@@ -1888,6 +1888,14 @@
+--- erlang-16.b-dfsg.orig/erts/configure.in
++++ erlang-16.b-dfsg/erts/configure.in
+@@ -1941,6 +1941,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	2013-01-27 17:39:38 UTC (rev 1488)
+++ erlang/branches/experimental/debian/patches/java.patch	2013-02-28 10:28:34 UTC (rev 1489)
@@ -6,9 +6,9 @@
 Forwarded: yes
 Last-updated: Sat, 13 Feb 2010 10:08:42 +0300
 
---- erlang-15.b.2-dfsg.orig/erts/configure.in
-+++ erlang-15.b.2-dfsg/erts/configure.in
-@@ -4381,7 +4381,8 @@
+--- erlang-16.b-dfsg.orig/erts/configure.in
++++ erlang-16.b-dfsg/erts/configure.in
+@@ -4443,7 +4443,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-15.b.2-dfsg.orig/lib/test_server/src/configure.in
-+++ erlang-15.b.2-dfsg/lib/test_server/src/configure.in
+--- erlang-16.b-dfsg.orig/lib/test_server/src/configure.in
++++ erlang-16.b-dfsg/lib/test_server/src/configure.in
 @@ -391,7 +391,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/man.patch
===================================================================
--- erlang/branches/experimental/debian/patches/man.patch	2013-01-27 17:39:38 UTC (rev 1488)
+++ erlang/branches/experimental/debian/patches/man.patch	2013-02-28 10:28:34 UTC (rev 1489)
@@ -4,9 +4,9 @@
 (Erlang manual pages are placed to /usr/share/man/ hierarchy
 as required by Debian policy.)
 
---- erlang-15.b.2-dfsg.orig/erts/etc/common/erlexec.c
-+++ erlang-15.b.2-dfsg/erts/etc/common/erlexec.c
-@@ -714,8 +714,10 @@
+--- erlang-16.b-dfsg.orig/erts/etc/common/erlexec.c
++++ erlang-16.b-dfsg/erts/etc/common/erlexec.c
+@@ -715,8 +715,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	2013-01-27 17:39:38 UTC (rev 1488)
+++ erlang/branches/experimental/debian/patches/powerpc.patch	2013-02-28 10:28:34 UTC (rev 1489)
@@ -2,9 +2,9 @@
 Description: Patch defines HiPE architecture ppc for powerpc arch.
 Last-Modified: Mon, 08 Mar 2010 12:23:16 +0300
 
---- erlang-15.b.2-dfsg.orig/erts/configure.in
-+++ erlang-15.b.2-dfsg/erts/configure.in
-@@ -612,6 +612,7 @@
+--- erlang-16.b-dfsg.orig/erts/configure.in
++++ erlang-16.b-dfsg/erts/configure.in
+@@ -617,6 +617,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	2013-01-27 17:39:38 UTC (rev 1488)
+++ erlang/branches/experimental/debian/patches/rpath.patch	2013-02-28 10:28:34 UTC (rev 1489)
@@ -4,9 +4,9 @@
 Forwarded: no
 Last-modified:Sat, 27 Feb 2010 09:34:43 +0300
 
---- erlang-15.b.2-dfsg.orig/erts/configure.in
-+++ erlang-15.b.2-dfsg/erts/configure.in
-@@ -4239,9 +4239,9 @@
+--- erlang-16.b-dfsg.orig/erts/configure.in
++++ erlang-16.b-dfsg/erts/configure.in
+@@ -4301,9 +4301,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	2013-01-27 17:39:38 UTC (rev 1488)
+++ erlang/branches/experimental/debian/patches/sparc.patch	2013-02-28 10:28:34 UTC (rev 1489)
@@ -5,9 +5,9 @@
 
 (2) Fixes FTBFS(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=328031).
 
---- erlang-15.b.2-dfsg.orig/erts/configure.in
-+++ erlang-15.b.2-dfsg/erts/configure.in
-@@ -601,7 +601,7 @@
+--- erlang-16.b-dfsg.orig/erts/configure.in
++++ erlang-16.b-dfsg/erts/configure.in
+@@ -606,7 +606,7 @@
  fi
  
  case $chk_arch_ in
@@ -16,9 +16,9 @@
      sparc64)	ARCH=sparc64;;
      sun4v)	ARCH=ultrasparc;;
      i86pc)	ARCH=x86;;
---- erlang-15.b.2-dfsg.orig/erts/emulator/beam/beam_emu.c
-+++ erlang-15.b.2-dfsg/erts/emulator/beam/beam_emu.c
-@@ -984,16 +984,6 @@
+--- erlang-16.b-dfsg.orig/erts/emulator/beam/beam_emu.c
++++ erlang-16.b-dfsg/erts/emulator/beam/beam_emu.c
+@@ -966,16 +966,6 @@
   * in registers.
   */
  
@@ -35,7 +35,7 @@
  #  define REG_x0
  #  define REG_xregs
  #  define REG_htop
-@@ -1002,7 +992,6 @@
+@@ -984,7 +974,6 @@
  #  define REG_fcalls
  #  define REG_tmp_arg1
  #  define REG_tmp_arg2

Modified: erlang/branches/experimental/debian/rules
===================================================================
--- erlang/branches/experimental/debian/rules	2013-01-27 17:39:38 UTC (rev 1488)
+++ erlang/branches/experimental/debian/rules	2013-02-28 10:28:34 UTC (rev 1489)
@@ -513,9 +513,9 @@
 
 binary: binary-indep binary-arch
 
-REL=R15B03-1
-RELDIR=R15B03
-DEB_REL=15.b.3.1-dfsg
+REL=R16B
+RELDIR=R16B
+DEB_REL=16.b-dfsg
 
 get-orig-source:
 	CURDIR=`pwd` && TMPDIR=`mktemp -d /tmp/erlang.XXXXXX` && \

More information about the Pkg-erlang-commits mailing list