[Pkg-erlang-commits] r1952 - in erlang/trunk/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2017-10-04 13:16:04 +0000 (Wed, 04 Oct 2017)
New Revision: 1952

Modified:
   erlang/trunk/debian/changelog
   erlang/trunk/debian/patches/beamload.patch
   erlang/trunk/debian/patches/emacs.patch
   erlang/trunk/debian/patches/hppa.patch
   erlang/trunk/debian/patches/java.patch
   erlang/trunk/debian/patches/sparc.patch
   erlang/trunk/debian/rules
Log:
[erlang]
  * New upstream bugfix release.
  * Refreshed patches.


Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog	2017-08-28 10:50:45 UTC (rev 1951)
+++ erlang/trunk/debian/changelog	2017-10-04 13:16:04 UTC (rev 1952)
@@ -1,8 +1,9 @@
-erlang (1:20.0.4+dfsg-2) UNRELEASED; urgency=medium
+erlang (1:20.1.1+dfsg-1) unstable; urgency=medium
 
-  * NOT RELEASED YET
+  * New upstream bugfix release.
+  * Refreshed patches.
 
- -- Sergei Golovan <sgolovan at debian.org>  Mon, 28 Aug 2017 13:50:44 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 04 Oct 2017 15:55:03 +0300
 
 erlang (1:20.0.4+dfsg-1) unstable; urgency=medium
 

Modified: erlang/trunk/debian/patches/beamload.patch
===================================================================
--- erlang/trunk/debian/patches/beamload.patch	2017-08-28 10:50:45 UTC (rev 1951)
+++ erlang/trunk/debian/patches/beamload.patch	2017-10-04 13:16:04 UTC (rev 1952)
@@ -5,7 +5,7 @@
 
 --- a/erts/emulator/Makefile.in
 +++ b/erts/emulator/Makefile.in
-@@ -680,6 +680,7 @@
+@@ -681,6 +681,7 @@
  COMMON_INCLUDES += -Ipcre -Ihipe
  COMMON_INCLUDES += -I../include -I../include/$(TARGET)
  COMMON_INCLUDES += -I../include/internal -I../include/internal/$(TARGET)

Modified: erlang/trunk/debian/patches/emacs.patch
===================================================================
--- erlang/trunk/debian/patches/emacs.patch	2017-08-28 10:50:45 UTC (rev 1951)
+++ erlang/trunk/debian/patches/emacs.patch	2017-10-04 13:16:04 UTC (rev 1952)
@@ -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
-@@ -1967,7 +1967,7 @@
+@@ -1955,7 +1955,7 @@
  
  (defun erlang-man-make-menu-item (file)
    "Create a menu item containing the name of the man page."
@@ -25,7 +25,7 @@
         (let ((page (substring file (match-beginning 1) (match-end 1))))
           (list (capitalize page)
                 (list 'lambda '()
-@@ -1978,7 +1978,7 @@
+@@ -1966,7 +1966,7 @@
  
  (defun erlang-man-get-files (dir)
    "Return files in directory DIR."
@@ -34,7 +34,7 @@
  
  
  (defun erlang-man-module (&optional module)
-@@ -2000,7 +2000,7 @@
+@@ -1988,7 +1988,7 @@
      (error "No Erlang module name given"))
    (let ((dir-list erlang-man-dirs)
          (pat (concat "/" (regexp-quote module)
@@ -43,7 +43,7 @@
          (file nil)
          file-list)
      (while (and dir-list (null file))
-@@ -2133,7 +2133,7 @@
+@@ -2115,7 +2115,7 @@
                  (message "Could not find function `%s'" func)))))))
  
  (defvar erlang-man-file-regexp
@@ -52,7 +52,7 @@
  
  (defun erlang-man-display (file)
    "Display FILE as a `man' file.
-@@ -2145,7 +2145,7 @@
+@@ -2127,7 +2127,7 @@
        (let ((process-environment (copy-sequence process-environment)))
          (if (string-match erlang-man-file-regexp file)
              (let ((dir (substring file (match-beginning 1) (match-end 1)))

Modified: erlang/trunk/debian/patches/hppa.patch
===================================================================
--- erlang/trunk/debian/patches/hppa.patch	2017-08-28 10:50:45 UTC (rev 1951)
+++ erlang/trunk/debian/patches/hppa.patch	2017-10-04 13:16:04 UTC (rev 1952)
@@ -8,7 +8,7 @@
 
 --- a/erts/configure.in
 +++ b/erts/configure.in
-@@ -2215,6 +2215,14 @@
+@@ -2217,6 +2217,14 @@
  AC_CHECK_DECLS([posix2time, time2posix],,,[#include <time.h>])
  
  disable_vfork=false

Modified: erlang/trunk/debian/patches/java.patch
===================================================================
--- erlang/trunk/debian/patches/java.patch	2017-08-28 10:50:45 UTC (rev 1951)
+++ erlang/trunk/debian/patches/java.patch	2017-10-04 13:16:04 UTC (rev 1952)
@@ -8,7 +8,7 @@
 
 --- a/erts/configure.in
 +++ b/erts/configure.in
-@@ -4851,7 +4851,8 @@
+@@ -4853,7 +4853,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,

Modified: erlang/trunk/debian/patches/sparc.patch
===================================================================
--- erlang/trunk/debian/patches/sparc.patch	2017-08-28 10:50:45 UTC (rev 1951)
+++ erlang/trunk/debian/patches/sparc.patch	2017-10-04 13:16:04 UTC (rev 1952)
@@ -18,7 +18,7 @@
      i86pc)	ARCH=x86;;
 --- a/erts/emulator/beam/beam_emu.c
 +++ b/erts/emulator/beam/beam_emu.c
-@@ -1109,19 +1109,11 @@
+@@ -1105,19 +1105,11 @@
   * in registers.
   */
  

Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules	2017-08-28 10:50:45 UTC (rev 1951)
+++ erlang/trunk/debian/rules	2017-10-04 13:16:04 UTC (rev 1952)
@@ -501,7 +501,7 @@
 
 binary: binary-indep binary-arch
 
-REL=20.0.4
+REL=20.1.1
 DEB_REL=$(REL)+dfsg
 
 get-orig-source: