[Pkg-erlang-commits] r1779 - in erlang/branches/r19rc/debian: . patches

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Wed Jun 15 16:03:07 UTC 2016 

Author: sgolovan
Date: 2016-06-15 16:03:07 +0000 (Wed, 15 Jun 2016)
New Revision: 1779

Modified:
   erlang/branches/r19rc/debian/changelog
   erlang/branches/r19rc/debian/erlang-webtool.manpages
   erlang/branches/r19rc/debian/patches/beamload.patch
   erlang/branches/r19rc/debian/patches/clean.patch
   erlang/branches/r19rc/debian/patches/docs.patch
   erlang/branches/r19rc/debian/patches/emacs.patch
   erlang/branches/r19rc/debian/patches/gnu.patch
   erlang/branches/r19rc/debian/patches/hppa.patch
   erlang/branches/r19rc/debian/patches/java.patch
   erlang/branches/r19rc/debian/patches/man.patch
   erlang/branches/r19rc/debian/patches/series
   erlang/branches/r19rc/debian/patches/sparc.patch
   erlang/branches/r19rc/debian/rules
Log:
[erlang-experimental]
  * New upstream release candidate.
  * Upload to experimental.


Modified: erlang/branches/r19rc/debian/changelog
===================================================================
--- erlang/branches/r19rc/debian/changelog	2016-06-15 12:28:50 UTC (rev 1778)
+++ erlang/branches/r19rc/debian/changelog	2016-06-15 16:03:07 UTC (rev 1779)
@@ -1,3 +1,10 @@
+erlang (1:19.0~rc2+dfsg-1) experimental; urgency=medium
+
+  * New upstream release candidate.
+  * Upload to experimental.
+
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 15 Jun 2016 15:31:10 +0300
+
 erlang (1:18.3.4+dfsg-1) unstable; urgency=medium
 
   * New upstream minor release (closes: #827363).

Modified: erlang/branches/r19rc/debian/erlang-webtool.manpages
===================================================================
--- erlang/branches/r19rc/debian/erlang-webtool.manpages	2016-06-15 12:28:50 UTC (rev 1778)
+++ erlang/branches/r19rc/debian/erlang-webtool.manpages	2016-06-15 16:03:07 UTC (rev 1779)
@@ -1 +1 @@
-debian/erlang-docs/usr/lib/erlang/man/man1/start_webtool.1
+#debian/erlang-docs/usr/lib/erlang/man/man1/start_webtool.1

Modified: erlang/branches/r19rc/debian/patches/beamload.patch
===================================================================
--- erlang/branches/r19rc/debian/patches/beamload.patch	2016-06-15 12:28:50 UTC (rev 1778)
+++ erlang/branches/r19rc/debian/patches/beamload.patch	2016-06-15 16:03:07 UTC (rev 1779)
@@ -4,7 +4,7 @@
 
 --- a/erts/emulator/beam/beam_load.c
 +++ b/erts/emulator/beam/beam_load.c
-@@ -45,7 +45,7 @@
+@@ -46,7 +46,7 @@
  #include "hipe_arch.h"
  #endif
  

Modified: erlang/branches/r19rc/debian/patches/clean.patch
===================================================================
--- erlang/branches/r19rc/debian/patches/clean.patch	2016-06-15 12:28:50 UTC (rev 1778)
+++ erlang/branches/r19rc/debian/patches/clean.patch	2016-06-15 16:03:07 UTC (rev 1779)
@@ -5,7 +5,7 @@
 
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -1093,6 +1093,7 @@
+@@ -1080,6 +1080,7 @@
  	rm -f *~ *.bak config.log config.status prebuilt.files ibin/*
  	cd erts && ERL_TOP=$(ERL_TOP) $(MAKE) clean
  	cd lib  && ERL_TOP=$(ERL_TOP) $(MAKE) clean BUILD_ALL=true
@@ -13,7 +13,7 @@
  
  distclean: clean
  	find . -type f -name SKIP              -print | xargs $(RM)
-@@ -1134,3 +1135,209 @@
+@@ -1121,3 +1122,209 @@
  		|| $(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT) bootstrap_root_clean
  
  # ----------------------------------------------------------------------

Modified: erlang/branches/r19rc/debian/patches/docs.patch
===================================================================
--- erlang/branches/r19rc/debian/patches/docs.patch	2016-06-15 12:28:50 UTC (rev 1778)
+++ erlang/branches/r19rc/debian/patches/docs.patch	2016-06-15 16:03:07 UTC (rev 1779)
@@ -62,8 +62,8 @@
  # Macros
  # ----------------------------------------------------
  
--SUB_DIRECTORIES = c_src src doc/src examples priv emacs
-+SUB_DIRECTORIES = c_src src examples priv emacs doc/src
+-SUB_DIRECTORIES = c_src src doc/src examples emacs
++SUB_DIRECTORIES = c_src src examples emacs doc/src
  
  include vsn.mk
  VSN = $(TOOLS_VSN)

Modified: erlang/branches/r19rc/debian/patches/emacs.patch
===================================================================
--- erlang/branches/r19rc/debian/patches/emacs.patch	2016-06-15 12:28:50 UTC (rev 1778)
+++ erlang/branches/r19rc/debian/patches/emacs.patch	2016-06-15 16:03:07 UTC (rev 1779)
@@ -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
-@@ -1292,23 +1292,22 @@
+@@ -1299,23 +1299,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.
-@@ -2031,7 +2030,7 @@
+@@ -2041,7 +2040,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 '()
-@@ -2042,7 +2041,7 @@
+@@ -2052,7 +2051,7 @@
  
  (defun erlang-man-get-files (dir)
    "Return files in directory DIR."
@@ -62,7 +62,7 @@
  
  
  (defun erlang-man-module (&optional module)
-@@ -2062,7 +2061,7 @@
+@@ -2072,7 +2071,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))
-@@ -2203,9 +2202,9 @@
+@@ -2213,9 +2212,9 @@
      (error nil))
    (if file
        (let ((process-environment (copy-sequence process-environment)))

Modified: erlang/branches/r19rc/debian/patches/gnu.patch
===================================================================
--- erlang/branches/r19rc/debian/patches/gnu.patch	2016-06-15 12:28:50 UTC (rev 1778)
+++ erlang/branches/r19rc/debian/patches/gnu.patch	2016-06-15 16:03:07 UTC (rev 1779)
@@ -13,7 +13,7 @@
 
 --- a/erts/configure.in
 +++ b/erts/configure.in
-@@ -464,7 +464,7 @@
+@@ -415,7 +415,7 @@
  
  dnl NOTE: CPPFLAGS will be included in CFLAGS at the end
  case $host_os in
@@ -22,10 +22,10 @@
      win32)
  	# The ethread library requires _WIN32_WINNT of at least 0x0403.
  	# -D_WIN32_WINNT=* from CPPFLAGS is saved in ETHR_DEFS.
-@@ -1339,7 +1339,7 @@
- 	    solaris*)
- 		enable_child_waiter_thread=yes
- 		;;
+@@ -1245,7 +1245,7 @@
+ 	fi
+ 
+ 	case $host_os in
 -	    linux*)
 +	    linux*|*gnu*)
  		AC_MSG_CHECKING([whether dlopen() needs to be called before first call to dlerror()])
@@ -47,10 +47,10 @@
  #include <sys/sysctl.h>
 --- a/erts/emulator/drivers/common/inet_drv.c
 +++ b/erts/emulator/drivers/common/inet_drv.c
-@@ -723,6 +723,11 @@
- 			     (((unsigned char*) (s))[1] << 8) | \
- 			     (((unsigned char*) (s))[0]))
- 
+@@ -607,6 +607,11 @@
+     for (i = 0;  i < n;  i++) if (s[i] != '\0') return !0;
+     return 0;
+ }
 +#ifdef __GNU__
 +#warning "Undefined AF_LINK for GNU/Hurd"
 +#undef AF_LINK
@@ -61,7 +61,7 @@
  #  include <valgrind/memcheck.h>   
 --- a/erts/etc/common/erlexec.c
 +++ b/erts/etc/common/erlexec.c
-@@ -1581,7 +1581,7 @@
+@@ -1606,7 +1606,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';
  	
-@@ -1595,7 +1595,7 @@
+@@ -1620,7 +1620,7 @@
      if (!rootdir) {
  	/* Determine rootdir from absolute path to bindir */
  	char *p;

Modified: erlang/branches/r19rc/debian/patches/hppa.patch
===================================================================
--- erlang/branches/r19rc/debian/patches/hppa.patch	2016-06-15 12:28:50 UTC (rev 1778)
+++ erlang/branches/r19rc/debian/patches/hppa.patch	2016-06-15 16:03:07 UTC (rev 1779)
@@ -8,7 +8,7 @@
 
 --- a/erts/configure.in
 +++ b/erts/configure.in
-@@ -2184,6 +2184,14 @@
+@@ -2062,6 +2062,14 @@
  AC_CHECK_DECLS([posix2time, time2posix],,,[#include <time.h>])
  
  disable_vfork=false

Modified: erlang/branches/r19rc/debian/patches/java.patch
===================================================================
--- erlang/branches/r19rc/debian/patches/java.patch	2016-06-15 12:28:50 UTC (rev 1778)
+++ erlang/branches/r19rc/debian/patches/java.patch	2016-06-15 16:03:07 UTC (rev 1779)
@@ -8,7 +8,7 @@
 
 --- a/erts/configure.in
 +++ b/erts/configure.in
-@@ -4761,7 +4761,8 @@
+@@ -4648,7 +4648,8 @@
    dnl Make sure it's at least JDK 1.6
    AC_CACHE_CHECK(for JDK version 1.6, 
       ac_cv_prog_javac_ver_1_6,
@@ -18,15 +18,3 @@
          ac_cv_prog_javac_ver_1_6=yes, ac_cv_prog_javac_ver_1_6=no)])
    if test $ac_cv_prog_javac_ver_1_6 = no; then
      unset -v JAVAC
---- a/lib/test_server/src/configure.in
-+++ b/lib/test_server/src/configure.in
-@@ -485,7 +485,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,
--     [ERL_TRY_LINK_JAVA([], [for (String i : args);],
-+     [ERL_TRY_LINK_JAVA([], [for (String i : args);
-+        int[] values = {}; String s = new String(values, 0, values.length);],
-         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

Modified: erlang/branches/r19rc/debian/patches/man.patch
===================================================================
--- erlang/branches/r19rc/debian/patches/man.patch	2016-06-15 12:28:50 UTC (rev 1778)
+++ erlang/branches/r19rc/debian/patches/man.patch	2016-06-15 16:03:07 UTC (rev 1779)
@@ -6,7 +6,7 @@
 
 --- a/erts/etc/common/erlexec.c
 +++ b/erts/etc/common/erlexec.c
-@@ -728,8 +728,10 @@
+@@ -737,8 +737,10 @@
  			error("-man not supported on Windows");
  #else
  			argv[i] = "man";

Modified: erlang/branches/r19rc/debian/patches/series
===================================================================
--- erlang/branches/r19rc/debian/patches/series	2016-06-15 12:28:50 UTC (rev 1778)
+++ erlang/branches/r19rc/debian/patches/series	2016-06-15 16:03:07 UTC (rev 1779)
@@ -9,5 +9,4 @@
 javascript.patch
 wx3.0-constants.patch
 beamload.patch
-reproducible-build.patch
 x32.patch

Modified: erlang/branches/r19rc/debian/patches/sparc.patch
===================================================================
--- erlang/branches/r19rc/debian/patches/sparc.patch	2016-06-15 12:28:50 UTC (rev 1778)
+++ erlang/branches/r19rc/debian/patches/sparc.patch	2016-06-15 16:03:07 UTC (rev 1779)
@@ -7,7 +7,7 @@
 
 --- a/erts/configure.in
 +++ b/erts/configure.in
-@@ -645,7 +645,7 @@
+@@ -594,7 +594,7 @@
  fi
  
  case $chk_arch_ in
@@ -18,27 +18,22 @@
      i86pc)	ARCH=x86;;
 --- a/erts/emulator/beam/beam_emu.c
 +++ b/erts/emulator/beam/beam_emu.c
-@@ -997,16 +997,6 @@
+@@ -1086,19 +1086,11 @@
   * in registers.
   */
  
 -#if defined(__GNUC__) && defined(sparc) && !defined(DEBUG)
--#  define REG_x0 asm("%l0")
 -#  define REG_xregs asm("%l1")
 -#  define REG_htop asm("%l2")
 -#  define REG_stop asm("%l3")
 -#  define REG_I asm("%l4")
 -#  define REG_fcalls asm("%l5")
--#  define REG_tmp_arg1 asm("%l6")
--#  define REG_tmp_arg2 asm("%l7")
 -#else
- #  define REG_x0
  #  define REG_xregs
  #  define REG_htop
-@@ -1015,7 +1005,6 @@
+ #  define REG_stop
+ #  define REG_I
  #  define REG_fcalls
- #  define REG_tmp_arg1
- #  define REG_tmp_arg2
 -#endif
  
  #ifdef USE_VM_PROBES

Modified: erlang/branches/r19rc/debian/rules
===================================================================
--- erlang/branches/r19rc/debian/rules	2016-06-15 12:28:50 UTC (rev 1778)
+++ erlang/branches/r19rc/debian/rules	2016-06-15 16:03:07 UTC (rev 1779)
@@ -501,9 +501,9 @@
 
 binary: binary-indep binary-arch
 
-REL=18.3.4
+REL=19.0-rc2
 RELDIR=$(REL)
-DEB_REL=$(REL)+dfsg
+DEB_REL=19.0~rc2+dfsg
 
 get-orig-source:
 	CURDIR=`pwd` && TMPDIR=`mktemp -d /tmp/erlang.XXXXXX` && \

More information about the Pkg-erlang-commits mailing list