[Pkg-erlang-commits] r1430 - in erlang/branches/backport: . debian debian/manpages debian/patches debian/patterns debian/scripts
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Mon Apr 23 13:34:06 UTC 2012
Author: sgolovan
Date: 2012-04-23 13:34:06 +0000 (Mon, 23 Apr 2012)
New Revision: 1430
Added:
erlang/branches/backport/debian/patterns/erlang-eldap.patterns
Modified:
erlang/branches/backport/
erlang/branches/backport/debian/changelog
erlang/branches/backport/debian/control
erlang/branches/backport/debian/copyright
erlang/branches/backport/debian/erlang-mode.emacsen-startup
erlang/branches/backport/debian/manpages/erlang-depends.1
erlang/branches/backport/debian/patches/clean.patch
erlang/branches/backport/debian/patches/docs.patch
erlang/branches/backport/debian/patches/emacs.patch
erlang/branches/backport/debian/patches/gnu.patch
erlang/branches/backport/debian/patches/hppa.patch
erlang/branches/backport/debian/patches/java.patch
erlang/branches/backport/debian/patches/m68k.patch
erlang/branches/backport/debian/patches/man.patch
erlang/branches/backport/debian/patches/powerpc.patch
erlang/branches/backport/debian/patches/rpath.patch
erlang/branches/backport/debian/patches/sparc.patch
erlang/branches/backport/debian/patterns/erlang-dev.patterns
erlang/branches/backport/debian/patterns/erlang-src.patterns
erlang/branches/backport/debian/rules
erlang/branches/backport/debian/scripts/analyse
Log:
[erlang]
* Merged 15.b.1-dfsg-1 for squeeze backport.
Property changes on: erlang/branches/backport
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental:1283-1305
/erlang/tags/1:15.b-dfsg-2:1349-1417
/erlang/trunk:1274-1282
+ /erlang/branches/experimental:1283-1305
/erlang/tags/1:15.b.1-dfsg-1:1349-1429
/erlang/trunk:1274-1282
Modified: erlang/branches/backport/debian/changelog
===================================================================
--- erlang/branches/backport/debian/changelog 2012-04-04 08:31:34 UTC (rev 1429)
+++ erlang/branches/backport/debian/changelog 2012-04-23 13:34:06 UTC (rev 1430)
@@ -1,14 +1,20 @@
-erlang (1:15.b-dfsg-2~bpo60+2) UNRELEASED; urgency=low
+erlang (1:15.b.1-dfsg-1~bpo60+1) squeeze-backports; urgency=low
- * NOT RELEASED YET
+ * Backported to squeeze.
- -- Sergei Golovan <sgolovan at debian.org> Tue, 14 Feb 2012 00:33:11 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Mon, 23 Apr 2012 16:35:29 +0400
-erlang (1:15.b-dfsg-2~bpo60+1) squeeze-backports; urgency=low
+erlang (1:15.b.1-dfsg-1) unstable; urgency=low
- * Backported to squeeze.
+ * New upstream release.
+ * Added new package erlang-eldap with Erlang LDAP library.
+ * Added eldap application license to debian/copyright.
+ * Use (debian-pkg-add-load-path-item <path>) instead of manipulating
+ load-path directly in 50erlang-mode.el Emacs startup file as required
+ by Debian Emacd policy (closes: #663408).
+ * Bumped standards version to 3.9.3.
- -- Sergei Golovan <sgolovan at debian.org> Mon, 13 Feb 2012 16:56:47 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Wed, 04 Apr 2012 11:09:17 +0400
erlang (1:15.b-dfsg-2) unstable; urgency=low
Modified: erlang/branches/backport/debian/control
===================================================================
--- erlang/branches/backport/debian/control 2012-04-04 08:31:34 UTC (rev 1429)
+++ erlang/branches/backport/debian/control 2012-04-23 13:34:06 UTC (rev 1430)
@@ -3,7 +3,7 @@
Uploaders: Sergei Golovan <sgolovan at debian.org>
Section: interpreters
Priority: optional
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Build-Depends: debhelper (>= 5.0.0), autoconf (>= 2.50), openssl, libssl-dev, m4,
libncurses5-dev, quilt, autotools-dev, unixodbc-dev, bison, flex, ed,
libwxgtk2.8-dev, dctrl-tools, xsltproc,
@@ -194,6 +194,16 @@
the conventions of the Erlang world.
+Package: erlang-eldap
+Architecture: any
+Depends: ${erlang-base}, erlang-asn1 (= ${binary:Version}), erlang-ssl (=${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 LDAP library
+ Eldap is a module which provides a client API to the Lightweight
+ Directory Access Protocol (LDAP).
+
+
Package: erlang-erl-docgen
Architecture: any
Depends: ${erlang-base}, erlang-edoc (= ${binary:Version}), erlang-xmerl (= ${binary:Version}), ${misc:Depends}
@@ -433,7 +443,7 @@
Package: erlang-ssh
Architecture: any
-Depends: ${erlang-base}, erlang-asn1 (= ${binary:Version}), erlang-crypto (= ${binary:Version}), erlang-public-key (= ${binary:Version}), ${misc:Depends}
+Depends: ${erlang-base}, erlang-crypto (= ${binary:Version}), erlang-public-key (= ${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 implementation of SSH protocol
@@ -607,7 +617,7 @@
Package: erlang-mode
Architecture: all
-Depends: emacsen-common, ${misc:Depends}
+Depends: emacsen-common (>= 1.4.14), ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc
Replaces: erlang-base (<< 1:12.b.1-dfsg-2), erlang-base-hipe (<< 1:12.b.1-dfsg-2)
Description: Erlang major editing mode for Emacs
@@ -620,7 +630,7 @@
Package: erlang-nox
Architecture: all
Depends: erlang-base | erlang-base-hipe, erlang-asn1, erlang-corba, erlang-crypto,
- erlang-diameter, erlang-edoc, erlang-erl-docgen, erlang-eunit,
+ erlang-diameter, erlang-edoc, erlang-eldap, 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,
@@ -649,7 +659,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-edoc,
+ erlang-dialyzer, erlang-diameter, erlang-edoc, erlang-eldap,
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,
Modified: erlang/branches/backport/debian/copyright
===================================================================
--- erlang/branches/backport/debian/copyright 2012-04-04 08:31:34 UTC (rev 1429)
+++ erlang/branches/backport/debian/copyright 2012-04-23 13:34:06 UTC (rev 1430)
@@ -56,6 +56,27 @@
License, version 2.1, can be found in /usr/share/common-licenses/LGPL-2.1
============================================================================
+This licence applies to lib/eldap
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+============================================================================
This license applies to erts/emulator/beam/erl_md5.c,
lib/erl_interface/src/misc/eimd5.c and lib/erl_interface/src/misc/eimd5.h
Modified: erlang/branches/backport/debian/erlang-mode.emacsen-startup
===================================================================
--- erlang/branches/backport/debian/erlang-mode.emacsen-startup 2012-04-04 08:31:34 UTC (rev 1429)
+++ erlang/branches/backport/debian/erlang-mode.emacsen-startup 2012-04-23 13:34:06 UTC (rev 1430)
@@ -1,8 +1,8 @@
;; installed in a subdirectory of the respective site-lisp directory.
;; We have to add this to the load-path:
-(setq load-path (cons (concat "/usr/share/"
- (symbol-name debian-emacs-flavor)
- "/site-lisp/erlang") load-path))
+(debian-pkg-add-load-path-item (concat "/usr/share/"
+ (symbol-name debian-emacs-flavor)
+ "/site-lisp/erlang"))
(setq erlang-root-dir "/usr/lib/erlang")
(setq exec-path (cons "/usr/lib/erlang/bin" exec-path))
(require 'erlang-start)
Modified: erlang/branches/backport/debian/manpages/erlang-depends.1
===================================================================
--- erlang/branches/backport/debian/manpages/erlang-depends.1 2012-04-04 08:31:34 UTC (rev 1429)
+++ erlang/branches/backport/debian/manpages/erlang-depends.1 2012-04-23 13:34:06 UTC (rev 1430)
@@ -125,7 +125,7 @@
.\" ========================================================================
.\"
.IX Title "ERLANG-DEPENDS 1"
-.TH ERLANG-DEPENDS 1 "2011\-12\-14" "1:15.b\-dfsg\-1" "Erlang packages for Debian GNU/Linux"
+.TH ERLANG-DEPENDS 1 "2011\-12\-14" "1:15.b.1\-dfsg\-1" "Erlang packages for Debian GNU/Linux"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -161,6 +161,7 @@
${erlang\-debugger:Depends},
${erlang\-dialyzer:Depends},
${erlang\-edoc:Depends},
+${erlang\-eldap:Depends},
${erlang\-et:Depends},
${erlang\-eunit:Depends},
${erlang\-gs:Depends},
@@ -190,9 +191,14 @@
${erlang\-webtool:Depends},
${erlang\-wx:Depends},
${erlang\-xmerl:Depends}.
-All variables except ${erlang\-base:Depends} and ${erlang\-dev:Depends} were
-introduced in version 1:13.b\-dfsg\-2 of erlang\-dev package.
+All variables except ${erlang\-eldap:Depends}, ${erlang\-base:Depends}
+and ${erlang\-dev:Depends} were introduced in version 1:13.b\-dfsg\-2 of
+erlang\-dev package.
.PP
+Variable ${erlang\-eldap:Depends} was added in version 1:15.b.1\-dfsg\-1
+of erlang\-dev package because the new eldap application was included to the
+Erlang distribution.
+.PP
Variable ${erlang\-docbuilder:Depends} was dropped in version 1:15.b\-dfsg\-1
of erlang\-dev package because the docbuilder application was removed from the
Erlang distribution.
Modified: erlang/branches/backport/debian/patches/clean.patch
===================================================================
--- erlang/branches/backport/debian/patches/clean.patch 2012-04-04 08:31:34 UTC (rev 1429)
+++ erlang/branches/backport/debian/patches/clean.patch 2012-04-23 13:34:06 UTC (rev 1430)
@@ -3,9 +3,9 @@
Erlang leaves many files after make clean. This patch contains
a hack to remove them.
---- erlang-15.b-dfsg.orig/Makefile.in
-+++ erlang-15.b-dfsg/Makefile.in
-@@ -950,6 +950,7 @@
+--- erlang-15.b.1-dfsg.orig/Makefile.in
++++ erlang-15.b.1-dfsg/Makefile.in
+@@ -971,6 +971,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
@@ -13,7 +13,7 @@
#
# Just wipe out emulator, not libraries
-@@ -985,3 +986,179 @@
+@@ -1006,3 +1007,185 @@
|| $(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT) bootstrap_root_clean
# ----------------------------------------------------------------------
@@ -33,9 +33,15 @@
+ rm -rf $(ERL_TOP)/bootstrap/lib/syntax_tools
+ rm -rf $(ERL_TOP)/bootstrap/lib/test_server
+ rm -rf $(ERL_TOP)/bootstrap/lib/wx
++ rm -rf $(ERL_TOP)/bootstrap/lib/xmerl
+ rm -rf $(ERL_TOP)/bootstrap/target
+ rm -rf $(ERL_TOP)/erts/config.log
+ rm -rf $(ERL_TOP)/erts/config.status
++ rm -rf $(ERL_TOP)/erts/doc/html/*
++ rm -rf $(ERL_TOP)/erts/doc/man1/*
++ rm -rf $(ERL_TOP)/erts/doc/man3/*
++ rm -rf $(ERL_TOP)/erts/doc/pdf/*
++ rm -rf $(ERL_TOP)/erts/doc/specs/*
+ rm -rf $(ERL_TOP)/erts/emulator/$(TARGET)
+ rm -rf $(ERL_TOP)/erts/emulator/obj
+ rm -rf $(ERL_TOP)/erts/emulator/pcre/$(TARGET)
Modified: erlang/branches/backport/debian/patches/docs.patch
===================================================================
--- erlang/branches/backport/debian/patches/docs.patch 2012-04-04 08:31:34 UTC (rev 1429)
+++ erlang/branches/backport/debian/patches/docs.patch 2012-04-23 13:34:06 UTC (rev 1430)
@@ -3,8 +3,8 @@
and a few bugs with docs installation.
Last-modified: Thu, 09 Dec 2010 10:45:56 +0300
---- 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
+--- erlang-15.b.1-dfsg.orig/lib/erl_docgen/priv/xsl/db_man.xsl
++++ erlang-15.b.1-dfsg/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-15.b-dfsg.orig/lib/megaco/doc/src/Makefile
-+++ erlang-15.b-dfsg/lib/megaco/doc/src/Makefile
+--- erlang-15.b.1-dfsg.orig/lib/megaco/doc/src/Makefile
++++ erlang-15.b.1-dfsg/lib/megaco/doc/src/Makefile
@@ -172,8 +172,6 @@
$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
@@ -34,8 +34,8 @@
release_spec:
---- erlang-15.b-dfsg.orig/lib/stdlib/doc/src/re.xml
-+++ erlang-15.b-dfsg/lib/stdlib/doc/src/re.xml
+--- erlang-15.b.1-dfsg.orig/lib/stdlib/doc/src/re.xml
++++ erlang-15.b.1-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
Modified: erlang/branches/backport/debian/patches/emacs.patch
===================================================================
--- erlang/branches/backport/debian/patches/emacs.patch 2012-04-04 08:31:34 UTC (rev 1429)
+++ erlang/branches/backport/debian/patches/emacs.patch 2012-04-23 13:34:06 UTC (rev 1430)
@@ -3,8 +3,8 @@
Also, it fixes manpage name regexp matching only 3erl manpages in
section 3.
---- erlang-15.b-dfsg.orig/lib/tools/emacs/erlang.el
-+++ erlang-15.b-dfsg/lib/tools/emacs/erlang.el
+--- erlang-15.b.1-dfsg.orig/lib/tools/emacs/erlang.el
++++ erlang-15.b.1-dfsg/lib/tools/emacs/erlang.el
@@ -496,8 +496,8 @@
(defvar erlang-man-dirs
'(("Man - Commands" "/man/man1" t)
Modified: erlang/branches/backport/debian/patches/gnu.patch
===================================================================
--- erlang/branches/backport/debian/patches/gnu.patch 2012-04-04 08:31:34 UTC (rev 1429)
+++ erlang/branches/backport/debian/patches/gnu.patch 2012-04-23 13:34:06 UTC (rev 1430)
@@ -11,9 +11,9 @@
(4) Switch some PATH_MAX occurrences to MAXPATHLEN;
---- erlang-15.b-dfsg.orig/erts/configure.in
-+++ erlang-15.b-dfsg/erts/configure.in
-@@ -378,7 +378,7 @@
+--- erlang-15.b.1-dfsg.orig/erts/configure.in
++++ erlang-15.b.1-dfsg/erts/configure.in
+@@ -433,7 +433,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.
-@@ -1120,7 +1120,7 @@
+@@ -1175,7 +1175,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-15.b-dfsg.orig/lib/os_mon/c_src/memsup.c
-+++ erlang-15.b-dfsg/lib/os_mon/c_src/memsup.c
+--- erlang-15.b.1-dfsg.orig/lib/os_mon/c_src/memsup.c
++++ erlang-15.b.1-dfsg/lib/os_mon/c_src/memsup.c
@@ -110,6 +110,11 @@
#include <memLib.h>
#endif
@@ -45,8 +45,8 @@
#ifdef BSD4_4
#include <sys/types.h>
#include <sys/sysctl.h>
---- erlang-15.b-dfsg.orig/erts/emulator/drivers/common/inet_drv.c
-+++ erlang-15.b-dfsg/erts/emulator/drivers/common/inet_drv.c
+--- erlang-15.b.1-dfsg.orig/erts/emulator/drivers/common/inet_drv.c
++++ erlang-15.b.1-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-15.b-dfsg.orig/erts/etc/common/erlexec.c
-+++ erlang-15.b-dfsg/erts/etc/common/erlexec.c
+--- erlang-15.b.1-dfsg.orig/erts/etc/common/erlexec.c
++++ erlang-15.b.1-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-15.b-dfsg.orig/erts/etc/common/escript.c
-+++ erlang-15.b-dfsg/erts/etc/common/escript.c
+--- erlang-15.b.1-dfsg.orig/erts/etc/common/escript.c
++++ erlang-15.b.1-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-15.b-dfsg.orig/erts/etc/unix/dyn_erl.c
-+++ erlang-15.b-dfsg/erts/etc/unix/dyn_erl.c
+--- erlang-15.b.1-dfsg.orig/erts/etc/unix/dyn_erl.c
++++ erlang-15.b.1-dfsg/erts/etc/unix/dyn_erl.c
@@ -149,8 +149,8 @@
static char *
find_prog(char *origpath)
Modified: erlang/branches/backport/debian/patches/hppa.patch
===================================================================
--- erlang/branches/backport/debian/patches/hppa.patch 2012-04-04 08:31:34 UTC (rev 1429)
+++ erlang/branches/backport/debian/patches/hppa.patch 2012-04-23 13:34:06 UTC (rev 1430)
@@ -6,9 +6,9 @@
Forwarded: no
Last-updated: Mon, 22 Feb 2010 10:34:34 +0300
---- erlang-15.b-dfsg.orig/erts/configure.in
-+++ erlang-15.b-dfsg/erts/configure.in
-@@ -1837,6 +1837,14 @@
+--- erlang-15.b.1-dfsg.orig/erts/configure.in
++++ erlang-15.b.1-dfsg/erts/configure.in
+@@ -1892,6 +1892,14 @@
AC_CHECK_DECLS([posix2time],,,[#include <time.h>])
disable_vfork=false
Modified: erlang/branches/backport/debian/patches/java.patch
===================================================================
--- erlang/branches/backport/debian/patches/java.patch 2012-04-04 08:31:34 UTC (rev 1429)
+++ erlang/branches/backport/debian/patches/java.patch 2012-04-23 13:34:06 UTC (rev 1430)
@@ -6,9 +6,9 @@
Forwarded: yes
Last-updated: Sat, 13 Feb 2010 10:08:42 +0300
---- erlang-15.b-dfsg.orig/erts/configure.in
-+++ erlang-15.b-dfsg/erts/configure.in
-@@ -4231,7 +4231,8 @@
+--- erlang-15.b.1-dfsg.orig/erts/configure.in
++++ erlang-15.b.1-dfsg/erts/configure.in
+@@ -4354,7 +4354,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-15.b-dfsg.orig/lib/test_server/src/configure.in
-+++ erlang-15.b-dfsg/lib/test_server/src/configure.in
+--- erlang-15.b.1-dfsg.orig/lib/test_server/src/configure.in
++++ erlang-15.b.1-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/branches/backport/debian/patches/m68k.patch
===================================================================
--- erlang/branches/backport/debian/patches/m68k.patch 2012-04-04 08:31:34 UTC (rev 1429)
+++ erlang/branches/backport/debian/patches/m68k.patch 2012-04-23 13:34:06 UTC (rev 1430)
@@ -7,8 +7,8 @@
(2) Non-working networking besause of blind conversion of long to a pointer.
---- erlang-15.b-dfsg.orig/erts/emulator/beam/binary.c
-+++ erlang-15.b-dfsg/erts/emulator/beam/binary.c
+--- erlang-15.b.1-dfsg.orig/erts/emulator/beam/binary.c
++++ erlang-15.b.1-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-15.b-dfsg.orig/erts/emulator/beam/erl_driver.h
-+++ erlang-15.b-dfsg/erts/emulator/beam/erl_driver.h
-@@ -589,7 +589,7 @@
+--- erlang-15.b.1-dfsg.orig/erts/emulator/beam/erl_driver.h
++++ erlang-15.b.1-dfsg/erts/emulator/beam/erl_driver.h
+@@ -595,7 +595,7 @@
EXTERN ErlDrvTermData driver_caller(ErlDrvPort);
extern const ErlDrvTermData driver_term_nil;
EXTERN ErlDrvTermData driver_mk_term_nil(void);
Modified: erlang/branches/backport/debian/patches/man.patch
===================================================================
--- erlang/branches/backport/debian/patches/man.patch 2012-04-04 08:31:34 UTC (rev 1429)
+++ erlang/branches/backport/debian/patches/man.patch 2012-04-23 13:34:06 UTC (rev 1430)
@@ -4,8 +4,8 @@
(Erlang manual pages are placed to /usr/share/man/ hierarchy
as required by Debian policy.)
---- erlang-15.b-dfsg.orig/erts/etc/common/erlexec.c
-+++ erlang-15.b-dfsg/erts/etc/common/erlexec.c
+--- erlang-15.b.1-dfsg.orig/erts/etc/common/erlexec.c
++++ erlang-15.b.1-dfsg/erts/etc/common/erlexec.c
@@ -728,8 +728,10 @@
error("-man not supported on Windows");
#else
Modified: erlang/branches/backport/debian/patches/powerpc.patch
===================================================================
--- erlang/branches/backport/debian/patches/powerpc.patch 2012-04-04 08:31:34 UTC (rev 1429)
+++ erlang/branches/backport/debian/patches/powerpc.patch 2012-04-23 13:34:06 UTC (rev 1430)
@@ -2,9 +2,9 @@
Description: Patch defines HiPE architecture ppc for powerpc arch.
Last-Modified: Mon, 08 Mar 2010 12:23:16 +0300
---- erlang-15.b-dfsg.orig/erts/configure.in
-+++ erlang-15.b-dfsg/erts/configure.in
-@@ -565,6 +565,7 @@
+--- erlang-15.b.1-dfsg.orig/erts/configure.in
++++ erlang-15.b.1-dfsg/erts/configure.in
+@@ -620,6 +620,7 @@
x86_64) ARCH=amd64;;
amd64) ARCH=amd64;;
macppc) ARCH=ppc;;
Modified: erlang/branches/backport/debian/patches/rpath.patch
===================================================================
--- erlang/branches/backport/debian/patches/rpath.patch 2012-04-04 08:31:34 UTC (rev 1429)
+++ erlang/branches/backport/debian/patches/rpath.patch 2012-04-23 13:34:06 UTC (rev 1430)
@@ -4,9 +4,9 @@
Forwarded: no
Last-modified:Sat, 27 Feb 2010 09:34:43 +0300
---- erlang-15.b-dfsg.orig/erts/configure.in
-+++ erlang-15.b-dfsg/erts/configure.in
-@@ -4089,9 +4089,9 @@
+--- erlang-15.b.1-dfsg.orig/erts/configure.in
++++ erlang-15.b.1-dfsg/erts/configure.in
+@@ -4212,9 +4212,9 @@
SSL_CC_RUNTIME_LIBRARY_PATH=
SSL_LD_RUNTIME_LIBRARY_PATH=
SSL_DED_LD_RUNTIME_LIBRARY_PATH=
Modified: erlang/branches/backport/debian/patches/sparc.patch
===================================================================
--- erlang/branches/backport/debian/patches/sparc.patch 2012-04-04 08:31:34 UTC (rev 1429)
+++ erlang/branches/backport/debian/patches/sparc.patch 2012-04-23 13:34:06 UTC (rev 1430)
@@ -5,9 +5,9 @@
(2) Fixes FTBFS(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=328031).
---- erlang-15.b-dfsg.orig/erts/configure.in
-+++ erlang-15.b-dfsg/erts/configure.in
-@@ -554,7 +554,7 @@
+--- erlang-15.b.1-dfsg.orig/erts/configure.in
++++ erlang-15.b.1-dfsg/erts/configure.in
+@@ -609,7 +609,7 @@
fi
case $chk_arch_ in
@@ -16,9 +16,9 @@
sparc64) ARCH=sparc64;;
sun4v) ARCH=ultrasparc;;
i86pc) ARCH=x86;;
---- 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 @@
+--- erlang-15.b.1-dfsg.orig/erts/emulator/beam/beam_emu.c
++++ erlang-15.b.1-dfsg/erts/emulator/beam/beam_emu.c
+@@ -1031,16 +1031,6 @@
* in registers.
*/
@@ -35,11 +35,11 @@
# define REG_x0
# define REG_xregs
# define REG_htop
-@@ -1048,7 +1038,6 @@
+@@ -1049,7 +1039,6 @@
# define REG_fcalls
# define REG_tmp_arg1
# define REG_tmp_arg2
-#endif
- /*
- * process_main() is called twice:
+ #ifdef USE_VM_PROBES
+ # define USE_VM_CALL_PROBES
Modified: erlang/branches/backport/debian/patterns/erlang-dev.patterns
===================================================================
--- erlang/branches/backport/debian/patterns/erlang-dev.patterns 2012-04-04 08:31:34 UTC (rev 1429)
+++ erlang/branches/backport/debian/patterns/erlang-dev.patterns 2012-04-23 13:34:06 UTC (rev 1430)
@@ -11,6 +11,7 @@
./usr/lib/erlang/lib/cosTransactions-.*/include/
./usr/lib/erlang/lib/diameter-.*/include/
./usr/lib/erlang/lib/edoc-.*/include/
+./usr/lib/erlang/lib/eldap-.*/include/
./usr/lib/erlang/lib/erl_interface-.*/include/
./usr/lib/erlang/lib/erl_interface-.*/lib/
./usr/lib/erlang/lib/et-.*/include/
Copied: erlang/branches/backport/debian/patterns/erlang-eldap.patterns (from rev 1429, erlang/tags/1:15.b.1-dfsg-1/debian/patterns/erlang-eldap.patterns)
===================================================================
--- erlang/branches/backport/debian/patterns/erlang-eldap.patterns (rev 0)
+++ erlang/branches/backport/debian/patterns/erlang-eldap.patterns 2012-04-23 13:34:06 UTC (rev 1430)
@@ -0,0 +1 @@
+./usr/lib/erlang/lib/eldap-.*/
Modified: erlang/branches/backport/debian/patterns/erlang-src.patterns
===================================================================
--- erlang/branches/backport/debian/patterns/erlang-src.patterns 2012-04-04 08:31:34 UTC (rev 1429)
+++ erlang/branches/backport/debian/patterns/erlang-src.patterns 2012-04-23 13:34:06 UTC (rev 1430)
@@ -18,6 +18,8 @@
./usr/lib/erlang/lib/dialyzer-.*/src/
./usr/lib/erlang/lib/diameter-.*/src/
./usr/lib/erlang/lib/edoc-.*/src/
+./usr/lib/erlang/lib/eldap-.*/asn1/
+./usr/lib/erlang/lib/eldap-.*/src/
./usr/lib/erlang/lib/erl_interface-.*/src/
./usr/lib/erlang/lib/erts-.*/src/
./usr/lib/erlang/lib/et-.*/src/
Modified: erlang/branches/backport/debian/rules
===================================================================
--- erlang/branches/backport/debian/rules 2012-04-04 08:31:34 UTC (rev 1429)
+++ erlang/branches/backport/debian/rules 2012-04-23 13:34:06 UTC (rev 1430)
@@ -520,8 +520,8 @@
binary: binary-indep binary-arch
-REL=R15B
-DEB_REL=15.b-dfsg
+REL=R15B01
+DEB_REL=15.b.1-dfsg
get-orig-source:
CURDIR=`pwd` && TMPDIR=`mktemp -d /tmp/erlang.XXXXXX` && \
Modified: erlang/branches/backport/debian/scripts/analyse
===================================================================
--- erlang/branches/backport/debian/scripts/analyse 2012-04-04 08:31:34 UTC (rev 1429)
+++ erlang/branches/backport/debian/scripts/analyse 2012-04-23 13:34:06 UTC (rev 1430)
@@ -56,7 +56,7 @@
cut -c 20- >> debian/erlang-dev.install
PACKAGES='appmon asn1 common-test corba crypto debugger dialyzer diameter
- edoc erl-docgen et eunit gs ic-java ic inets inviso jinterface megaco mnesia
+ edoc eldap 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
typer webtool wx xmerl'
More information about the Pkg-erlang-commits
mailing list