[Pkg-erlang-commits] r1832 - in erlang/trunk: . debian debian/manpages debian/patches debian/patterns debian/scripts
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Sat Sep 3 17:15:04 UTC 2016
Author: sgolovan
Date: 2016-09-03 17:15:04 +0000 (Sat, 03 Sep 2016)
New Revision: 1832
Removed:
erlang/trunk/debian/erlang-webtool.links.in
erlang/trunk/debian/erlang-webtool.manpages
erlang/trunk/debian/patterns/erlang-test-server.patterns
erlang/trunk/debian/patterns/erlang-webtool.patterns
Modified:
erlang/trunk/
erlang/trunk/debian/changelog
erlang/trunk/debian/control
erlang/trunk/debian/erlang-manpages.postinst
erlang/trunk/debian/manpages/erlang-depends.1
erlang/trunk/debian/patches/beamload.patch
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/series
erlang/trunk/debian/patches/sparc.patch
erlang/trunk/debian/patterns/erlang-dev.patterns
erlang/trunk/debian/patterns/erlang-src.patterns
erlang/trunk/debian/rules
erlang/trunk/debian/scripts/analyse
Log:
[erlang]
* Merge the experimental branch for uploading into unstable.
Property changes on: erlang/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental:1283-1305,1468-1497,1591-1615,1693-1702
/erlang/trunk:1274-1282
+ /erlang/branches/experimental:1283-1305,1468-1497,1591-1615,1693-1702
/erlang/branches/r19rc:1778-1831
/erlang/trunk:1274-1282
Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog 2016-09-03 11:26:31 UTC (rev 1831)
+++ erlang/trunk/debian/changelog 2016-09-03 17:15:04 UTC (rev 1832)
@@ -1,9 +1,60 @@
-erlang (1:18.3.4.4+dfsg-2) UNRELEASED; urgency=medium
+erlang (1:19.0.5+dfsg-3) UNRELEASED; urgency=medium
* NOT RELEASED YET
- -- Sergei Golovan <sgolovan at debian.org> Sat, 13 Aug 2016 12:14:10 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Sat, 03 Sep 2016 13:03:26 +0300
+erlang (1:19.0.5+dfsg-2) experimental; urgency=medium
+
+ * Dropped the erlang-test-server binary package since the corresponding
+ application has been removed from the upstream distribution.
+ * Adjusted the binary packages interdependencies.
+
+ -- Sergei Golovan <sgolovan at debian.org> Sat, 03 Sep 2016 11:47:54 +0300
+
+erlang (1:19.0.5+dfsg-1) experimental; urgency=medium
+
+ * New upstream bugfix release.
+
+ -- Sergei Golovan <sgolovan at debian.org> Thu, 18 Aug 2016 09:30:31 +0300
+
+erlang (1:19.0.4+dfsg-1) experimental; urgency=medium
+
+ * New upstream bugfix release.
+ * Dropped the erlang-webtool binary package since the corresponding
+ application has been removed from the upstream distribution.
+
+ -- Sergei Golovan <sgolovan at debian.org> Sat, 13 Aug 2016 10:52:09 +0300
+
+erlang (1:19.0.2+dfsg-1) experimental; urgency=medium
+
+ * New upstream bugfix release.
+
+ -- Sergei Golovan <sgolovan at debian.org> Fri, 15 Jul 2016 15:57:00 +0300
+
+erlang (1:19.0.1+dfsg-1) experimental; urgency=medium
+
+ * New upstream bugfix release.
+ * Disabled HiPE for the sparc64 architecture because it causes FTBFS.
+
+ -- Sergei Golovan <sgolovan at debian.org> Thu, 30 Jun 2016 16:36:21 +0300
+
+erlang (1:19.0+dfsg-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Upload to experimental.
+ * Enabled HiPE for the ppc64, ppc64el, and sparc64 architectures.
+ * Bumped Java bytecode compatibility level to 1.7.
+
+ -- Sergei Golovan <sgolovan at debian.org> Wed, 29 Jun 2016 10:59:29 +0300
+
+erlang (1:19.0~rc2+dfsg-1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Upload to experimental.
+
+ -- Sergei Golovan <sgolovan at debian.org> Wed, 15 Jun 2016 15:31:10 +0300
+
erlang (1:18.3.4.4+dfsg-1) unstable; urgency=medium
* New upstream minor release.
Modified: erlang/trunk/debian/control
===================================================================
--- erlang/trunk/debian/control 2016-09-03 11:26:31 UTC (rev 1831)
+++ erlang/trunk/debian/control 2016-09-03 17:15:04 UTC (rev 1832)
@@ -40,7 +40,7 @@
Priority: extra
Depends: procps, adduser, ${shlibs:Depends}, ${misc:Depends}
Recommends: ${libsctp:Version}, erlang-crypto (= ${binary:Version}), erlang-syntax-tools (= ${binary:Version})
-Suggests: erlang-edoc (= ${binary:Version}), erlang-gs (= ${binary:Version}), erlang-tools (= ${binary:Version}), erlang, erlang-manpages, erlang-doc
+Suggests: erlang-tools (= ${binary:Version}), erlang, erlang-manpages, erlang-doc
Conflicts: erlang (<< ${source:Version}), erlang-base, erlang-doc (<< ${source:Upstream-Version}), erlang-doc (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2), erlang-doc-html (<< 1:13.b.4)
Replaces: erlang (<< ${source:Version}), erlang-base, erlang-nox (<< ${source:Version}), erlang-x11 (<< ${source: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), erlang-doc-html (<< 1:13.b.4)
Provides: erlang-abi-17.0, erlang-abi-15.b
@@ -68,7 +68,7 @@
Package: erlang-common-test
Architecture: any
-Depends: ${erlang-base}, erlang-crypto (= ${binary:Version}), erlang-debugger (= ${binary:Version}), erlang-inets (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), erlang-snmp (= ${binary:Version}), erlang-ssh (= ${binary:Version}), erlang-test-server (= ${binary:Version}), erlang-tools (= ${binary:Version}), erlang-webtool (= ${binary:Version}), erlang-xmerl (= ${binary:Version}), libjs-jquery, libjs-jquery-tablesorter, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-crypto (= ${binary:Version}), erlang-debugger (= ${binary:Version}), erlang-inets (= ${binary:Version}), erlang-observer (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), erlang-snmp (= ${binary:Version}), erlang-ssh (= ${binary:Version}), erlang-syntax-tools (= ${binary:Version}), erlang-tools (= ${binary:Version}), erlang-xmerl (= ${binary:Version}), libjs-jquery, libjs-jquery-tablesorter, ${shlibs:Depends}, ${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 automated testing
@@ -308,7 +308,7 @@
Package: erlang-observer
Architecture: any
-Depends: ${erlang-base}, erlang-et (= ${binary:Version}), erlang-inets (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), erlang-webtool (= ${binary:Version}), erlang-wx (= ${binary:Version}), ${misc:Depends}
+Depends: ${erlang-base}, erlang-et (= ${binary:Version}), erlang-inets (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), erlang-wx (= ${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 investigating distributed systems
@@ -409,7 +409,7 @@
Package: erlang-ssh
Architecture: any
-Depends: ${erlang-base}, erlang-crypto (= ${binary:Version}), erlang-public-key (= ${binary:Version}), ${misc:Depends}
+Depends: ${erlang-base}, erlang-crypto (= ${binary:Version}), erlang-public-key (= ${binary:Version}), erlang-runtime-tools (= ${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
@@ -420,7 +420,7 @@
Package: erlang-ssl
Architecture: any
Depends: ${erlang-base}, erlang-crypto (= ${binary:Version}), erlang-public-key (= ${binary:Version}), ${misc:Depends}
-Suggests: erlang, erlang-manpages, erlang-doc
+Suggests: erlang-inets (= ${binary:Version}), 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 SSL
The SSL application provides secure communication over sockets.
@@ -440,22 +440,9 @@
automatic code-cleaner.
-Package: erlang-test-server
-Architecture: any
-Depends: ${erlang-base}, erlang-inets (= ${binary:Version}), erlang-observer (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), erlang-tools (= ${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 server for automated application testing
- Test Server is a portable test server for automated application testing.
- The server can run test suites on local or remote targets and log
- progress and results to HTML pages. The main purpose of Test Server
- is to act as engine inside customized test tools. A callback interface
- for such framework applications is provided.
-
-
Package: erlang-tools
Architecture: any
-Depends: ${erlang-base}, erlang-inets (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), erlang-webtool (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-runtime-tools (= ${binary:Version}), ${shlibs:Depends}, ${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 various tools
@@ -490,16 +477,6 @@
in Erlang code. It uses Dialyzer to infer variable types.
-Package: erlang-webtool
-Architecture: any
-Depends: ${erlang-base}, erlang-inets (= ${binary:Version}), ${misc:Depends}
-Suggests: erlang-observer (= ${binary:Version}), 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 helper for web-based tools
- WebTool provides an easy way to use web-based tools with Erlang/OTP.
- It configures and starts a web server as well as all available tools.
-
-
Package: erlang-wx
Architecture: any
Depends: ${erlang-base}, ${shlibs:Depends}, ${misc:Depends}
@@ -591,7 +568,7 @@
erlang-ic, erlang-inets, 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,
- erlang-webtool, erlang-xmerl, ${misc:Depends}
+ erlang-xmerl, ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc
Description: Erlang/OTP applications that don't require X Window System
This package is a dummy package which will install all Erlang/OTP
@@ -603,7 +580,7 @@
Depends: erlang-base | erlang-base-hipe, erlang-nox,
erlang-common-test, erlang-debugger, erlang-dialyzer, erlang-et, erlang-gs,
erlang-megaco, erlang-observer, erlang-reltool,
- erlang-test-server, erlang-typer, erlang-wx,
+ erlang-typer, erlang-wx,
${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc
Description: Erlang/OTP applications that require X Window System
@@ -621,9 +598,8 @@
erlang-megaco, erlang-mnesia, erlang-observer, erlang-odbc,
erlang-os-mon, erlang-parsetools, erlang-percept,
erlang-public-key, erlang-reltool, erlang-runtime-tools, erlang-snmp,
- erlang-ssh, erlang-ssl, erlang-syntax-tools, erlang-test-server,
- erlang-tools, erlang-typer, erlang-webtool,
- erlang-wx, erlang-xmerl, ${misc:Depends}
+ erlang-ssh, erlang-ssl, erlang-syntax-tools,
+ erlang-tools, erlang-typer, erlang-wx, erlang-xmerl, ${misc:Depends}
Recommends: erlang-jinterface, erlang-ic-java, erlang-mode, erlang-src,
erlang-examples
Suggests: erlang-manpages, erlang-doc
Modified: erlang/trunk/debian/erlang-manpages.postinst
===================================================================
--- erlang/trunk/debian/erlang-manpages.postinst 2016-09-03 11:26:31 UTC (rev 1831)
+++ erlang/trunk/debian/erlang-manpages.postinst 2016-09-03 17:15:04 UTC (rev 1832)
@@ -13,8 +13,7 @@
erlc \
escript \
run_erl \
- start \
- start_webtool ; do
+ start ; do
dpkg-divert --package erlang-manpages --remove --rename \
--divert /usr/share/man/man1/$name.erlang.1.gz \
/usr/share/man/man1/$name.1.gz >/dev/null
Deleted: erlang/trunk/debian/erlang-webtool.links.in
===================================================================
--- erlang/trunk/debian/erlang-webtool.links.in 2016-09-03 11:26:31 UTC (rev 1831)
+++ erlang/trunk/debian/erlang-webtool.links.in 2016-09-03 17:15:04 UTC (rev 1832)
@@ -1 +0,0 @@
-usr/lib/erlang/lib/webtool- at WEBTOOL_VSN@/priv/bin/start_webtool usr/bin/start_webtool
Deleted: erlang/trunk/debian/erlang-webtool.manpages
===================================================================
--- erlang/trunk/debian/erlang-webtool.manpages 2016-09-03 11:26:31 UTC (rev 1831)
+++ erlang/trunk/debian/erlang-webtool.manpages 2016-09-03 17:15:04 UTC (rev 1832)
@@ -1 +0,0 @@
-debian/erlang-docs/usr/lib/erlang/man/man1/start_webtool.1
Modified: erlang/trunk/debian/manpages/erlang-depends.1
===================================================================
--- erlang/trunk/debian/manpages/erlang-depends.1 2016-09-03 11:26:31 UTC (rev 1831)
+++ erlang/trunk/debian/manpages/erlang-depends.1 2016-09-03 17:15:04 UTC (rev 1832)
@@ -125,7 +125,7 @@
.\" ========================================================================
.\"
.IX Title "ERLANG-DEPENDS 1"
-.TH ERLANG-DEPENDS 1 "2014\-10\-05" "1:17.3\-dfsg\-2" "Erlang packages for Debian GNU/Linux"
+.TH ERLANG-DEPENDS 1 "2016\-09\-03" "1:19.0.5\-dfsg\-2" "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
@@ -180,10 +180,8 @@
${erlang\-ssh:Depends},
${erlang\-ssl:Depends},
${erlang\-syntax-tools:Depends},
-${erlang\-test-server:Depends},
${erlang\-tools:Depends},
${erlang\-typer:Depends},
-${erlang\-webtool:Depends},
${erlang\-wx:Depends},
${erlang\-xmerl:Depends}.
.PP
@@ -211,6 +209,14 @@
were dropped in version 1:17.3\-dfsg\-2 of erlang\-dev package because the
pman, toolbar and tv applications were removed from the Erlang distribution.
.PP
+Variable ${erlang\-webtool:Depends} was dropped in version 1:19.0.4+dfsg\-1
+of erlang\-dev package because the webtool application was removed from the
+Erlang distribution.
+.PP
+Variable ${erlang\-test\-server:Depends} was dropped in version 1:19.0.5+dfsg\-2
+of erlang\-dev package because the test_server application was removed from the
+Erlang distribution.
+.PP
For compatibility with older versions the variables
${erlang\-nox:Depends} and ${erlang\-x11:Depends} also work (even since the
corresponding packages turned into dummy packages).
Property changes on: erlang/trunk/debian/manpages/erlang-depends.1
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/manpages/erlang-depends.1:1283-1305,1468-1497,1591-1615
/erlang/trunk/debian/manpages/erlang-depends.1:1274-1282
+ /erlang/branches/experimental/debian/manpages/erlang-depends.1:1283-1305,1468-1497,1591-1615
/erlang/branches/r19rc/debian/manpages/erlang-depends.1:1778-1831
/erlang/trunk/debian/manpages/erlang-depends.1:1274-1282
Modified: erlang/trunk/debian/patches/beamload.patch
===================================================================
--- erlang/trunk/debian/patches/beamload.patch 2016-09-03 11:26:31 UTC (rev 1831)
+++ erlang/trunk/debian/patches/beamload.patch 2016-09-03 17:15:04 UTC (rev 1832)
@@ -4,7 +4,7 @@
--- a/erts/emulator/beam/beam_load.c
+++ b/erts/emulator/beam/beam_load.c
-@@ -45,7 +45,7 @@
+@@ -46,7 +46,7 @@
#include "hipe_arch.h"
#endif
Modified: erlang/trunk/debian/patches/clean.patch
===================================================================
--- erlang/trunk/debian/patches/clean.patch 2016-09-03 11:26:31 UTC (rev 1831)
+++ erlang/trunk/debian/patches/clean.patch 2016-09-03 17:15:04 UTC (rev 1832)
@@ -5,7 +5,7 @@
--- a/Makefile.in
+++ b/Makefile.in
-@@ -1093,6 +1093,7 @@
+@@ -1080,6 +1080,7 @@
rm -f *~ *.bak config.log config.status prebuilt.files ibin/*
cd erts && ERL_TOP=$(ERL_TOP) $(MAKE) clean
cd lib && ERL_TOP=$(ERL_TOP) $(MAKE) clean BUILD_ALL=true
@@ -13,7 +13,7 @@
distclean: clean
find . -type f -name SKIP -print | xargs $(RM)
-@@ -1134,3 +1135,209 @@
+@@ -1121,3 +1122,206 @@
|| $(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT) bootstrap_root_clean
# ----------------------------------------------------------------------
@@ -32,7 +32,6 @@
+ rm -rf $(ERL_TOP)/bootstrap/lib/sasl
+ rm -rf $(ERL_TOP)/bootstrap/lib/snmp
+ 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
@@ -168,10 +167,8 @@
+ rm -rf $(ERL_TOP)/lib/ssh/ebin/ssh_sftpd_file_api.beam
+ rm -rf $(ERL_TOP)/lib/ssl/doc/man6/ssl.6
+ rm -rf $(ERL_TOP)/lib/ssl/ebin/ssl_session_cache_api.beam
-+ 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
-+ rm -rf $(ERL_TOP)/lib/webtool/ebin/webtool.appup
+ rm -rf $(ERL_TOP)/lib/wx/config.log
+ rm -rf $(ERL_TOP)/lib/wx/config.mk
+ rm -rf $(ERL_TOP)/lib/wx/c_src/$(TARGET)
Modified: erlang/trunk/debian/patches/docs.patch
===================================================================
--- erlang/trunk/debian/patches/docs.patch 2016-09-03 11:26:31 UTC (rev 1831)
+++ erlang/trunk/debian/patches/docs.patch 2016-09-03 17:15:04 UTC (rev 1832)
@@ -36,34 +36,32 @@
--- a/lib/stdlib/doc/src/re.xml
+++ b/lib/stdlib/doc/src/re.xml
-@@ -377,7 +377,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
-- metacharacter. It does not affect \A.</item>
-+ metacharacter. It does not affect \\A.</item>
-
- <tag><c>noteol</c></tag>
-
-@@ -386,8 +386,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
-- behavior of the dollar metacharacter. It does not affect \Z or
-- \z.</item>
-+ behavior of the dollar metacharacter. It does not affect \\Z or
-+ \\z.</item>
-
- <tag><c>report_errors</c></tag>
-
+@@ -573,7 +573,7 @@
+ to 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 metacharacter. It does not
+- affect \A.</p>
++ affect \\A.</p>
+ </item>
+ <tag><c>noteol</c></tag>
+ <item>
+@@ -582,7 +582,7 @@
+ 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 behavior of the dollar
+- metacharacter. It does not affect \Z or \z.</p>
++ metacharacter. It does not affect \\Z or \\z.</p>
+ </item>
+ <tag><c>report_errors</c></tag>
+ <item>
--- a/lib/tools/Makefile
+++ b/lib/tools/Makefile
@@ -24,7 +24,7 @@
# Macros
# ----------------------------------------------------
--SUB_DIRECTORIES = c_src src doc/src examples priv emacs
-+SUB_DIRECTORIES = c_src src examples priv emacs doc/src
+-SUB_DIRECTORIES = c_src src doc/src examples emacs
++SUB_DIRECTORIES = c_src src examples emacs doc/src
include vsn.mk
VSN = $(TOOLS_VSN)
Modified: erlang/trunk/debian/patches/emacs.patch
===================================================================
--- erlang/trunk/debian/patches/emacs.patch 2016-09-03 11:26:31 UTC (rev 1831)
+++ erlang/trunk/debian/patches/emacs.patch 2016-09-03 17:15:04 UTC (rev 1832)
@@ -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
-@@ -1292,23 +1292,22 @@
+@@ -1304,23 +1304,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.
-@@ -2031,7 +2030,7 @@
+@@ -2052,7 +2051,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 '()
-@@ -2042,7 +2041,7 @@
+@@ -2063,7 +2062,7 @@
(defun erlang-man-get-files (dir)
"Return files in directory DIR."
@@ -62,7 +62,7 @@
(defun erlang-man-module (&optional module)
-@@ -2062,7 +2061,7 @@
+@@ -2083,7 +2082,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))
-@@ -2203,9 +2202,9 @@
+@@ -2224,9 +2223,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 2016-09-03 11:26:31 UTC (rev 1831)
+++ erlang/trunk/debian/patches/gnu.patch 2016-09-03 17:15:04 UTC (rev 1832)
@@ -13,7 +13,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -464,7 +464,7 @@
+@@ -415,7 +415,7 @@
dnl NOTE: CPPFLAGS will be included in CFLAGS at the end
case $host_os in
@@ -22,10 +22,10 @@
win32)
# The ethread library requires _WIN32_WINNT of at least 0x0403.
# -D_WIN32_WINNT=* from CPPFLAGS is saved in ETHR_DEFS.
-@@ -1339,7 +1339,7 @@
- solaris*)
- enable_child_waiter_thread=yes
- ;;
+@@ -1245,7 +1245,7 @@
+ fi
+
+ case $host_os in
- linux*)
+ linux*|*gnu*)
AC_MSG_CHECKING([whether dlopen() needs to be called before first call to dlerror()])
@@ -47,21 +47,21 @@
#include <sys/sysctl.h>
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
-@@ -723,6 +723,11 @@
- (((unsigned char*) (s))[1] << 8) | \
- (((unsigned char*) (s))[0]))
-
+@@ -609,6 +609,11 @@
+ for (i = 0; i < n; i++) if (s[i] != '\0') return !0;
+ return 0;
+ }
+#ifdef __GNU__
+#warning "Undefined AF_LINK for GNU/Hurd"
+#undef AF_LINK
+#endif
+
- #ifdef VALGRIND
- # include <valgrind/memcheck.h>
+ #endif
+
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
-@@ -1581,7 +1581,7 @@
+@@ -1606,7 +1606,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';
-@@ -1595,7 +1595,7 @@
+@@ -1620,7 +1620,7 @@
if (!rootdir) {
/* Determine rootdir from absolute path to bindir */
char *p;
Modified: erlang/trunk/debian/patches/hppa.patch
===================================================================
--- erlang/trunk/debian/patches/hppa.patch 2016-09-03 11:26:31 UTC (rev 1831)
+++ erlang/trunk/debian/patches/hppa.patch 2016-09-03 17:15:04 UTC (rev 1832)
@@ -8,7 +8,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -2184,6 +2184,14 @@
+@@ -2062,6 +2062,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 2016-09-03 11:26:31 UTC (rev 1831)
+++ erlang/trunk/debian/patches/java.patch 2016-09-03 17:15:04 UTC (rev 1832)
@@ -8,7 +8,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -4761,7 +4761,8 @@
+@@ -4648,7 +4648,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,
@@ -18,15 +18,3 @@
ac_cv_prog_javac_ver_1_6=yes, ac_cv_prog_javac_ver_1_6=no)])
if test $ac_cv_prog_javac_ver_1_6 = no; then
unset -v JAVAC
---- a/lib/test_server/src/configure.in
-+++ b/lib/test_server/src/configure.in
-@@ -485,7 +485,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,
-- [ERL_TRY_LINK_JAVA([], [for (String i : args);],
-+ [ERL_TRY_LINK_JAVA([], [for (String i : args);
-+ int[] values = {}; String s = new String(values, 0, values.length);],
- 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
Modified: erlang/trunk/debian/patches/man.patch
===================================================================
--- erlang/trunk/debian/patches/man.patch 2016-09-03 11:26:31 UTC (rev 1831)
+++ erlang/trunk/debian/patches/man.patch 2016-09-03 17:15:04 UTC (rev 1832)
@@ -6,7 +6,7 @@
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
-@@ -728,8 +728,10 @@
+@@ -737,8 +737,10 @@
error("-man not supported on Windows");
#else
argv[i] = "man";
Modified: erlang/trunk/debian/patches/series
===================================================================
--- erlang/trunk/debian/patches/series 2016-09-03 11:26:31 UTC (rev 1831)
+++ erlang/trunk/debian/patches/series 2016-09-03 17:15:04 UTC (rev 1832)
@@ -9,5 +9,4 @@
javascript.patch
wx3.0-constants.patch
beamload.patch
-reproducible-build.patch
x32.patch
Modified: erlang/trunk/debian/patches/sparc.patch
===================================================================
--- erlang/trunk/debian/patches/sparc.patch 2016-09-03 11:26:31 UTC (rev 1831)
+++ erlang/trunk/debian/patches/sparc.patch 2016-09-03 17:15:04 UTC (rev 1832)
@@ -7,7 +7,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -645,7 +645,7 @@
+@@ -594,7 +594,7 @@
fi
case $chk_arch_ in
@@ -18,27 +18,22 @@
i86pc) ARCH=x86;;
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
-@@ -997,16 +997,6 @@
+@@ -1086,19 +1086,11 @@
* in registers.
*/
-#if defined(__GNUC__) && defined(sparc) && !defined(DEBUG)
--# define REG_x0 asm("%l0")
-# define REG_xregs asm("%l1")
-# define REG_htop asm("%l2")
-# define REG_stop asm("%l3")
-# define REG_I asm("%l4")
-# define REG_fcalls asm("%l5")
--# define REG_tmp_arg1 asm("%l6")
--# define REG_tmp_arg2 asm("%l7")
-#else
- # define REG_x0
# define REG_xregs
# define REG_htop
-@@ -1015,7 +1005,6 @@
+ # define REG_stop
+ # define REG_I
# define REG_fcalls
- # define REG_tmp_arg1
- # define REG_tmp_arg2
-#endif
#ifdef USE_VM_PROBES
Modified: erlang/trunk/debian/patterns/erlang-dev.patterns
===================================================================
--- erlang/trunk/debian/patterns/erlang-dev.patterns 2016-09-03 11:26:31 UTC (rev 1831)
+++ erlang/trunk/debian/patterns/erlang-dev.patterns 2016-09-03 17:15:04 UTC (rev 1832)
@@ -33,6 +33,5 @@
./usr/lib/erlang/lib/runtime_tools-.*/include/
./usr/lib/erlang/lib/ssh-.*/include/
./usr/lib/erlang/lib/ssl-.*/include/
-./usr/lib/erlang/lib/test_server-.*/include/
./usr/lib/erlang/lib/wx-.*/include/
./usr/lib/erlang/lib/xmerl-.*/include/
Modified: erlang/trunk/debian/patterns/erlang-src.patterns
===================================================================
--- erlang/trunk/debian/patterns/erlang-src.patterns 2016-09-03 11:26:31 UTC (rev 1831)
+++ erlang/trunk/debian/patterns/erlang-src.patterns 2016-09-03 17:15:04 UTC (rev 1832)
@@ -59,11 +59,9 @@
./usr/lib/erlang/lib/ssl-.*/src/
./usr/lib/erlang/lib/stdlib-.*/src/
./usr/lib/erlang/lib/syntax_tools-.*/src/
-./usr/lib/erlang/lib/test_server-.*/src/
./usr/lib/erlang/lib/tools-.*/c_src/
./usr/lib/erlang/lib/tools-.*/src/
./usr/lib/erlang/lib/typer-.*/src/
-./usr/lib/erlang/lib/webtool-.*/src/
./usr/lib/erlang/lib/wx-.*/src/
./usr/lib/erlang/lib/xmerl-.*/src/
./usr/lib/erlang/releases/.*\.src
Deleted: erlang/trunk/debian/patterns/erlang-test-server.patterns
===================================================================
--- erlang/trunk/debian/patterns/erlang-test-server.patterns 2016-09-03 11:26:31 UTC (rev 1831)
+++ erlang/trunk/debian/patterns/erlang-test-server.patterns 2016-09-03 17:15:04 UTC (rev 1832)
@@ -1 +0,0 @@
-./usr/lib/erlang/lib/test_server-.*/
Deleted: erlang/trunk/debian/patterns/erlang-webtool.patterns
===================================================================
--- erlang/trunk/debian/patterns/erlang-webtool.patterns 2016-09-03 11:26:31 UTC (rev 1831)
+++ erlang/trunk/debian/patterns/erlang-webtool.patterns 2016-09-03 17:15:04 UTC (rev 1832)
@@ -1 +0,0 @@
-./usr/lib/erlang/lib/webtool-.*/
Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules 2016-09-03 11:26:31 UTC (rev 1831)
+++ erlang/trunk/debian/rules 2016-09-03 17:15:04 UTC (rev 1832)
@@ -16,7 +16,6 @@
-include ${ROOT_DIR}/lib/jinterface/vsn.mk
-include ${ROOT_DIR}/lib/ic/vsn.mk
-include ${ROOT_DIR}/lib/tools/vsn.mk
--include ${ROOT_DIR}/lib/webtool/vsn.mk
-include ${ROOT_DIR}/lib/common_test/vsn.mk
-include ${ROOT_DIR}/lib/snmp/vsn.mk
-include ${ROOT_DIR}/lib/hipe/vsn.mk
@@ -77,7 +76,7 @@
TYPE=
endif
-JAVA_OPTIONS=-source 1.7 -target 1.7
+JAVA_OPTIONS=-Xlint -source 1.7 -target 1.7
JOBS=4
@@ -299,13 +298,13 @@
dh_testdir
target=$$(basename $$(find make -type d |grep /)) ; \
PATH=$(ROOT_DIR)/bin:$$PATH ; \
- for m in lib/diameter lib/snmp lib/dialyzer lib/erl_interface lib/common_test lib/webtool erts ; do \
+ for m in lib/diameter lib/snmp lib/dialyzer lib/erl_interface lib/common_test erts ; do \
${MAKE} -j ${JOBS} -C $$m/doc/src man ERL_TOP=$(ROOT_DIR) TARGET=$$target ; \
done
#
install -d $(MAN_DIR)/man1 $(MAN_DIR)/man3 ; \
install lib/dialyzer/doc/man3/*.3 $(MAN_DIR)/man3 ; \
- for m in lib/diameter lib/snmp lib/erl_interface lib/common_test lib/webtool erts ; do \
+ for m in lib/diameter lib/snmp lib/erl_interface lib/common_test erts ; do \
install $$m/doc/man1/*.1 $(MAN_DIR)/man1 ; \
done
#
@@ -374,7 +373,6 @@
-e's/@EI_VSN@/$(EI_VSN)/g' \
-e's/@JINTERFACE_VSN@/$(JINTERFACE_VSN)/g' \
-e's/@IC_VSN@/$(IC_VSN)/g' \
- -e's/@WEBTOOL_VSN@/$(WEBTOOL_VSN)/g' \
-e's/@COMMON_TEST_VSN@/$(COMMON_TEST_VSN)/g' \
-e's/@SNMP_VSN@/$(SNMP_VSN)/g' \
-e's/@DIAMETER_VSN@/$(DIAMETER_VSN)/g' \
@@ -501,8 +499,7 @@
binary: binary-indep binary-arch
-REL=18.3.4.4
-RELDIR=$(REL)
+REL=19.0.5
DEB_REL=$(REL)+dfsg
get-orig-source:
Modified: erlang/trunk/debian/scripts/analyse
===================================================================
--- erlang/trunk/debian/scripts/analyse 2016-09-03 11:26:31 UTC (rev 1831)
+++ erlang/trunk/debian/scripts/analyse 2016-09-03 17:15:04 UTC (rev 1832)
@@ -58,8 +58,8 @@
PACKAGES='asn1 common-test corba crypto debugger dialyzer diameter
edoc eldap erl-docgen et eunit gs ic-java ic inets jinterface megaco mnesia
observer odbc os-mon parsetools percept public-key reltool
- runtime-tools snmp ssh ssl syntax-tools test-server tools
- typer webtool wx xmerl'
+ runtime-tools snmp ssh ssl syntax-tools tools
+ typer wx xmerl'
CMD='grep -v -E -e ./usr/lib/erlang/usr/include |
grep -v -E -f debian/patterns/erlang-base.patterns |
Property changes on: erlang/trunk/debian/scripts/analyse
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/scripts/analyse:1283-1305,1468-1497,1591-1615
/erlang/trunk/debian/scripts/analyse:1274-1282
+ /erlang/branches/experimental/debian/scripts/analyse:1283-1305,1468-1497,1591-1615
/erlang/branches/r19rc/debian/scripts/analyse:1778-1831
/erlang/trunk/debian/scripts/analyse:1274-1282
More information about the Pkg-erlang-commits
mailing list