[Pkg-erlang-commits] r1641 - in erlang/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Thu Jun 26 07:19:48 UTC 2014
Author: sgolovan
Date: 2014-06-26 07:19:48 +0000 (Thu, 26 Jun 2014)
New Revision: 1641
Removed:
erlang/trunk/debian/patches/powerpc.patch
Modified:
erlang/trunk/debian/changelog
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/rpath.patch
erlang/trunk/debian/patches/series
erlang/trunk/debian/patches/sparc.patch
erlang/trunk/debian/rules
Log:
[erlang]
* New upstream release.
* Removed patch which defines HiPE architecture for powerpc because it
has been applied upstream.
Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog 2014-06-25 09:39:26 UTC (rev 1640)
+++ erlang/trunk/debian/changelog 2014-06-26 07:19:48 UTC (rev 1641)
@@ -1,8 +1,10 @@
-erlang (1:17.0-dfsg-4) UNRELEASED; urgency=low
+erlang (1:17.1-dfsg-1) unstable; urgency=low
- * NOT RELEASED YET
+ * New upstream release.
+ * Removed patch which defines HiPE architecture for powerpc because it
+ has been applied upstream.
- -- Sergei Golovan <sgolovan at debian.org> Wed, 07 May 2014 11:38:48 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Thu, 26 Jun 2014 09:43:41 +0400
erlang (1:17.0-dfsg-3) unstable; urgency=low
Modified: erlang/trunk/debian/patches/emacs.patch
===================================================================
--- erlang/trunk/debian/patches/emacs.patch 2014-06-25 09:39:26 UTC (rev 1640)
+++ erlang/trunk/debian/patches/emacs.patch 2014-06-26 07:19:48 UTC (rev 1641)
@@ -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
-@@ -1287,23 +1287,22 @@
+@@ -1285,23 +1285,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.
-@@ -2026,7 +2025,7 @@
+@@ -2024,7 +2023,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 '()
-@@ -2037,7 +2036,7 @@
+@@ -2035,7 +2034,7 @@
(defun erlang-man-get-files (dir)
"Return files in directory DIR."
@@ -62,7 +62,7 @@
(defun erlang-man-module (&optional module)
-@@ -2057,7 +2056,7 @@
+@@ -2055,7 +2054,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))
-@@ -2198,9 +2197,9 @@
+@@ -2196,9 +2195,9 @@
(error nil))
(if file
(let ((process-environment (copy-sequence process-environment)))
Modified: erlang/trunk/debian/patches/gnu.patch
===================================================================
--- erlang/trunk/debian/patches/gnu.patch 2014-06-25 09:39:26 UTC (rev 1640)
+++ erlang/trunk/debian/patches/gnu.patch 2014-06-26 07:19:48 UTC (rev 1641)
@@ -13,7 +13,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -479,7 +479,7 @@
+@@ -481,7 +481,7 @@
dnl NOTE: CPPFLAGS will be included in CFLAGS at the end
case $host_os in
@@ -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.
-@@ -1331,7 +1331,7 @@
+@@ -1334,7 +1334,7 @@
solaris*)
enable_child_waiter_thread=yes
;;
Modified: erlang/trunk/debian/patches/hppa.patch
===================================================================
--- erlang/trunk/debian/patches/hppa.patch 2014-06-25 09:39:26 UTC (rev 1640)
+++ erlang/trunk/debian/patches/hppa.patch 2014-06-26 07:19:48 UTC (rev 1641)
@@ -8,7 +8,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -2135,6 +2135,14 @@
+@@ -2160,6 +2160,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 2014-06-25 09:39:26 UTC (rev 1640)
+++ erlang/trunk/debian/patches/java.patch 2014-06-26 07:19:48 UTC (rev 1641)
@@ -8,7 +8,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -4667,7 +4667,8 @@
+@@ -4682,7 +4682,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,
Deleted: erlang/trunk/debian/patches/powerpc.patch
===================================================================
--- erlang/trunk/debian/patches/powerpc.patch 2014-06-25 09:39:26 UTC (rev 1640)
+++ erlang/trunk/debian/patches/powerpc.patch 2014-06-26 07:19:48 UTC (rev 1641)
@@ -1,14 +0,0 @@
-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
-
---- a/erts/configure.in
-+++ b/erts/configure.in
-@@ -671,6 +671,7 @@
- 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 2014-06-25 09:39:26 UTC (rev 1640)
+++ erlang/trunk/debian/patches/rpath.patch 2014-06-26 07:19:48 UTC (rev 1641)
@@ -6,7 +6,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -4525,9 +4525,9 @@
+@@ -4540,9 +4540,9 @@
SSL_CC_RUNTIME_LIBRARY_PATH=
SSL_LD_RUNTIME_LIBRARY_PATH=
SSL_DED_LD_RUNTIME_LIBRARY_PATH=
Modified: erlang/trunk/debian/patches/series
===================================================================
--- erlang/trunk/debian/patches/series 2014-06-25 09:39:26 UTC (rev 1640)
+++ erlang/trunk/debian/patches/series 2014-06-26 07:19:48 UTC (rev 1641)
@@ -7,5 +7,4 @@
docs.patch
java.patch
hppa.patch
-powerpc.patch
javascript.patch
Modified: erlang/trunk/debian/patches/sparc.patch
===================================================================
--- erlang/trunk/debian/patches/sparc.patch 2014-06-25 09:39:26 UTC (rev 1640)
+++ erlang/trunk/debian/patches/sparc.patch 2014-06-26 07:19:48 UTC (rev 1641)
@@ -7,7 +7,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -660,7 +660,7 @@
+@@ -662,7 +662,7 @@
fi
case $chk_arch_ in
Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules 2014-06-25 09:39:26 UTC (rev 1640)
+++ erlang/trunk/debian/rules 2014-06-26 07:19:48 UTC (rev 1641)
@@ -489,7 +489,7 @@
binary: binary-indep binary-arch
-REL=17.0
+REL=17.1
RELDIR=$(REL)
DEB_REL=$(REL)-dfsg
More information about the Pkg-erlang-commits
mailing list