[Pkg-erlang-commits] r1358 - in erlang/trunk/debian: . lintian manpages patches patterns scripts
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Wed Dec 14 20:28:11 UTC 2011
Author: sgolovan
Date: 2011-12-14 20:28:11 +0000 (Wed, 14 Dec 2011)
New Revision: 1358
Removed:
erlang/trunk/debian/lintian/erlang-docbuilder.lintian-overrides
erlang/trunk/debian/patches/native.patch
erlang/trunk/debian/patches/ssl.patch
erlang/trunk/debian/patterns/erlang-docbuilder.patterns
Modified:
erlang/trunk/debian/changelog
erlang/trunk/debian/control
erlang/trunk/debian/manpages/erlang-depends.1
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/m68k.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/patterns/erlang-src.patterns
erlang/trunk/debian/rules
erlang/trunk/debian/scripts/analyse
Log:
[erlang]
* New upstream release.
* Removed SSL patch because the old SSL implementation is removed from
the upstream distribution.
* Removed never used patch which added native code to erlang beam files.
* Removed the erlang-docbuilder binary package because the docbuilder
application was dropped by upstream.
Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog 2011-12-04 16:33:50 UTC (rev 1357)
+++ erlang/trunk/debian/changelog 2011-12-14 20:28:11 UTC (rev 1358)
@@ -1,8 +1,13 @@
-erlang (1:14.b.4-dfsg-2) UNRELEASED; urgency=low
+erlang (1:15.b-dfsg-1) unstable; urgency=low
- * NOT RELEASED YET
+ * New upstream release.
+ * Removed SSL patch because the old SSL implementation is removed from
+ the upstream distribution.
+ * Removed never used patch which added native code to erlang beam files.
+ * Removed the erlang-docbuilder binary package because the docbuilder
+ application was dropped by upstream.
- -- Sergei Golovan <sgolovan at debian.org> Tue, 25 Oct 2011 19:20:47 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Thu, 15 Dec 2011 00:05:10 +0400
erlang (1:14.b.4-dfsg-1) unstable; urgency=low
Modified: erlang/trunk/debian/control
===================================================================
--- erlang/trunk/debian/control 2011-12-04 16:33:50 UTC (rev 1357)
+++ erlang/trunk/debian/control 2011-12-14 20:28:11 UTC (rev 1358)
@@ -183,17 +183,6 @@
library in HTML and PDF formats.
-Package: erlang-docbuilder
-Architecture: any
-Depends: ${erlang-base}, erlang-edoc (= ${binary:Version}), erlang-xmerl (= ${binary:Version}), ${misc:Depends}
-Suggests: erlang, erlang-manpages, erlang-doc
-Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc (<< ${source:Upstream-Version}), erlang-doc (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
-Description: Erlang/OTP application for building HTML documentation
- DocBuilder provides functionality for generating HTML documentation
- for Erlang modules and Erlang/OTP applications from XML source code
- and/or EDoc comments in Erlang source code.
-
-
Package: erlang-edoc
Architecture: any
Depends: ${erlang-base}, erlang-inets (= ${binary:Version}), erlang-syntax-tools (=${binary:Version}), erlang-xmerl (= ${binary:Version}), ${misc:Depends}
@@ -631,7 +620,7 @@
Package: erlang-nox
Architecture: all
Depends: erlang-base | erlang-base-hipe, erlang-asn1, erlang-corba, erlang-crypto,
- erlang-diameter, erlang-docbuilder, erlang-edoc, erlang-erl-docgen, erlang-eunit,
+ erlang-diameter, erlang-edoc, erlang-erl-docgen, erlang-eunit,
erlang-ic, erlang-inets, erlang-inviso, erlang-mnesia, erlang-odbc, erlang-os-mon,
erlang-parsetools, erlang-percept, erlang-public-key, erlang-runtime-tools,
erlang-snmp, erlang-ssh, erlang-ssl, erlang-syntax-tools, erlang-tools,
@@ -660,7 +649,7 @@
Architecture: all
Depends: erlang-base | erlang-base-hipe, erlang-dev, erlang-appmon, erlang-asn1,
erlang-common-test, erlang-corba, erlang-crypto, erlang-debugger,
- erlang-dialyzer, erlang-diameter, erlang-docbuilder, erlang-edoc,
+ erlang-dialyzer, erlang-diameter, erlang-edoc,
erlang-erl-docgen, erlang-et, erlang-eunit, erlang-gs, erlang-ic, erlang-inets,
erlang-inviso, erlang-megaco, erlang-mnesia, erlang-observer, erlang-odbc,
erlang-os-mon, erlang-parsetools, erlang-percept, erlang-pman,
Deleted: erlang/trunk/debian/lintian/erlang-docbuilder.lintian-overrides
===================================================================
--- erlang/trunk/debian/lintian/erlang-docbuilder.lintian-overrides 2011-12-04 16:33:50 UTC (rev 1357)
+++ erlang/trunk/debian/lintian/erlang-docbuilder.lintian-overrides 2011-12-14 20:28:11 UTC (rev 1358)
@@ -1 +0,0 @@
-erlang-docbuilder: image-file-in-usr-lib
Modified: erlang/trunk/debian/manpages/erlang-depends.1
===================================================================
--- erlang/trunk/debian/manpages/erlang-depends.1 2011-12-04 16:33:50 UTC (rev 1357)
+++ erlang/trunk/debian/manpages/erlang-depends.1 2011-12-14 20:28:11 UTC (rev 1358)
@@ -160,7 +160,6 @@
${erlang\-crypto:Depends},
${erlang\-debugger:Depends},
${erlang\-dialyzer:Depends},
-${erlang\-docbuilder:Depends},
${erlang\-edoc:Depends},
${erlang\-et:Depends},
${erlang\-eunit:Depends},
Modified: erlang/trunk/debian/patches/clean.patch
===================================================================
--- erlang/trunk/debian/patches/clean.patch 2011-12-04 16:33:50 UTC (rev 1357)
+++ erlang/trunk/debian/patches/clean.patch 2011-12-14 20:28:11 UTC (rev 1358)
@@ -3,17 +3,17 @@
Erlang leaves many files after make clean. This patch contains
a hack to remove them.
---- erlang-14.b.4-dfsg.orig/Makefile.in
-+++ erlang-14.b.4-dfsg/Makefile.in
-@@ -1010,6 +1010,7 @@
+--- erlang-15.b-dfsg.orig/Makefile.in
++++ erlang-15.b-dfsg/Makefile.in
+@@ -950,6 +950,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
- cd lib/dialyzer && ERL_TOP=$(ERL_TOP) $(MAKE) clean
+ $(MAKE) additional_clean
#
# Just wipe out emulator, not libraries
-@@ -1045,3 +1046,170 @@
+@@ -985,3 +986,166 @@
|| $(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT) bootstrap_root_clean
# ----------------------------------------------------------------------
@@ -73,7 +73,6 @@
+ rm -rf $(ERL_TOP)/lib/crypto/c_src/$(TARGET)
+ rm -rf $(ERL_TOP)/lib/crypto/priv/lib/$(TARGET)
+ rm -rf $(ERL_TOP)/lib/crypto/priv/obj/$(TARGET)
-+ rm -rf $(ERL_TOP)/lib/docbuilder/ebin/docbuilder.appup
+ rm -rf $(ERL_TOP)/lib/erl_interface/bin/$(TARGET)
+ rm -rf $(ERL_TOP)/lib/erl_interface/config.log
+ rm -rf $(ERL_TOP)/lib/erl_interface/config.status
@@ -129,10 +128,7 @@
+ 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/ssl/c_src/$(TARGET)
+ rm -rf $(ERL_TOP)/lib/ssl/doc/man6/ssl.6
-+ rm -rf $(ERL_TOP)/lib/ssl/priv/bin/$(TARGET)
-+ rm -rf $(ERL_TOP)/lib/ssl/priv/obj/$(TARGET)
+ 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
Modified: erlang/trunk/debian/patches/docs.patch
===================================================================
--- erlang/trunk/debian/patches/docs.patch 2011-12-04 16:33:50 UTC (rev 1357)
+++ erlang/trunk/debian/patches/docs.patch 2011-12-14 20:28:11 UTC (rev 1358)
@@ -3,9 +3,9 @@
and a few bugs with docs installation.
Last-modified: Thu, 09 Dec 2010 10:45:56 +0300
---- erlang-14.b.4-dfsg.orig/lib/erl_docgen/priv/xsl/db_man.xsl
-+++ erlang-14.b.4-dfsg/lib/erl_docgen/priv/xsl/db_man.xsl
-@@ -505,7 +505,7 @@
+--- erlang-15.b-dfsg.orig/lib/erl_docgen/priv/xsl/db_man.xsl
++++ erlang-15.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>
<xsl:value-of select="$content"/>
@@ -14,16 +14,7 @@
</xsl:otherwise>
</xsl:choose>
</xsl:template>
-@@ -760,7 +760,7 @@
- <xsl:text>
.TP 3</xsl:text>
- <xsl:text>
Types:
</xsl:text>
- <xsl:apply-templates/>
-- <xsl:text>
.RE</xsl:text>
-+ <xsl:text>
.RE
</xsl:text>
- </xsl:if>
- </xsl:template>
-
-@@ -781,7 +781,7 @@
+@@ -794,7 +794,7 @@
<xsl:template match="desc">
<xsl:text>
.RS</xsl:text>
<xsl:apply-templates/>
@@ -32,29 +23,20 @@
</xsl:template>
---- erlang-14.b.4-dfsg.orig/lib/megaco/doc/src/Makefile
-+++ erlang-14.b.4-dfsg/lib/megaco/doc/src/Makefile
-@@ -247,8 +247,6 @@
+--- erlang-15.b-dfsg.orig/lib/megaco/doc/src/Makefile
++++ erlang-15.b-dfsg/lib/megaco/doc/src/Makefile
+@@ -172,8 +172,6 @@
$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
- $(INSTALL_DIR) $(RELSYSDIR)/doc/standard
- $(INSTALL_DATA) $(STANDARDS) $(RELSYSDIR)/doc/standard
- else
+ release_spec:
-@@ -270,8 +268,6 @@
- $(INSTALL_DIR) $(RELEASE_PATH)/man/man3
- $(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
- $(INSTALL_DATA) $(TOP_HTML_FILES) $(RELSYSDIR)/doc
-- $(INSTALL_DIR) $(RELSYSDIR)/doc/standard
-- $(INSTALL_DATA) $(STANDARDS) $(RELSYSDIR)/doc/standard
- endif
- endif
-
---- erlang-14.b.4-dfsg.orig/lib/stdlib/doc/src/re.xml
-+++ erlang-14.b.4-dfsg/lib/stdlib/doc/src/re.xml
-@@ -345,7 +345,7 @@
+--- erlang-15.b-dfsg.orig/lib/stdlib/doc/src/re.xml
++++ erlang-15.b-dfsg/lib/stdlib/doc/src/re.xml
+@@ -344,7 +344,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
@@ -63,7 +45,7 @@
<tag><c>noteol</c></tag>
-@@ -354,8 +354,8 @@
+@@ -353,8 +353,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
Modified: erlang/trunk/debian/patches/emacs.patch
===================================================================
--- erlang/trunk/debian/patches/emacs.patch 2011-12-04 16:33:50 UTC (rev 1357)
+++ erlang/trunk/debian/patches/emacs.patch 2011-12-14 20:28:11 UTC (rev 1358)
@@ -3,8 +3,8 @@
Also, it fixes manpage name regexp matching only 3erl manpages in
section 3.
---- erlang-14.b.4-dfsg.orig/lib/tools/emacs/erlang.el
-+++ erlang-14.b.4-dfsg/lib/tools/emacs/erlang.el
+--- erlang-15.b-dfsg.orig/lib/tools/emacs/erlang.el
++++ erlang-15.b-dfsg/lib/tools/emacs/erlang.el
@@ -496,8 +496,8 @@
(defvar erlang-man-dirs
'(("Man - Commands" "/man/man1" t)
Modified: erlang/trunk/debian/patches/gnu.patch
===================================================================
--- erlang/trunk/debian/patches/gnu.patch 2011-12-04 16:33:50 UTC (rev 1357)
+++ erlang/trunk/debian/patches/gnu.patch 2011-12-14 20:28:11 UTC (rev 1358)
@@ -11,9 +11,9 @@
(4) Switch some PATH_MAX occurrences to MAXPATHLEN;
---- erlang-14.b.4-dfsg.orig/erts/configure.in
-+++ erlang-14.b.4-dfsg/erts/configure.in
-@@ -385,7 +385,7 @@
+--- erlang-15.b-dfsg.orig/erts/configure.in
++++ erlang-15.b-dfsg/erts/configure.in
+@@ -378,7 +378,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.
-@@ -1190,7 +1190,7 @@
+@@ -1120,7 +1120,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-14.b.4-dfsg.orig/lib/os_mon/c_src/memsup.c
-+++ erlang-14.b.4-dfsg/lib/os_mon/c_src/memsup.c
+--- erlang-15.b-dfsg.orig/lib/os_mon/c_src/memsup.c
++++ erlang-15.b-dfsg/lib/os_mon/c_src/memsup.c
@@ -110,6 +110,11 @@
#include <memLib.h>
#endif
@@ -45,9 +45,9 @@
#ifdef BSD4_4
#include <sys/types.h>
#include <sys/sysctl.h>
---- erlang-14.b.4-dfsg.orig/erts/emulator/drivers/common/inet_drv.c
-+++ erlang-14.b.4-dfsg/erts/emulator/drivers/common/inet_drv.c
-@@ -401,6 +401,11 @@
+--- erlang-15.b-dfsg.orig/erts/emulator/drivers/common/inet_drv.c
++++ erlang-15.b-dfsg/erts/emulator/drivers/common/inet_drv.c
+@@ -532,6 +532,11 @@
inet_driver_select((d)->port, (ErlDrvEvent)(long)(d)->event, (flags), (onoff)); \
} while(0)
@@ -59,8 +59,8 @@
#endif /* __WIN32__ */
---- erlang-14.b.4-dfsg.orig/erts/etc/common/erlexec.c
-+++ erlang-14.b.4-dfsg/erts/etc/common/erlexec.c
+--- erlang-15.b-dfsg.orig/erts/etc/common/erlexec.c
++++ erlang-15.b-dfsg/erts/etc/common/erlexec.c
@@ -1536,7 +1536,7 @@
if (!bindir) {
/* Determine bindir from absolute path to executable */
@@ -79,8 +79,8 @@
strncpy(buffer, bindir, sizeof(buffer));
buffer[sizeof(buffer)-1] = '\0';
---- erlang-14.b.4-dfsg.orig/erts/etc/common/escript.c
-+++ erlang-14.b.4-dfsg/erts/etc/common/escript.c
+--- erlang-15.b-dfsg.orig/erts/etc/common/escript.c
++++ erlang-15.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-14.b.4-dfsg.orig/erts/etc/unix/dyn_erl.c
-+++ erlang-14.b.4-dfsg/erts/etc/unix/dyn_erl.c
+--- erlang-15.b-dfsg.orig/erts/etc/unix/dyn_erl.c
++++ erlang-15.b-dfsg/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 2011-12-04 16:33:50 UTC (rev 1357)
+++ erlang/trunk/debian/patches/hppa.patch 2011-12-14 20:28:11 UTC (rev 1358)
@@ -6,10 +6,10 @@
Forwarded: no
Last-updated: Mon, 22 Feb 2010 10:34:34 +0300
---- erlang-14.b.4-dfsg.orig/erts/configure.in
-+++ erlang-14.b.4-dfsg/erts/configure.in
-@@ -1817,6 +1817,14 @@
- AC_FUNC_SETVBUF_REVERSED
+--- erlang-15.b-dfsg.orig/erts/configure.in
++++ erlang-15.b-dfsg/erts/configure.in
+@@ -1837,6 +1837,14 @@
+ AC_CHECK_DECLS([posix2time],,,[#include <time.h>])
disable_vfork=false
+AC_MSG_CHECKING([if vfork is to be disabled (for HPPA)])
Modified: erlang/trunk/debian/patches/java.patch
===================================================================
--- erlang/trunk/debian/patches/java.patch 2011-12-04 16:33:50 UTC (rev 1357)
+++ erlang/trunk/debian/patches/java.patch 2011-12-14 20:28:11 UTC (rev 1358)
@@ -6,9 +6,9 @@
Forwarded: yes
Last-updated: Sat, 13 Feb 2010 10:08:42 +0300
---- erlang-14.b.4-dfsg.orig/erts/configure.in
-+++ erlang-14.b.4-dfsg/erts/configure.in
-@@ -4170,7 +4170,8 @@
+--- erlang-15.b-dfsg.orig/erts/configure.in
++++ erlang-15.b-dfsg/erts/configure.in
+@@ -4231,7 +4231,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-14.b.4-dfsg.orig/lib/test_server/src/configure.in
-+++ erlang-14.b.4-dfsg/lib/test_server/src/configure.in
+--- erlang-15.b-dfsg.orig/lib/test_server/src/configure.in
++++ erlang-15.b-dfsg/lib/test_server/src/configure.in
@@ -399,7 +399,8 @@
dnl Make sure it's at least JDK 1.5
AC_CACHE_CHECK(for JDK version 1.5,
Modified: erlang/trunk/debian/patches/m68k.patch
===================================================================
--- erlang/trunk/debian/patches/m68k.patch 2011-12-04 16:33:50 UTC (rev 1357)
+++ erlang/trunk/debian/patches/m68k.patch 2011-12-14 20:28:11 UTC (rev 1358)
@@ -7,8 +7,8 @@
(2) Non-working networking besause of blind conversion of long to a pointer.
---- erlang-14.b.4-dfsg.orig/erts/emulator/beam/binary.c
-+++ erlang-14.b.4-dfsg/erts/emulator/beam/binary.c
+--- erlang-15.b-dfsg.orig/erts/emulator/beam/binary.c
++++ erlang-15.b-dfsg/erts/emulator/beam/binary.c
@@ -31,6 +31,10 @@
#include "erl_binary.h"
#include "erl_bits.h"
@@ -20,9 +20,9 @@
#ifdef DEBUG
static int list_to_bitstr_buf(Eterm obj, char* buf, Uint len);
#else
---- erlang-14.b.4-dfsg.orig/erts/emulator/beam/erl_driver.h
-+++ erlang-14.b.4-dfsg/erts/emulator/beam/erl_driver.h
-@@ -563,7 +563,7 @@
+--- erlang-15.b-dfsg.orig/erts/emulator/beam/erl_driver.h
++++ erlang-15.b-dfsg/erts/emulator/beam/erl_driver.h
+@@ -589,7 +589,7 @@
EXTERN ErlDrvTermData driver_caller(ErlDrvPort);
extern const ErlDrvTermData driver_term_nil;
EXTERN ErlDrvTermData driver_mk_term_nil(void);
Modified: erlang/trunk/debian/patches/man.patch
===================================================================
--- erlang/trunk/debian/patches/man.patch 2011-12-04 16:33:50 UTC (rev 1357)
+++ erlang/trunk/debian/patches/man.patch 2011-12-14 20:28:11 UTC (rev 1358)
@@ -4,8 +4,8 @@
(Erlang manual pages are placed to /usr/share/man/ hierarchy
as required by Debian policy.)
---- erlang-14.b.4-dfsg.orig/erts/etc/common/erlexec.c
-+++ erlang-14.b.4-dfsg/erts/etc/common/erlexec.c
+--- erlang-15.b-dfsg.orig/erts/etc/common/erlexec.c
++++ erlang-15.b-dfsg/erts/etc/common/erlexec.c
@@ -728,8 +728,10 @@
error("-man not supported on Windows");
#else
Deleted: erlang/trunk/debian/patches/native.patch
===================================================================
--- erlang/trunk/debian/patches/native.patch 2011-12-04 16:33:50 UTC (rev 1357)
+++ erlang/trunk/debian/patches/native.patch 2011-12-14 20:28:11 UTC (rev 1358)
@@ -1,18 +0,0 @@
-native.patch by Sergei Golovan <sgolovan at debian.org>
-
-Adds native code to all Erlang binaries if HiPE is enabled.
-
---- erlang_14.b.3-dfsg.orig/make/otp.mk.in
-+++ erlang_14.b.3-dfsg/make/otp.mk.in
-@@ -89,6 +89,11 @@
- ERL_COMPILE_FLAGS += +slim
- else
- ERL_COMPILE_FLAGS += +debug_info
-+ ifeq ($(HIPE_ENABLED),yes)
-+ ifeq ($(BUILD_ALL),true)
-+ ERL_COMPILE_FLAGS += +native
-+ endif
-+ endif
- endif
- endif
- endif
Modified: erlang/trunk/debian/patches/powerpc.patch
===================================================================
--- erlang/trunk/debian/patches/powerpc.patch 2011-12-04 16:33:50 UTC (rev 1357)
+++ erlang/trunk/debian/patches/powerpc.patch 2011-12-14 20:28:11 UTC (rev 1358)
@@ -2,9 +2,9 @@
Description: Patch defines HiPE architecture ppc for powerpc arch.
Last-Modified: Mon, 08 Mar 2010 12:23:16 +0300
---- erlang-14.b.4-dfsg.orig/erts/configure.in
-+++ erlang-14.b.4-dfsg/erts/configure.in
-@@ -625,6 +625,7 @@
+--- erlang-15.b-dfsg.orig/erts/configure.in
++++ erlang-15.b-dfsg/erts/configure.in
+@@ -565,6 +565,7 @@
x86_64) ARCH=amd64;;
amd64) ARCH=amd64;;
macppc) ARCH=ppc;;
Modified: erlang/trunk/debian/patches/rpath.patch
===================================================================
--- erlang/trunk/debian/patches/rpath.patch 2011-12-04 16:33:50 UTC (rev 1357)
+++ erlang/trunk/debian/patches/rpath.patch 2011-12-14 20:28:11 UTC (rev 1358)
@@ -4,9 +4,9 @@
Forwarded: no
Last-modified:Sat, 27 Feb 2010 09:34:43 +0300
---- erlang-14.b.4-dfsg.orig/erts/configure.in
-+++ erlang-14.b.4-dfsg/erts/configure.in
-@@ -4026,9 +4026,9 @@
+--- erlang-15.b-dfsg.orig/erts/configure.in
++++ erlang-15.b-dfsg/erts/configure.in
+@@ -4089,9 +4089,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 2011-12-04 16:33:50 UTC (rev 1357)
+++ erlang/trunk/debian/patches/series 2011-12-14 20:28:11 UTC (rev 1358)
@@ -4,10 +4,8 @@
sparc.patch
man.patch
emacs.patch
-ssl.patch
m68k.patch
docs.patch
java.patch
hppa.patch
powerpc.patch
-#native.patch
Modified: erlang/trunk/debian/patches/sparc.patch
===================================================================
--- erlang/trunk/debian/patches/sparc.patch 2011-12-04 16:33:50 UTC (rev 1357)
+++ erlang/trunk/debian/patches/sparc.patch 2011-12-14 20:28:11 UTC (rev 1358)
@@ -5,9 +5,9 @@
(2) Fixes FTBFS(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=328031).
---- erlang-14.b.4-dfsg.orig/erts/configure.in
-+++ erlang-14.b.4-dfsg/erts/configure.in
-@@ -614,7 +614,7 @@
+--- erlang-15.b-dfsg.orig/erts/configure.in
++++ erlang-15.b-dfsg/erts/configure.in
+@@ -554,7 +554,7 @@
fi
case $chk_arch_ in
@@ -16,9 +16,9 @@
sparc64) ARCH=sparc64;;
sun4v) ARCH=ultrasparc;;
i86pc) ARCH=x86;;
---- erlang-14.b.4-dfsg.orig/erts/emulator/beam/beam_emu.c
-+++ erlang-14.b.4-dfsg/erts/emulator/beam/beam_emu.c
-@@ -1060,16 +1060,6 @@
+--- erlang-15.b-dfsg.orig/erts/emulator/beam/beam_emu.c
++++ erlang-15.b-dfsg/erts/emulator/beam/beam_emu.c
+@@ -1030,16 +1030,6 @@
* in registers.
*/
@@ -35,7 +35,7 @@
# define REG_x0
# define REG_xregs
# define REG_htop
-@@ -1078,7 +1068,6 @@
+@@ -1048,7 +1038,6 @@
# define REG_fcalls
# define REG_tmp_arg1
# define REG_tmp_arg2
Deleted: erlang/trunk/debian/patches/ssl.patch
===================================================================
--- erlang/trunk/debian/patches/ssl.patch 2011-12-04 16:33:50 UTC (rev 1357)
+++ erlang/trunk/debian/patches/ssl.patch 2011-12-14 20:28:11 UTC (rev 1358)
@@ -1,464 +0,0 @@
-ssl.patch by Mikael Magnusson <mikma at users.sourceforge.net>
-
-Patch adds support for IPv6 to the ssl application.
-
---- erlang-14.b.4-dfsg.orig/erts/configure.in
-+++ erlang-14.b.4-dfsg/erts/configure.in
-@@ -1800,6 +1800,8 @@
-
-
- AC_CHECK_FUNCS([getipnodebyname getipnodebyaddr gethostbyname2])
-+AC_CHECK_FUNCS([inet_pton])
-+AC_CHECK_TYPES([struct sockaddr_storage],,,[#include <netinet/in.h>])
-
- AC_CHECK_FUNCS([ieee_handler fpsetmask finite isnan isinf res_gethostbyname dlopen \
- pread pwrite writev memmove strerror strerror_r strncasecmp \
---- erlang-14.b.4-dfsg.orig/erts/config.h.in
-+++ erlang-14.b.4-dfsg/erts/config.h.in
-@@ -329,6 +329,9 @@
- /* Define to 1 if you have the `inet_pton' function. */
- #undef HAVE_INET_PTON
-
-+/* Define to 1 if you have the `inet_pton' function. */
-+#undef HAVE_INET_PTON
-+
- /* Define to 1 if you have the <inttypes.h> header file. */
- #undef HAVE_INTTYPES_H
-
-@@ -524,6 +527,9 @@
- /* Define to 1 if `ssf_data' is member of `struct sctp_send_failed'. */
- #undef HAVE_STRUCT_SCTP_SEND_FAILED_SSF_DATA
-
-+/* Define to 1 if the system has the type `struct sockaddr_storage'. */
-+#undef HAVE_STRUCT_SOCKADDR_STORAGE
-+
- /* Define to 1 if you have the <syslog.h> header file. */
- #undef HAVE_SYSLOG_H
-
---- erlang-14.b.4-dfsg.orig/lib/ssl/c_src/esock.c
-+++ erlang-14.b.4-dfsg/lib/ssl/c_src/esock.c
-@@ -132,6 +132,11 @@
- #define INADDR_NONE 0xffffffff /* Should be in <netinet/in.h>. */
- #endif
-
-+#if defined(HAVE_STRUCT_SOCKADDR_STORAGE) && defined(HAVE_GETNAMEINFO) && \
-+ defined(HAVE_INET_PTON)
-+# define USE_IPV6
-+#endif
-+
- #include "esock.h"
- #include "debuglog.h"
- #include "esock_utils.h"
-@@ -178,6 +183,15 @@
- static void dump_connections(void);
- static int check_num_sock_fds(FD fd);
- static void safe_close(FD fd);
-+
-+#if defined(USE_IPV6)
-+static FD do_connect6(char *lipstring, int lport, char *fipstring, int fport);
-+static FD do_listen6(char *ipstring, int lport, int backlog, int *aport);
-+static int ss_getport(const struct sockaddr *sa, socklen_t size);
-+static int reply_sockaddr(int cmd, int fd, const struct sockaddr *sa,
-+ socklen_t size);
-+#endif
-+
- static Connection *new_connection(int state, FD fd);
- static Connection *get_connection(FD fd);
- static void remove_connection(Connection *conn);
-@@ -366,7 +380,11 @@
- char *protocol_vsn, *cipher;
- unsigned char *cert, *bin;
- int certlen, binlen;
-+#if defined(USE_IPV6)
-+ struct sockaddr_storage iserv_addr;
-+#else
- struct sockaddr_in iserv_addr;
-+#endif
- int sret = 1;
- Connection *cp, *cpnext, *newcp;
- Proxy *pp;
-@@ -443,7 +461,12 @@
- /* Add to pending proxy connections */
- SET_NONBLOCKING(proxysock);
- pp = new_proxy(proxysock);
-+#if defined(USE_IPV6)
-+ pp->peer_port =
-+ ss_getport((struct sockaddr *)&iserv_addr, length);
-+#else
- pp->peer_port = ntohs(iserv_addr.sin_port);
-+#endif
- DEBUGF(("-----------------------------------\n"));
- DEBUGF(("[PROXY_LISTEN_SOCK] conn accepted: "
- "proxyfd = %d, "
-@@ -498,9 +521,14 @@
- * reply = {cmd(1), fd(4), port(2),
- * ipstring(N), 0(1)}
- */
-+#if defined(USE_IPV6)
-+ reply_sockaddr(ESOCK_GETPEERNAME_REP, fd,
-+ (struct sockaddr*)&iserv_addr, length);
-+#else
- reply(ESOCK_GETPEERNAME_REP, "42s", fd,
- ntohs(iserv_addr.sin_port),
- inet_ntoa(iserv_addr.sin_addr));
-+#endif
- }
- break;
-
-@@ -524,9 +552,14 @@
- * reply = {cmd(1), fd(4), port(2),
- * ipstring(N), 0(1)}
- */
-+#if defined(USE_IPV6)
-+ reply_sockaddr(ESOCK_GETSOCKNAME_REP, fd,
-+ (struct sockaddr*)&iserv_addr, length);
-+#else
- reply(ESOCK_GETSOCKNAME_REP, "42s", fd,
- ntohs(iserv_addr.sin_port),
- inet_ntoa(iserv_addr.sin_addr));
-+#endif
- }
- break;
-
-@@ -701,8 +734,7 @@
- }
- DEBUGF(("-> PASSIVE_LISTENING (fd = %d)\n", listensock));
- /* Publish listensock */
-- reply(ESOCK_LISTEN_REP, "442", intref, listensock,
-- ntohs(iserv_addr.sin_port));
-+ reply(ESOCK_LISTEN_REP, "442", intref, listensock, lport);
- break;
-
- case ESOCK_TRANSPORT_ACCEPT_CMD:
-@@ -1516,6 +1548,11 @@
- struct sockaddr_in sock_addr;
- long inaddr;
- FD fd;
-+
-+#if defined(USE_IPV6)
-+ if (strchr(fipstring, ':'))
-+ return do_connect6(lipstring, lport, fipstring, fport);
-+#endif
-
- if ((fd = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_FD) {
- DEBUGF(("Error calling socket()\n"));
-@@ -1573,9 +1610,14 @@
- static int one = 1; /* Type must be int, not long */
- struct sockaddr_in sock_addr;
- long inaddr;
-- int length;
-+ unsigned int length;
- FD fd;
-
-+#if defined(USE_IPV6)
-+ if (strchr(ipstring, ':'))
-+ return do_listen6(ipstring, lport, backlog, aport);
-+#endif
-+
- if ((fd = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_FD) {
- DEBUGF(("Error calling socket()\n"));
- return fd;
-@@ -1631,6 +1673,145 @@
- return fd;
- }
-
-+#if defined(USE_IPV6)
-+static FD do_connect6(char *lipstring, int lport, char *fipstring, int fport)
-+{
-+ struct sockaddr_in6 sock_addr;
-+ FD fd;
-+
-+ if ((fd = socket(AF_INET6, SOCK_STREAM, 0)) == INVALID_FD) {
-+ DEBUGF(("Error calling socket()\n"));
-+ return fd;
-+ }
-+ if (check_num_sock_fds(fd) < 0)
-+ return INVALID_FD;
-+ DEBUGF((" fd = %d\n", fd));
-+
-+ memset(&sock_addr, 0, sizeof(sock_addr));
-+ /* local */
-+ if (inet_pton(AF_INET6, lipstring, &sock_addr.sin6_addr) <= 0) {
-+ DEBUGF(("Error in inet_pton(): lipstring = %s\n", lipstring));
-+ safe_close(fd);
-+ sock_set_errno(ERRNO_ADDRNOTAVAIL);
-+ return INVALID_FD;
-+ }
-+ sock_addr.sin6_family = AF_INET6;
-+ sock_addr.sin6_port = htons(lport);
-+ if(bind(fd, (struct sockaddr*) &sock_addr, sizeof(sock_addr)) < 0) {
-+ DEBUGF(("Error in bind()\n"));
-+ safe_close(fd);
-+ /* XXX Set error code for bind error */
-+ return INVALID_FD;
-+ }
-+
-+ /* foreign */
-+ memset(&sock_addr, 0, sizeof(sock_addr));
-+ if (inet_pton(AF_INET6, fipstring, &sock_addr.sin6_addr) <= 0) {
-+ DEBUGF(("Error in inet_pton(): fipstring = %s\n", fipstring));
-+ safe_close(fd);
-+ sock_set_errno(ERRNO_ADDRNOTAVAIL);
-+ return INVALID_FD;
-+ }
-+ sock_addr.sin6_family = AF_INET6;
-+ sock_addr.sin6_port = htons(fport);
-+
-+ SET_NONBLOCKING(fd);
-+
-+ if(connect(fd, (struct sockaddr*)&sock_addr, sizeof(sock_addr)) < 0) {
-+ if (sock_errno() != ERRNO_PROGRESS && /* UNIX */
-+ sock_errno() != ERRNO_BLOCK) { /* WIN32 */
-+ DEBUGF(("Error in connect()\n"));
-+ safe_close(fd);
-+ return INVALID_FD;
-+ }
-+ }
-+ return fd;
-+}
-+
-+static FD do_listen6(char *ipstring, int lport, int backlog, int *aport)
-+{
-+ static int one = 1; /* Type must be int, not long */
-+ struct sockaddr_in6 sock_addr;
-+ socklen_t length;
-+ FD fd;
-+
-+ if ((fd = socket(AF_INET6, SOCK_STREAM, 0)) == INVALID_FD) {
-+ DEBUGF(("Error calling socket()\n"));
-+ return fd;
-+ }
-+ if (check_num_sock_fds(fd) < 0)
-+ return INVALID_FD;
-+ DEBUGF((" fd = %d\n", fd));
-+ memset(&sock_addr, 0, sizeof(sock_addr));
-+ if (inet_pton(AF_INET6, ipstring, &sock_addr.sin6_addr) <= 0) {
-+ DEBUGF(("Error in inet_pton(): ipstring = %s\n", ipstring));
-+ safe_close(fd);
-+ sock_set_errno(ERRNO_ADDRNOTAVAIL);
-+ return INVALID_FD;
-+ }
-+ sock_addr.sin6_family = AF_INET6;
-+ sock_addr.sin6_port = htons(lport);
-+
-+ setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void *)&one, sizeof(one));
-+
-+ if(bind(fd, (struct sockaddr*) &sock_addr, sizeof(sock_addr)) < 0) {
-+ DEBUGF(("Error in bind()\n"));
-+ safe_close(fd);
-+ return INVALID_FD;
-+ }
-+ if (listen(fd, backlog) < 0) {
-+ DEBUGF(("Error in listen()\n"));
-+ safe_close(fd);
-+ return INVALID_FD;
-+ }
-+ /* find out assigned local port number */
-+ length = sizeof(sock_addr);
-+ if (getsockname(fd, (struct sockaddr *)&sock_addr, &length) < 0) {
-+ DEBUGF(("Error in getsockname()\n"));
-+ safe_close(fd);
-+ return INVALID_FD;
-+ }
-+ if (aport)
-+ *aport = ntohs(sock_addr.sin6_port);
-+ return fd;
-+}
-+
-+static int reply_sockaddr(int cmd, int fd, const struct sockaddr *sa,
-+ socklen_t size)
-+{
-+ char addr[INET6_ADDRSTRLEN+1] = "";
-+ char port[10] = "";
-+ int res;
-+
-+ res = getnameinfo(sa, size,
-+ addr, sizeof(addr), port, sizeof(port),
-+ NI_NUMERICHOST | NI_NUMERICSERV);
-+ if (res) {
-+ if (res != EAI_SYSTEM) {
-+ sock_set_errno(ERRNO_INVAL);
-+ }
-+ return reply(cmd, "4s", fd, psx_errstr());
-+ } else {
-+ return reply(cmd, "42s", fd, atoi(port), addr);
-+ }
-+}
-+
-+static int ss_getport(const struct sockaddr *sa, socklen_t size)
-+{
-+ char port[10] = "";
-+ int res;
-+
-+ res = getnameinfo(sa, size,
-+ NULL, 0, port, sizeof(port), NI_NUMERICSERV);
-+ if (res) {
-+ return -1;
-+ } else {
-+ return atoi(port);
-+ }
-+}
-+#endif
-+
-+
- static Connection *new_connection(int state, FD fd)
- {
- Connection *cp;
---- erlang-14.b.4-dfsg.orig/lib/ssl/src/ssl_broker.erl
-+++ erlang-14.b.4-dfsg/lib/ssl/src/ssl_broker.erl
-@@ -471,7 +471,7 @@
- debug(St, "peername: client = ~w~n", [Client]),
- Reply = case ssl_server:peername(St#st.fd) of
- {ok, {Address, Port}} ->
-- {ok, At} = inet_parse:ipv4_address(Address),
-+ {ok, At} = inet_parse:address(Address),
- {ok, {At, Port}};
- Error ->
- Error
-@@ -527,7 +527,7 @@
- debug(St, "sockname: client = ~w~n", [Client]),
- Reply = case ssl_server:sockname(St#st.fd) of
- {ok, {Address, Port}} ->
-- {ok, At} = inet_parse:ipv4_address(Address),
-+ {ok, At} = inet_parse:address(Address),
- {ok, {At, Port}};
- Error ->
- Error
-@@ -684,7 +684,8 @@
- SSLOpts = get_ssl_opts(Opts),
- FlagStr =mk_ssl_optstr(SSLOpts),
- BackLog = get_backlog(LOpts),
-- IP = get_ip(LOpts),
-+ Family = get_family(Opts),
-+ IP = get_ip(LOpts, Family),
- case ssl_server:listen_prim(ServerName, IP, Port, FlagStr, BackLog) of
- {ok, ListenFd, _Port0} ->
- ThisSocket = #sslsocket{fd = ListenFd, pid = self()},
-@@ -707,10 +708,11 @@
- COpts = get_tcp_connect_opts(Opts),
- SSLOpts = get_ssl_opts(Opts),
- FlagStr = mk_ssl_optstr(SSLOpts),
-- case inet:getaddr(FAddress, inet) of
-+ Family = get_family(Opts),
-+ case inet:getaddr(FAddress, Family) of
- {ok, FIP} ->
- %% Timeout is gen_server timeout - hence catch
-- LIP = get_ip(COpts),
-+ LIP = get_ip(COpts, Family),
- LPort = get_port(COpts),
- case (catch ssl_server:connect_prim(ServerName,
- LIP, LPort, FIP, FPort,
-@@ -997,8 +999,13 @@
- get_backlog(Opts) ->
- get_tagged_opt(backlog, Opts, ?DEF_BACKLOG).
-
--get_ip(Opts) ->
-- get_tagged_opt(ip, Opts, {0, 0, 0, 0}).
-+get_ip(Opts, Family) ->
-+ DefaultIp =
-+ case Family of
-+ inet -> {0, 0, 0, 0};
-+ inet6 -> {0, 0, 0, 0, 0, 0, 0, 0}
-+ end,
-+ get_tagged_opt(ip, Opts, DefaultIp).
-
- get_port(Opts) ->
- get_tagged_opt(port, Opts, 0).
-@@ -1006,6 +1013,9 @@
- get_nodelay(Opts) ->
- get_tagged_opt(nodelay, Opts, empty).
-
-+get_family(Opts) ->
-+ get_tagged_opt(family, transform_opts(Opts), inet).
-+
- %%
- %% add_default_*_opts(Opts) -> NOpts
- %%
-@@ -1054,6 +1064,8 @@
- transform_opt(binary) -> [{mode, binary}];
- transform_opt(list) -> [{mode, list}];
- transform_opt({packet, raw}) -> [{packet, 0}];
-+transform_opt(inet) -> [{family, inet}];
-+transform_opt(inet6) -> [{family, inet6}];
- transform_opt(raw) -> [];
- transform_opt(Opt) -> [Opt].
-
-@@ -1061,10 +1073,10 @@
- %% only.
-
- is_connect_opt(Opt) ->
-- is_tcp_connect_opt(Opt) or is_ssl_opt(Opt).
-+ is_tcp_connect_opt(Opt) or is_ssl_opt(Opt) or is_family_opt(Opt).
-
- is_listen_opt(Opt) ->
-- is_tcp_listen_opt(Opt) or is_ssl_opt(Opt).
-+ is_tcp_listen_opt(Opt) or is_ssl_opt(Opt) or is_family_opt(Opt).
-
- is_tcp_accept_opt(Opt) ->
- is_tcp_gen_opt(Opt).
-@@ -1120,6 +1132,10 @@
- is_ssl_opt({cachetimeout, Timeout}) when Timeout >= 0 -> true;
- is_ssl_opt(_Opt) -> false.
-
-+is_family_opt({family, inet}) -> true;
-+is_family_opt({family, inet6}) -> true;
-+is_family_opt(_Opt) -> false.
-+
- %% Various types
- is_string(String) when is_list(String) ->
- lists:all(fun (C) when is_integer(C), 0 =< C, C =< 255 -> true;
-@@ -1130,11 +1146,20 @@
-
- is_ip_address(Addr) when tuple_size(Addr) =:= 4 ->
- is_string(tuple_to_list(Addr));
-+is_ip_address(Addr) when is_tuple(Addr), size(Addr) == 8 ->
-+ is_ip6_string(tuple_to_list(Addr));
- is_ip_address(Addr) when is_list(Addr) ->
- is_string(Addr);
- is_ip_address(_) ->
- false.
-
-+is_ip6_string(String) when is_list(String) ->
-+ lists:all(fun (C) when is_integer(C), 0 =< C, C =< 65535 -> true;
-+ (_C) -> false end,
-+ String);
-+is_ip6_string(_) ->
-+ false.
-+
- get_tagged_opt(Tag, Opts, Default) ->
- case lists:keysearch(Tag, 1, Opts) of
- {value, {_, Value}} ->
---- erlang-14.b.4-dfsg.orig/lib/ssl/src/ssl_prim.erl
-+++ erlang-14.b.4-dfsg/lib/ssl/src/ssl_prim.erl
-@@ -118,7 +118,7 @@
- peername(#st{fd = Fd, status = open}) ->
- case ssl_server:peername_prim(ssl_server_prim, Fd) of
- {ok, {Address, Port}} ->
-- {ok, At} = inet_parse:ipv4_address(Address),
-+ {ok, At} = inet_parse:address(Address),
- {ok, {At, Port}};
- Error ->
- Error
-@@ -129,7 +129,7 @@
- sockname(#st{fd = Fd, status = open}) ->
- case ssl_server:sockname_prim(ssl_server_prim, Fd) of
- {ok, {Address, Port}} ->
-- {ok, At} = inet_parse:ipv4_address(Address),
-+ {ok, At} = inet_parse:address(Address),
- {ok, {At, Port}};
- Error ->
- Error
---- erlang-14.b.4-dfsg.orig/lib/ssl/src/ssl_server.erl
-+++ erlang-14.b.4-dfsg/lib/ssl/src/ssl_server.erl
-@@ -1363,7 +1363,10 @@
-
- ip_to_string({A,B,C,D}) ->
- [integer_to_list(A),$.,integer_to_list(B),$.,
-- integer_to_list(C),$.,integer_to_list(D)].
-+ integer_to_list(C),$.,integer_to_list(D)];
-+
-+ip_to_string(Addr) when is_tuple(Addr), size(Addr) == 8 ->
-+ inet_parse:ntoa(Addr).
-
- debug(St, Format, Args) ->
- debug1(St#st.debug, Format, Args).
Deleted: erlang/trunk/debian/patterns/erlang-docbuilder.patterns
===================================================================
--- erlang/trunk/debian/patterns/erlang-docbuilder.patterns 2011-12-04 16:33:50 UTC (rev 1357)
+++ erlang/trunk/debian/patterns/erlang-docbuilder.patterns 2011-12-14 20:28:11 UTC (rev 1358)
@@ -1 +0,0 @@
-./usr/lib/erlang/lib/docbuilder-.*/
Modified: erlang/trunk/debian/patterns/erlang-src.patterns
===================================================================
--- erlang/trunk/debian/patterns/erlang-src.patterns 2011-12-04 16:33:50 UTC (rev 1357)
+++ erlang/trunk/debian/patterns/erlang-src.patterns 2011-12-14 20:28:11 UTC (rev 1358)
@@ -17,7 +17,6 @@
./usr/lib/erlang/lib/debugger-.*/src/
./usr/lib/erlang/lib/dialyzer-.*/src/
./usr/lib/erlang/lib/diameter-.*/src/
-./usr/lib/erlang/lib/docbuilder-.*/src/
./usr/lib/erlang/lib/edoc-.*/src/
./usr/lib/erlang/lib/erl_interface-.*/src/
./usr/lib/erlang/lib/erts-.*/src/
Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules 2011-12-04 16:33:50 UTC (rev 1357)
+++ erlang/trunk/debian/rules 2011-12-14 20:28:11 UTC (rev 1358)
@@ -278,9 +278,8 @@
chmod 644 $(INSTALL_DIR)/usr/lib/erlang/lib/wx-*/examples/*/*.beam
chmod 644 $(INSTALL_DIR)/usr/lib/erlang/lib/wx-*/examples/*/*.xpm
- # Remove useless ssl and crypto object files
+ # Remove useless crypto object files
rm -rv $(INSTALL_DIR)/usr/lib/erlang/lib/crypto-*/priv/obj
- rm -rv $(INSTALL_DIR)/usr/lib/erlang/lib/ssl-*/priv/obj
# Remove some files which should be rather in erlang-doc-html package
find $(INSTALL_DIR)/usr/lib/erlang/lib -name info -exec rm -v {} \;
@@ -450,7 +449,7 @@
install -D -m 644 $(ROOT_DIR)/debian/erlang-base.desktop \
$(ROOT_DIR)/debian/erlang-base/usr/share/apps/konsole/erlang.desktop
#
- for pkg in base appmon common-test debugger docbuilder edoc erl-docgen gs observer percept pman tv wx ; do \
+ for pkg in base appmon common-test debugger edoc erl-docgen gs observer percept pman tv wx ; do \
install -D -m 644 debian/lintian/erlang-$$pkg.lintian-overrides \
$(ROOT_DIR)/debian/erlang-$$pkg/usr/share/lintian/overrides/erlang-$$pkg ; \
done
@@ -512,8 +511,8 @@
binary: binary-indep binary-arch
-REL=R14B04
-DEB_REL=14.b.4-dfsg
+REL=R15B
+DEB_REL=15.b-dfsg
get-orig-source:
CURDIR=`pwd` && TMPDIR=`mktemp -d /tmp/erlang.XXXXXX` && \
Modified: erlang/trunk/debian/scripts/analyse
===================================================================
--- erlang/trunk/debian/scripts/analyse 2011-12-04 16:33:50 UTC (rev 1357)
+++ erlang/trunk/debian/scripts/analyse 2011-12-14 20:28:11 UTC (rev 1358)
@@ -55,7 +55,7 @@
grep -E -f debian/patterns/erlang-dev.patterns | \
cut -c 20- >> debian/erlang-dev.install
-PACKAGES='appmon asn1 common-test corba crypto debugger dialyzer diameter docbuilder
+PACKAGES='appmon asn1 common-test corba crypto debugger dialyzer diameter
edoc erl-docgen et eunit gs ic-java ic inets inviso jinterface megaco mnesia
observer odbc os-mon parsetools percept pman public-key reltool
runtime-tools snmp ssh ssl syntax-tools test-server toolbar tools tv
More information about the Pkg-erlang-commits
mailing list