[Pkg-erlang-commits] r1573 - in erlang/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Thu Dec 12 08:05:46 UTC 2013
Author: sgolovan
Date: 2013-12-12 08:05:46 +0000 (Thu, 12 Dec 2013)
New Revision: 1573
Removed:
erlang/trunk/debian/patches/wx3.patch
Modified:
erlang/trunk/debian/changelog
erlang/trunk/debian/erlang-diameter.links.in
erlang/trunk/debian/erlang-diameter.manpages
erlang/trunk/debian/patches/clean.patch
erlang/trunk/debian/patches/docs.patch
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/man.patch
erlang/trunk/debian/patches/powerpc.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.
* Refreshed patches.
* Removed patch wich fixes segfault in erlang-wx because it is applied
upstream.
* Removed link diameterc.1.gz because the original manpage is renamed
from diameter-compile.1.gz to diameterc.1.gz.
Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog 2013-11-23 09:58:03 UTC (rev 1572)
+++ erlang/trunk/debian/changelog 2013-12-12 08:05:46 UTC (rev 1573)
@@ -1,8 +1,13 @@
-erlang (1:16.b.2-dfsg-3) UNRELEASED; urgency=low
+erlang (1:16.b.3-dfsg-1) unstable; urgency=low
- * NOT RELEASED YET
+ * New upstream release.
+ * Refreshed patches.
+ * Removed patch wich fixes segfault in erlang-wx because it is applied
+ upstream.
+ * Removed link diameterc.1.gz because the original manpage is renamed
+ from diameter-compile.1.gz to diameterc.1.gz.
- -- Sergei Golovan <sgolovan at debian.org> Fri, 22 Nov 2013 20:06:28 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Thu, 12 Dec 2013 12:03:35 +0400
erlang (1:16.b.2-dfsg-2) unstable; urgency=low
Modified: erlang/trunk/debian/erlang-diameter.links.in
===================================================================
--- erlang/trunk/debian/erlang-diameter.links.in 2013-11-23 09:58:03 UTC (rev 1572)
+++ erlang/trunk/debian/erlang-diameter.links.in 2013-12-12 08:05:46 UTC (rev 1573)
@@ -1,2 +1 @@
usr/lib/erlang/lib/diameter- at DIAMETER_VSN@/bin/diameterc usr/bin/diameterc
-usr/share/man/man1/diameter_compile.1.gz usr/share/man/man1/diameterc.1.gz
Modified: erlang/trunk/debian/erlang-diameter.manpages
===================================================================
--- erlang/trunk/debian/erlang-diameter.manpages 2013-11-23 09:58:03 UTC (rev 1572)
+++ erlang/trunk/debian/erlang-diameter.manpages 2013-12-12 08:05:46 UTC (rev 1573)
@@ -1 +1 @@
-debian/erlang-docs/usr/lib/erlang/man/man1/diameter_compile.1
+debian/erlang-docs/usr/lib/erlang/man/man1/diameterc.1
Modified: erlang/trunk/debian/patches/clean.patch
===================================================================
--- erlang/trunk/debian/patches/clean.patch 2013-11-23 09:58:03 UTC (rev 1572)
+++ erlang/trunk/debian/patches/clean.patch 2013-12-12 08:05:46 UTC (rev 1573)
@@ -3,8 +3,8 @@
Erlang leaves many files after make clean. This patch contains
a hack to remove them.
---- erlang-16.b.2-dfsg.orig/Makefile.in
-+++ erlang-16.b.2-dfsg/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
@@ -995,6 +995,7 @@
find . -type f -name SKIP -print | xargs $(RM)
cd erts && ERL_TOP=$(ERL_TOP) $(MAKE) clean
Modified: erlang/trunk/debian/patches/docs.patch
===================================================================
--- erlang/trunk/debian/patches/docs.patch 2013-11-23 09:58:03 UTC (rev 1572)
+++ erlang/trunk/debian/patches/docs.patch 2013-12-12 08:05:46 UTC (rev 1573)
@@ -3,8 +3,8 @@
and a few bugs with docs installation.
Last-modified: Thu, 09 Dec 2010 10:45:56 +0300
---- erlang-16.b.2-dfsg.orig/lib/erl_docgen/priv/xsl/db_man.xsl
-+++ erlang-16.b.2-dfsg/lib/erl_docgen/priv/xsl/db_man.xsl
+--- a/lib/erl_docgen/priv/xsl/db_man.xsl
++++ b/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-16.b.2-dfsg.orig/lib/megaco/doc/src/Makefile
-+++ erlang-16.b.2-dfsg/lib/megaco/doc/src/Makefile
+--- a/lib/megaco/doc/src/Makefile
++++ b/lib/megaco/doc/src/Makefile
@@ -169,8 +169,6 @@
$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
@@ -34,8 +34,8 @@
release_spec:
---- erlang-16.b.2-dfsg.orig/lib/stdlib/doc/src/re.xml
-+++ erlang-16.b.2-dfsg/lib/stdlib/doc/src/re.xml
+--- a/lib/stdlib/doc/src/re.xml
++++ b/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
@@ -56,8 +56,8 @@
<tag><c>{offset, integer() >= 0}</c></tag>
---- erlang-16.b.2-dfsg.orig/lib/tools/Makefile
-+++ erlang-16.b.2-dfsg/lib/tools/Makefile
+--- a/lib/tools/Makefile
++++ b/lib/tools/Makefile
@@ -23,7 +23,7 @@
# Macros
# ----------------------------------------------------
Modified: erlang/trunk/debian/patches/emacs.patch
===================================================================
--- erlang/trunk/debian/patches/emacs.patch 2013-11-23 09:58:03 UTC (rev 1572)
+++ erlang/trunk/debian/patches/emacs.patch 2013-12-12 08:05:46 UTC (rev 1573)
@@ -3,8 +3,8 @@
Also, it fixes manpage name regexp matching only 3erl manpages in
section 3.
---- erlang-16.b.2-dfsg.orig/lib/tools/emacs/erlang.el
-+++ erlang-16.b.2-dfsg/lib/tools/emacs/erlang.el
+--- a/lib/tools/emacs/erlang.el
++++ b/lib/tools/emacs/erlang.el
@@ -495,8 +495,8 @@
(defvar erlang-man-dirs
'(("Man - Commands" "/man/man1" 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
-@@ -1280,23 +1280,22 @@
+@@ -1282,23 +1282,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.
-@@ -2015,7 +2014,7 @@
+@@ -2017,7 +2016,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 '()
-@@ -2026,7 +2025,7 @@
+@@ -2028,7 +2027,7 @@
(defun erlang-man-get-files (dir)
"Return files in directory DIR."
@@ -62,7 +62,7 @@
(defun erlang-man-module (&optional module)
-@@ -2046,7 +2045,7 @@
+@@ -2048,7 +2047,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))
-@@ -2187,9 +2186,9 @@
+@@ -2189,9 +2188,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 2013-11-23 09:58:03 UTC (rev 1572)
+++ erlang/trunk/debian/patches/gnu.patch 2013-12-12 08:05:46 UTC (rev 1573)
@@ -11,9 +11,9 @@
(4) Switch some PATH_MAX occurrences to MAXPATHLEN;
---- erlang-16.b.2-dfsg.orig/erts/configure.in
-+++ erlang-16.b.2-dfsg/erts/configure.in
-@@ -433,7 +433,7 @@
+--- a/erts/configure.in
++++ b/erts/configure.in
+@@ -420,7 +420,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.
-@@ -1248,7 +1248,7 @@
+@@ -1235,7 +1235,7 @@
solaris*)
enable_child_waiter_thread=yes
;;
@@ -31,8 +31,8 @@
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-16.b.2-dfsg.orig/lib/os_mon/c_src/memsup.c
-+++ erlang-16.b.2-dfsg/lib/os_mon/c_src/memsup.c
+--- a/lib/os_mon/c_src/memsup.c
++++ b/lib/os_mon/c_src/memsup.c
@@ -98,6 +98,11 @@
#include <time.h>
#include <errno.h>
@@ -45,9 +45,9 @@
#ifdef BSD4_4
#include <sys/types.h>
#include <sys/sysctl.h>
---- erlang-16.b.2-dfsg.orig/erts/emulator/drivers/common/inet_drv.c
-+++ erlang-16.b.2-dfsg/erts/emulator/drivers/common/inet_drv.c
-@@ -519,6 +519,11 @@
+--- a/erts/emulator/drivers/common/inet_drv.c
++++ b/erts/emulator/drivers/common/inet_drv.c
+@@ -550,6 +550,11 @@
inet_driver_select((d)->port, (ErlDrvEvent)(long)(d)->event, (flags), (onoff)); \
} while(0)
@@ -59,9 +59,9 @@
#endif /* #ifdef __WIN32__ #else */
---- erlang-16.b.2-dfsg.orig/erts/etc/common/erlexec.c
-+++ erlang-16.b.2-dfsg/erts/etc/common/erlexec.c
-@@ -1540,7 +1540,7 @@
+--- a/erts/etc/common/erlexec.c
++++ b/erts/etc/common/erlexec.c
+@@ -1546,7 +1546,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';
-@@ -1554,7 +1554,7 @@
+@@ -1560,7 +1560,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-16.b.2-dfsg.orig/erts/etc/common/escript.c
-+++ erlang-16.b.2-dfsg/erts/etc/common/escript.c
+--- a/erts/etc/common/escript.c
++++ b/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-16.b.2-dfsg.orig/erts/etc/unix/dyn_erl.c
-+++ erlang-16.b.2-dfsg/erts/etc/unix/dyn_erl.c
+--- a/erts/etc/unix/dyn_erl.c
++++ b/erts/etc/unix/dyn_erl.c
@@ -149,8 +149,8 @@
static char *
find_prog(char *origpath)
Modified: erlang/trunk/debian/patches/hppa.patch
===================================================================
--- erlang/trunk/debian/patches/hppa.patch 2013-11-23 09:58:03 UTC (rev 1572)
+++ erlang/trunk/debian/patches/hppa.patch 2013-12-12 08:05:46 UTC (rev 1573)
@@ -6,9 +6,9 @@
Forwarded: no
Last-updated: Mon, 22 Feb 2010 10:34:34 +0300
---- erlang-16.b.2-dfsg.orig/erts/configure.in
-+++ erlang-16.b.2-dfsg/erts/configure.in
-@@ -1991,6 +1991,14 @@
+--- a/erts/configure.in
++++ b/erts/configure.in
+@@ -2006,6 +2006,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 2013-11-23 09:58:03 UTC (rev 1572)
+++ erlang/trunk/debian/patches/java.patch 2013-12-12 08:05:46 UTC (rev 1573)
@@ -6,9 +6,9 @@
Forwarded: yes
Last-updated: Sat, 13 Feb 2010 10:08:42 +0300
---- erlang-16.b.2-dfsg.orig/erts/configure.in
-+++ erlang-16.b.2-dfsg/erts/configure.in
-@@ -4490,7 +4490,8 @@
+--- a/erts/configure.in
++++ b/erts/configure.in
+@@ -4505,7 +4505,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-16.b.2-dfsg.orig/lib/test_server/src/configure.in
-+++ erlang-16.b.2-dfsg/lib/test_server/src/configure.in
+--- a/lib/test_server/src/configure.in
++++ b/lib/test_server/src/configure.in
@@ -392,7 +392,8 @@
dnl Make sure it's at least JDK 1.5
AC_CACHE_CHECK(for JDK version 1.5,
Modified: erlang/trunk/debian/patches/man.patch
===================================================================
--- erlang/trunk/debian/patches/man.patch 2013-11-23 09:58:03 UTC (rev 1572)
+++ erlang/trunk/debian/patches/man.patch 2013-12-12 08:05:46 UTC (rev 1573)
@@ -4,9 +4,9 @@
(Erlang manual pages are placed to /usr/share/man/ hierarchy
as required by Debian policy.)
---- erlang-16.b.2-dfsg.orig/erts/etc/common/erlexec.c
-+++ erlang-16.b.2-dfsg/erts/etc/common/erlexec.c
-@@ -715,8 +715,10 @@
+--- a/erts/etc/common/erlexec.c
++++ b/erts/etc/common/erlexec.c
+@@ -721,8 +721,10 @@
error("-man not supported on Windows");
#else
argv[i] = "man";
Modified: erlang/trunk/debian/patches/powerpc.patch
===================================================================
--- erlang/trunk/debian/patches/powerpc.patch 2013-11-23 09:58:03 UTC (rev 1572)
+++ erlang/trunk/debian/patches/powerpc.patch 2013-12-12 08:05:46 UTC (rev 1573)
@@ -2,9 +2,9 @@
Description: Patch defines HiPE architecture ppc for powerpc arch.
Last-Modified: Mon, 08 Mar 2010 12:23:16 +0300
---- erlang-16.b.2-dfsg.orig/erts/configure.in
-+++ erlang-16.b.2-dfsg/erts/configure.in
-@@ -625,6 +625,7 @@
+--- a/erts/configure.in
++++ b/erts/configure.in
+@@ -612,6 +612,7 @@
x86_64) ARCH=amd64;;
amd64) ARCH=amd64;;
macppc) ARCH=ppc;;
Modified: erlang/trunk/debian/patches/rpath.patch
===================================================================
--- erlang/trunk/debian/patches/rpath.patch 2013-11-23 09:58:03 UTC (rev 1572)
+++ erlang/trunk/debian/patches/rpath.patch 2013-12-12 08:05:46 UTC (rev 1573)
@@ -4,9 +4,9 @@
Forwarded: no
Last-modified:Sat, 27 Feb 2010 09:34:43 +0300
---- erlang-16.b.2-dfsg.orig/erts/configure.in
-+++ erlang-16.b.2-dfsg/erts/configure.in
-@@ -4348,9 +4348,9 @@
+--- a/erts/configure.in
++++ b/erts/configure.in
+@@ -4363,9 +4363,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 2013-11-23 09:58:03 UTC (rev 1572)
+++ erlang/trunk/debian/patches/series 2013-12-12 08:05:46 UTC (rev 1573)
@@ -8,4 +8,3 @@
java.patch
hppa.patch
powerpc.patch
-wx3.patch
Modified: erlang/trunk/debian/patches/sparc.patch
===================================================================
--- erlang/trunk/debian/patches/sparc.patch 2013-11-23 09:58:03 UTC (rev 1572)
+++ erlang/trunk/debian/patches/sparc.patch 2013-12-12 08:05:46 UTC (rev 1573)
@@ -5,9 +5,9 @@
(2) Fixes FTBFS(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=328031).
---- erlang-16.b.2-dfsg.orig/erts/configure.in
-+++ erlang-16.b.2-dfsg/erts/configure.in
-@@ -614,7 +614,7 @@
+--- a/erts/configure.in
++++ b/erts/configure.in
+@@ -601,7 +601,7 @@
fi
case $chk_arch_ in
@@ -16,8 +16,8 @@
sparc64) ARCH=sparc64;;
sun4v) ARCH=ultrasparc;;
i86pc) ARCH=x86;;
---- erlang-16.b.2-dfsg.orig/erts/emulator/beam/beam_emu.c
-+++ erlang-16.b.2-dfsg/erts/emulator/beam/beam_emu.c
+--- a/erts/emulator/beam/beam_emu.c
++++ b/erts/emulator/beam/beam_emu.c
@@ -967,16 +967,6 @@
* in registers.
*/
Deleted: erlang/trunk/debian/patches/wx3.patch
===================================================================
--- erlang/trunk/debian/patches/wx3.patch 2013-11-23 09:58:03 UTC (rev 1572)
+++ erlang/trunk/debian/patches/wx3.patch 2013-12-12 08:05:46 UTC (rev 1573)
@@ -1,18 +0,0 @@
-Author: Sergei Golovan
-Description: Patch removes the second argument from wxItemContainer::Set call
- effectively replacing wxClientData_Void type by wxClientData_None. This fixes
- setting items list with wxWidgets 3.0.
-Last-Modified: Thu, 21 Nov 2013 11:42:23 +0400
-Forwarded: yes
-
---- erlang-16.b.2-dfsg.orig/lib/wx/c_src/gen/wxe_funcs.cpp
-+++ erlang-16.b.2-dfsg/lib/wx/c_src/gen/wxe_funcs.cpp
-@@ -15137,7 +15137,7 @@
- }
- bp += (8-((0+ itemsASz) & 7 )) & 7;
- if(!This) throw wxe_badarg(0);
-- This->Set(items,(void **) NULL);
-+ This->Set(items);
- break;
- }
- case wxListBox_HitTest: { // wxListBox::HitTest
Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules 2013-11-23 09:58:03 UTC (rev 1572)
+++ erlang/trunk/debian/rules 2013-12-12 08:05:46 UTC (rev 1573)
@@ -489,9 +489,9 @@
binary: binary-indep binary-arch
-REL=R16B02
-RELDIR=R16B02
-DEB_REL=16.b.2-dfsg
+REL=R16B03
+RELDIR=R16B03
+DEB_REL=16.b.3-dfsg
get-orig-source:
CURDIR=`pwd` && TMPDIR=`mktemp -d /tmp/erlang.XXXXXX` && \
More information about the Pkg-erlang-commits
mailing list