[Pkg-erlang-commits] r1925 - in erlang/trunk/debian: . manpages patches patterns scripts
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Sun Jul 2 15:09:09 UTC 2017
Author: sgolovan
Date: 2017-07-02 15:09:08 +0000 (Sun, 02 Jul 2017)
New Revision: 1925
Removed:
erlang/trunk/debian/erlang-gs.lintian-overrides
erlang/trunk/debian/erlang-percept.lintian-overrides
erlang/trunk/debian/erlang-typer.links
erlang/trunk/debian/erlang-typer.manpages
erlang/trunk/debian/manpages/typer.1
erlang/trunk/debian/patterns/erlang-gs.patterns
erlang/trunk/debian/patterns/erlang-percept.patterns
erlang/trunk/debian/patterns/erlang-typer.patterns
Modified:
erlang/trunk/debian/changelog
erlang/trunk/debian/control
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/patches/x32.patch
erlang/trunk/debian/patterns/erlang-base-hipe.patterns
erlang/trunk/debian/patterns/erlang-base.patterns
erlang/trunk/debian/patterns/erlang-src.patterns
erlang/trunk/debian/rules
erlang/trunk/debian/scripts/analyse
Log:
[erlang]
* New upstream release.
* Removed the erlang-gs, erlang-percept and erlang-typer packages because
the corresponding Erlang gs, percept and typer applications are dropped
upstream.
* Since the typer binary is still built (and some tools like reltool
relies on its existence) move it to the erlang-base(-hipe) package.
Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/changelog 2017-07-02 15:09:08 UTC (rev 1925)
@@ -1,8 +1,13 @@
-erlang (1:19.2.1+dfsg-3) UNRELEASED; urgency=medium
+erlang (1:20.0+dfsg-1) unstable; urgency=medium
- * NOT RELEASED YET
+ * New upstream release.
+ * Removed the erlang-gs, erlang-percept and erlang-typer packages because
+ the corresponding Erlang gs, percept and typer applications are dropped
+ upstream.
+ * Since the typer binary is still built (and some tools like reltool
+ relies on its existence) move it to the erlang-base(-hipe) package.
- -- Sergei Golovan <sgolovan at debian.org> Fri, 24 Mar 2017 12:19:27 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Sun, 02 Jul 2017 16:46:08 +0300
erlang (1:19.2.1+dfsg-2) unstable; urgency=high
Modified: erlang/trunk/debian/control
===================================================================
--- erlang/trunk/debian/control 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/control 2017-07-02 15:09:08 UTC (rev 1925)
@@ -223,18 +223,6 @@
The EUnit application contains modules with support for unit testing.
-Package: erlang-gs
-Architecture: any
-Depends: ${erlang-base}, ${misc:Depends}, tk | wish
-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 graphics system
- The Graphics System application, GS, is a library of routines for
- writing graphical user interfaces. Programs written using GS work
- on all Erlang platforms and do not depend upon the underlying
- windowing system. It uses Tk widgets for visualization.
-
-
Package: erlang-ic
Architecture: any
Depends: ${erlang-base}, ${misc:Depends}
@@ -350,16 +338,6 @@
produces Erlang code for a parser as output.
-Package: erlang-percept
-Architecture: any
-Depends: ${erlang-base}, erlang-inets (= ${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 concurrency profiling tool
- Percept is a tool which visualizes application level concurrency and
- helps to identify concurrency bottlenecks.
-
-
Package: erlang-public-key
Architecture: any
Depends: ${erlang-base}, erlang-asn1 (= ${binary:Version}), erlang-crypto (= ${binary:Version}), ${misc:Depends}
@@ -467,16 +445,6 @@
between functions, modules, applications and releases.
-Package: erlang-typer
-Architecture: any
-Depends: ${erlang-base}, erlang-dialyzer (= ${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 code type annotator
- TypEr is a tool that displays and automatically inserts type annotations
- in Erlang code. It uses Dialyzer to infer variable types.
-
-
Package: erlang-wx
Architecture: any
Depends: ${erlang-base}, ${shlibs:Depends}, ${misc:Depends}
@@ -533,7 +501,7 @@
Package: erlang-examples
Architecture: all
Depends: erlang-base (>= ${binary:Version}) | erlang-base-hipe (>= ${binary:Version}), erlang-base (<< ${binary:Version}.0) | erlang-base-hipe (<< ${binary:Version}.0), ${misc:Depends}
-Recommends: erlang-crypto, erlang-gs, erlang-inets, erlang-megaco, erlang-public-key, erlang-snmp, erlang-ssh, erlang-ssl, erlang-syntax-tools, erlang-wx
+Recommends: erlang-crypto, erlang-inets, erlang-megaco, erlang-public-key, erlang-snmp, erlang-ssh, erlang-ssl, erlang-syntax-tools, erlang-wx
Suggests: erlang, erlang-manpages, erlang-doc
Replaces: erlang (<< ${binary:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${binary:Version}), erlang-x11 (<< ${binary:Version}), erlang-dev (<< ${binary:Version}), erlang-src (<< ${binary:Version}), erlang-mode (<< 1:12.b.1-dfsg-2)
Description: Erlang/OTP application examples
@@ -566,7 +534,7 @@
Depends: erlang-base | erlang-base-hipe, erlang-asn1, erlang-corba, erlang-crypto,
erlang-diameter, erlang-edoc, erlang-eldap, erlang-erl-docgen, erlang-eunit,
erlang-ic, erlang-inets, erlang-mnesia, erlang-odbc, erlang-os-mon,
- erlang-parsetools, erlang-percept, erlang-public-key, erlang-runtime-tools,
+ erlang-parsetools, erlang-public-key, erlang-runtime-tools,
erlang-snmp, erlang-ssh, erlang-ssl, erlang-syntax-tools, erlang-tools,
erlang-xmerl, ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc
@@ -578,9 +546,9 @@
Package: erlang-x11
Architecture: all
Depends: erlang-base | erlang-base-hipe, erlang-nox,
- erlang-common-test, erlang-debugger, erlang-dialyzer, erlang-et, erlang-gs,
+ erlang-common-test, erlang-debugger, erlang-dialyzer, erlang-et,
erlang-megaco, erlang-observer, erlang-reltool,
- erlang-typer, erlang-wx,
+ erlang-wx,
${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc
Description: Erlang/OTP applications that require X Window System
@@ -594,12 +562,12 @@
Depends: erlang-base | erlang-base-hipe, erlang-dev, erlang-asn1,
erlang-common-test, erlang-corba, erlang-crypto, erlang-debugger,
erlang-dialyzer, erlang-diameter, erlang-edoc, erlang-eldap,
- erlang-erl-docgen, erlang-et, erlang-eunit, erlang-gs, erlang-ic, erlang-inets,
+ erlang-erl-docgen, erlang-et, erlang-eunit, erlang-ic, erlang-inets,
erlang-megaco, erlang-mnesia, erlang-observer, erlang-odbc,
- erlang-os-mon, erlang-parsetools, erlang-percept,
+ erlang-os-mon, erlang-parsetools,
erlang-public-key, erlang-reltool, erlang-runtime-tools, erlang-snmp,
erlang-ssh, erlang-ssl, erlang-syntax-tools,
- erlang-tools, erlang-typer, erlang-wx, erlang-xmerl, ${misc:Depends}
+ erlang-tools, erlang-wx, erlang-xmerl, ${misc:Depends}
Recommends: erlang-jinterface, erlang-ic-java, erlang-mode, erlang-src,
erlang-examples
Suggests: erlang-manpages, erlang-doc
Deleted: erlang/trunk/debian/erlang-gs.lintian-overrides
===================================================================
--- erlang/trunk/debian/erlang-gs.lintian-overrides 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/erlang-gs.lintian-overrides 2017-07-02 15:09:08 UTC (rev 1925)
@@ -1 +0,0 @@
-erlang-gs: image-file-in-usr-lib
Deleted: erlang/trunk/debian/erlang-percept.lintian-overrides
===================================================================
--- erlang/trunk/debian/erlang-percept.lintian-overrides 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/erlang-percept.lintian-overrides 2017-07-02 15:09:08 UTC (rev 1925)
@@ -1 +0,0 @@
-erlang-percept: image-file-in-usr-lib
Deleted: erlang/trunk/debian/erlang-typer.links
===================================================================
--- erlang/trunk/debian/erlang-typer.links 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/erlang-typer.links 2017-07-02 15:09:08 UTC (rev 1925)
@@ -1 +0,0 @@
-usr/lib/erlang/bin/typer usr/bin/typer
Deleted: erlang/trunk/debian/erlang-typer.manpages
===================================================================
--- erlang/trunk/debian/erlang-typer.manpages 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/erlang-typer.manpages 2017-07-02 15:09:08 UTC (rev 1925)
@@ -1 +0,0 @@
-debian/manpages/typer.1
Modified: erlang/trunk/debian/manpages/erlang-depends.1
===================================================================
--- erlang/trunk/debian/manpages/erlang-depends.1 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/manpages/erlang-depends.1 2017-07-02 15:09:08 UTC (rev 1925)
@@ -125,7 +125,7 @@
.\" ========================================================================
.\"
.IX Title "ERLANG-DEPENDS 1"
-.TH ERLANG-DEPENDS 1 "2016\-09\-03" "1:19.0.5\-dfsg\-2" "Erlang packages for Debian GNU/Linux"
+.TH ERLANG-DEPENDS 1 "2017\-07\-02" "1:20.0+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
@@ -163,7 +163,6 @@
${erlang\-eldap:Depends},
${erlang\-et:Depends},
${erlang\-eunit:Depends},
-${erlang\-gs:Depends},
${erlang\-ic:Depends},
${erlang\-inets:Depends},
${erlang\-megaco:Depends},
@@ -172,7 +171,6 @@
${erlang\-odbc:Depends},
${erlang\-os-mon:Depends},
${erlang\-parsetools:Depends},
-${erlang\-percept:Depends},
${erlang\-public-key:Depends},
${erlang\-reltool:Depends},
${erlang\-runtime-tools:Depends},
@@ -181,7 +179,6 @@
${erlang\-ssl:Depends},
${erlang\-syntax-tools:Depends},
${erlang\-tools:Depends},
-${erlang\-typer:Depends},
${erlang\-wx:Depends},
${erlang\-xmerl:Depends}.
.PP
@@ -217,6 +214,10 @@
of erlang\-dev package because the test_server application was removed from the
Erlang distribution.
.PP
+Variables ${erlang\-gs:Depends}, ${erlang\-percept:Depends}, ${erlang\-typer:Depends}
+were dropped in version 1:20.0\-dfsg\-1 of erlang\-dev package because the
+gs, percept and type applications were 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).
Deleted: erlang/trunk/debian/manpages/typer.1
===================================================================
--- erlang/trunk/debian/manpages/typer.1 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/manpages/typer.1 2017-07-02 15:09:08 UTC (rev 1925)
@@ -1,81 +0,0 @@
-.TH typer 1 "typer 0.1.7.4" "Ericsson AB" "USER COMMANDS"
-.SH NAME
-typer \- The TypEr, a Type annotator of Erlang code
-.SH DESCRIPTION
-.LP
-TypEr is a tool that displays and automatically inserts type annotations
-in Erlang code. It uses Dialyzer to infer variable types.
-
-.SH USAGE
-.LP
-typer [--help] [--version] [--comments] [--plt PltFile]
- [--show | --show-exported | --annotate | --annotate-inc-files]
- [-Ddefine]* [-I include_dir]* [-T application]* [-r] file*
-.fi
-.LP
-Options:
-.RS 2
-.TP 4
-.B
-\fI-r dir\fR
-Searches directories recursively for .erl files below them.
-.TP 4
-.B
-\fI--show\fR
-Prints type specifications for all functions on stdout
-(this is the default behaviour; this option is not really needed).
-.TP 4
-.B
-\fI--show-exported\fR
-Same as --show, but prints specifications for exported functions only.
-Specs are displayed sorted alphabetically on the function's name.
-.TP 4
-.B
-\fI--annotate\fR
-Annotates the specified files with type specifications.
-.TP 4
-.B
-\fI--annotate-inc-files\fR
-Same as --annotate but annotates all -include() files as well as
-all .erl files (use this option with caution, it has not been tested much).
-.TP 4
-.B
-\fI--comments\fR
-Prints type information using Edoc comments, not type contracts.
-.TP 4
-.B
-\fI--plt PltFile\fR
-Uses the specified Dialyzer PLT file rather than the default one.
-.TP 4
-.B
-\fI-T file\fR
-The file \fIfile\fR already contains type specifications and these specifications
-are to be trusted in order to print specs for the rest of the files.
-(Multiple files or dirs, separated by spaces, can be specified.)
-.TP 4
-.B
-\fI-Dname\fR (or \fI-Dname=value\fR)
-Passes the defined name to TypEr.
-(The syntax of defines is the same as that used by \fIerlc\fR, see erlc(1).)
-.TP 4
-.B
-\fI-I include_dir\fR
-Passes the include_dir to TypEr.
-(The syntax of includes is the same as that used by \fIerlc\fR, see erlc(1).)
-.TP 4
-.B
-\fI--version\fR (or \fI-v\fR)
-Prints the TypEr version and exits.
-.TP 4
-.B
-\fI--help\fR (or \fI-h\fR)
-Prints help message and exits.
-.RE
-.SS Note:
-.LP
-* denotes that multiple occurrences of these options are possible\&.
-
-.SH SEE ALSO
-dialyzer(1), erlc(1)
-
-.RE
Modified: erlang/trunk/debian/patches/beamload.patch
===================================================================
--- erlang/trunk/debian/patches/beamload.patch 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/patches/beamload.patch 2017-07-02 15:09:08 UTC (rev 1925)
@@ -5,7 +5,7 @@
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
-@@ -650,6 +650,7 @@
+@@ -680,6 +680,7 @@
COMMON_INCLUDES += -Ipcre -Ihipe
COMMON_INCLUDES += -I../include -I../include/$(TARGET)
COMMON_INCLUDES += -I../include/internal -I../include/internal/$(TARGET)
@@ -15,8 +15,8 @@
--- a/erts/emulator/beam/beam_load.c
+++ b/erts/emulator/beam/beam_load.c
-@@ -46,7 +46,7 @@
- #include "hipe_arch.h"
+@@ -48,7 +48,7 @@
+ #include "hipe_load.h"
#endif
-ErlDrvBinary* erts_gzinflate_buffer(char*, int);
Modified: erlang/trunk/debian/patches/clean.patch
===================================================================
--- erlang/trunk/debian/patches/clean.patch 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/patches/clean.patch 2017-07-02 15:09:08 UTC (rev 1925)
@@ -5,7 +5,7 @@
--- a/Makefile.in
+++ b/Makefile.in
-@@ -1080,6 +1080,7 @@
+@@ -1075,6 +1075,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)
-@@ -1121,3 +1122,206 @@
+@@ -1116,3 +1117,205 @@
|| $(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT) bootstrap_root_clean
# ----------------------------------------------------------------------
@@ -62,7 +62,6 @@
+ rm -rf $(ERL_TOP)/erts/lib/internal/$(TARGET)
+ rm -rf $(ERL_TOP)/erts/lib_src/$(TARGET)
+ rm -rf $(ERL_TOP)/erts/lib_src/obj
-+ rm -rf $(ERL_TOP)/erts/Makefile
+ rm -rf $(ERL_TOP)/erts/obj/$(TARGET)
+ rm -rf $(ERL_TOP)/erts/obj.debug/$(TARGET)
+ rm -rf $(ERL_TOP)/erts/preloaded/erts.app
Modified: erlang/trunk/debian/patches/docs.patch
===================================================================
--- erlang/trunk/debian/patches/docs.patch 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/patches/docs.patch 2017-07-02 15:09:08 UTC (rev 1925)
@@ -36,7 +36,7 @@
--- a/lib/stdlib/doc/src/re.xml
+++ b/lib/stdlib/doc/src/re.xml
-@@ -573,7 +573,7 @@
+@@ -594,7 +594,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
@@ -45,7 +45,7 @@
</item>
<tag><c>noteol</c></tag>
<item>
-@@ -582,7 +582,7 @@
+@@ -603,7 +603,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
Modified: erlang/trunk/debian/patches/emacs.patch
===================================================================
--- erlang/trunk/debian/patches/emacs.patch 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/patches/emacs.patch 2017-07-02 15:09:08 UTC (rev 1925)
@@ -13,39 +13,11 @@
- ("Man - Applications" "/man/man6" t))
+ ("Man - Files" "/man/man5" t)
+ ("Man - Applications" "/man/man7" t))
- "*The man directories displayed in the Erlang menu.
+ "The man directories displayed in the Erlang menu.
Each item in the list should be a list with three elements, the first
-@@ -1313,23 +1313,22 @@
- (or (fboundp 'eval-when-compile)
- (defmacro eval-when-compile (&rest rest) nil))
+@@ -1967,7 +1967,7 @@
--;; These umm...functions are new in Emacs 20. And, yes, until version
--;; 19.27 Emacs backquotes were this ugly.
-+;; These umm...functions are new in Emacs 20.
-
- (or (fboundp 'unless)
- (defmacro unless (condition &rest body)
- "(unless CONDITION BODY...): If CONDITION is false, do BODY, else return nil."
-- `((if (, condition) nil , at body))))
-+ (cons 'if (cons condition (cons nil body)))))
-
- (or (fboundp 'when)
- (defmacro when (condition &rest body)
- "(when CONDITION BODY...): If CONDITION is true, do BODY, else return nil."
-- `((if (, condition) (progn , at body) nil))))
-+ (list 'if condition (cons 'progn body) nil)))
-
- (or (fboundp 'char-before)
- (defmacro char-before (&optional pos)
- "Return the character in the current buffer just before POS."
-- `( (char-after (1- (or ,pos (point)))))))
-+ (list 'char-after (list '1- (list 'or pos '(point))))))
-
- ;; defvar some obsolete variables, which we still support for
- ;; backwards compatibility reasons.
-@@ -2060,7 +2059,7 @@
-
(defun erlang-man-make-menu-item (file)
"Create a menu item containing the name of the man page."
- (and (string-match ".+/\\([^/]+\\)\\.\\([124-9]\\|3\\(erl\\)?\\)\\(\\.gz\\)?$" file)
@@ -53,7 +25,7 @@
(let ((page (substring file (match-beginning 1) (match-end 1))))
(list (capitalize page)
(list 'lambda '()
-@@ -2071,7 +2070,7 @@
+@@ -1978,7 +1978,7 @@
(defun erlang-man-get-files (dir)
"Return files in directory DIR."
@@ -62,24 +34,30 @@
(defun erlang-man-module (&optional module)
-@@ -2091,7 +2090,7 @@
- (if (or (null module) (string= module ""))
- (error "No Erlang module name given"))
+@@ -2000,7 +2000,7 @@
+ (error "No Erlang module name given"))
(let ((dir-list erlang-man-dirs)
-- (pat (concat "/" (regexp-quote module) "\\.\\([124-9]\\|3\\(erl\\)?\\)\\(\\.gz\\)?$"))
-+ (pat (concat "/" (regexp-quote module) "\\.\\(3\\(erl\\)\\)\\(\\.gz\\)?$"))
+ (pat (concat "/" (regexp-quote module)
+- "\\.\\([124-9]\\|3\\(erl\\)?\\)\\(\\.gz\\)?$"))
++ "\\.\\(3\\(erl\\)\\)\\(\\.gz\\)?$"))
(file nil)
file-list)
(while (and dir-list (null file))
-@@ -2232,9 +2231,9 @@
- (error nil))
- (if file
+@@ -2133,7 +2133,7 @@
+ (message "Could not find function `%s'" func)))))))
+
+ (defvar erlang-man-file-regexp
+- "\\(.*\\)/man[^/]*/\\([^.]+\\)\\.\\([124-9]\\|3\\(erl\\)?\\)\\(\\.gz\\)?$")
++ "\\(.*\\)/man[^/]*/\\([^.]+\\)\\.\\([124-9]\\|3\\(erl\\)\\)\\(\\.gz\\)?$")
+
+ (defun erlang-man-display (file)
+ "Display FILE as a `man' file.
+@@ -2145,7 +2145,7 @@
(let ((process-environment (copy-sequence process-environment)))
-- (if (string-match "\\(.*\\)/man[^/]*/\\([^.]+\\)\\.\\([124-9]\\|3\\(erl\\)?\\)\\(\\.gz\\)?$" file)
-+ (if (string-match "\\(.*\\)/man[^/]*/\\([^.]+\\)\\.\\([124-9]\\|3\\(erl\\)\\)\\(\\.gz\\)?$" file)
+ (if (string-match erlang-man-file-regexp file)
(let ((dir (substring file (match-beginning 1) (match-end 1)))
- (page (substring file (match-beginning 2) (match-end 2))))
+ (page (concat (substring file (match-beginning 2) (match-end 2)) "(" (substring file (match-beginning 3) (match-end 3)) ")")))
- (if (fboundp 'setenv)
- (setenv "MANPATH" dir)
- ;; Emacs 18
+ (setenv "MANPATH" dir)
+ (manual-entry page))
+ (error "Can't find man page for %s\n" file)))))
Modified: erlang/trunk/debian/patches/gnu.patch
===================================================================
--- erlang/trunk/debian/patches/gnu.patch 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/patches/gnu.patch 2017-07-02 15:09:08 UTC (rev 1925)
@@ -13,7 +13,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -429,7 +429,7 @@
+@@ -435,7 +435,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.
-@@ -1301,7 +1301,7 @@
+@@ -1371,7 +1371,7 @@
fi
case $host_os in
@@ -47,8 +47,8 @@
#include <sys/sysctl.h>
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
-@@ -609,6 +609,11 @@
- for (i = 0; i < n; i++) if (s[i] != '\0') return !0;
+@@ -4594,6 +4594,11 @@
+ *x = addr;
return 0;
}
+#ifdef __GNU__
@@ -61,7 +61,7 @@
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
-@@ -1606,7 +1606,7 @@
+@@ -1582,7 +1582,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';
-@@ -1620,7 +1620,7 @@
+@@ -1596,7 +1596,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 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/patches/hppa.patch 2017-07-02 15:09:08 UTC (rev 1925)
@@ -8,7 +8,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -2120,6 +2120,14 @@
+@@ -2215,6 +2215,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 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/patches/java.patch 2017-07-02 15:09:08 UTC (rev 1925)
@@ -8,7 +8,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -4723,7 +4723,8 @@
+@@ -4851,7 +4851,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,
Modified: erlang/trunk/debian/patches/man.patch
===================================================================
--- erlang/trunk/debian/patches/man.patch 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/patches/man.patch 2017-07-02 15:09:08 UTC (rev 1925)
@@ -6,7 +6,7 @@
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
-@@ -737,8 +737,10 @@
+@@ -709,8 +709,10 @@
error("-man not supported on Windows");
#else
argv[i] = "man";
Modified: erlang/trunk/debian/patches/series
===================================================================
--- erlang/trunk/debian/patches/series 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/patches/series 2017-07-02 15:09:08 UTC (rev 1925)
@@ -10,4 +10,3 @@
wx3.0-constants.patch
beamload.patch
x32.patch
-cve-2016-10253.patch
Modified: erlang/trunk/debian/patches/sparc.patch
===================================================================
--- erlang/trunk/debian/patches/sparc.patch 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/patches/sparc.patch 2017-07-02 15:09:08 UTC (rev 1925)
@@ -7,7 +7,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -608,7 +608,7 @@
+@@ -615,7 +615,7 @@
fi
case $chk_arch_ in
@@ -18,7 +18,7 @@
i86pc) ARCH=x86;;
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
-@@ -1086,19 +1086,11 @@
+@@ -1109,19 +1109,11 @@
* in registers.
*/
Modified: erlang/trunk/debian/patches/x32.patch
===================================================================
--- erlang/trunk/debian/patches/x32.patch 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/patches/x32.patch 2017-07-02 15:09:08 UTC (rev 1925)
@@ -6,7 +6,7 @@
--- a/erts/lib_src/pthread/ethread.c
+++ b/erts/lib_src/pthread/ethread.c
-@@ -188,7 +188,7 @@
+@@ -192,7 +192,7 @@
void
ethr_x86_cpuid__(int *eax, int *ebx, int *ecx, int *edx)
{
@@ -15,7 +15,7 @@
int have_cpuid;
/*
* If it is possible to toggle eflags bit 21,
-@@ -215,7 +215,7 @@
+@@ -219,7 +219,7 @@
return;
}
#endif
Modified: erlang/trunk/debian/patterns/erlang-base-hipe.patterns
===================================================================
--- erlang/trunk/debian/patterns/erlang-base-hipe.patterns 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/patterns/erlang-base-hipe.patterns 2017-07-02 15:09:08 UTC (rev 1925)
@@ -2,7 +2,9 @@
./usr/lib/erlang/OTP_VERSION
./usr/lib/erlang/misc/
./usr/lib/erlang/releases/[^.]*(\.[^s]|\.s[^r]|\.sr[^c]|\.src.)?[^.]*$
+./usr/lib/erlang/bin/typer
./usr/lib/erlang/bin/[^cd][^y].*([^t]|[^s]t)$
+./usr/lib/erlang/erts-.*/bin/typer
./usr/lib/erlang/erts-.*/bin/[^cd][^y][^.]*(\.debug)?(\.[^s]|\.s[^r]|\.sr[^c]|\.src.)?[^.]*([^t]|[^s]t|[^e]st)$
./usr/lib/erlang/erts-.*/bin/child_setup$
./usr/lib/erlang/erts-.*/bin/dyn_erl$
Modified: erlang/trunk/debian/patterns/erlang-base.patterns
===================================================================
--- erlang/trunk/debian/patterns/erlang-base.patterns 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/patterns/erlang-base.patterns 2017-07-02 15:09:08 UTC (rev 1925)
@@ -2,7 +2,9 @@
./usr/lib/erlang/OTP_VERSION
./usr/lib/erlang/misc/
./usr/lib/erlang/releases/[^.]*(\.[^s]|\.s[^r]|\.sr[^c]|\.src.)?[^.]*$
+./usr/lib/erlang/bin/typer
./usr/lib/erlang/bin/[^cd][^y].*([^t]|[^s]t)$
+./usr/lib/erlang/erts-.*/bin/typer
./usr/lib/erlang/erts-.*/bin/[^cd][^y][^.]*(\.debug)?(\.[^s]|\.s[^r]|\.sr[^c]|\.src.)?[^.]*([^t]|[^s]t|[^e]st)$
./usr/lib/erlang/erts-.*/bin/child_setup$
./usr/lib/erlang/erts-.*/bin/dyn_erl$
Deleted: erlang/trunk/debian/patterns/erlang-gs.patterns
===================================================================
--- erlang/trunk/debian/patterns/erlang-gs.patterns 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/patterns/erlang-gs.patterns 2017-07-02 15:09:08 UTC (rev 1925)
@@ -1 +0,0 @@
-./usr/lib/erlang/lib/gs-.*/
Deleted: erlang/trunk/debian/patterns/erlang-percept.patterns
===================================================================
--- erlang/trunk/debian/patterns/erlang-percept.patterns 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/patterns/erlang-percept.patterns 2017-07-02 15:09:08 UTC (rev 1925)
@@ -1 +0,0 @@
-./usr/lib/erlang/lib/percept-.*/
Modified: erlang/trunk/debian/patterns/erlang-src.patterns
===================================================================
--- erlang/trunk/debian/patterns/erlang-src.patterns 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/patterns/erlang-src.patterns 2017-07-02 15:09:08 UTC (rev 1925)
@@ -24,11 +24,6 @@
./usr/lib/erlang/lib/erts-.*/src/
./usr/lib/erlang/lib/et-.*/src/
./usr/lib/erlang/lib/eunit-.*/src/
-./usr/lib/erlang/lib/gs-.*/src/
-./usr/lib/erlang/lib/gs-.*/contribs/bonk/[^/]*$
-./usr/lib/erlang/lib/gs-.*/contribs/cols/[^/]*$
-./usr/lib/erlang/lib/gs-.*/contribs/mandel/[^/]*$
-./usr/lib/erlang/lib/gs-.*/contribs/othello/[^/]*$
./usr/lib/erlang/lib/hipe-.*/
./usr/lib/erlang/lib/ic-.*/c_src/
./usr/lib/erlang/lib/ic-.*/src/
@@ -47,7 +42,6 @@
./usr/lib/erlang/lib/os_mon-.*/src/
./usr/lib/erlang/lib/otp_mibs-.*/src/
./usr/lib/erlang/lib/parsetools-.*/src/
-./usr/lib/erlang/lib/percept-.*/src/
./usr/lib/erlang/lib/public_key-.*/asn1/
./usr/lib/erlang/lib/public_key-.*/src/
./usr/lib/erlang/lib/reltool-.*/src/
@@ -61,7 +55,6 @@
./usr/lib/erlang/lib/syntax_tools-.*/src/
./usr/lib/erlang/lib/tools-.*/c_src/
./usr/lib/erlang/lib/tools-.*/src/
-./usr/lib/erlang/lib/typer-.*/src/
./usr/lib/erlang/lib/wx-.*/src/
./usr/lib/erlang/lib/xmerl-.*/src/
./usr/lib/erlang/releases/.*\.src
Deleted: erlang/trunk/debian/patterns/erlang-typer.patterns
===================================================================
--- erlang/trunk/debian/patterns/erlang-typer.patterns 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/patterns/erlang-typer.patterns 2017-07-02 15:09:08 UTC (rev 1925)
@@ -1,3 +0,0 @@
-./usr/lib/erlang/bin/typer
-./usr/lib/erlang/erts-.*/bin/typer
-./usr/lib/erlang/lib/typer-.*/
Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/rules 2017-07-02 15:09:08 UTC (rev 1925)
@@ -501,7 +501,7 @@
binary: binary-indep binary-arch
-REL=19.2.1
+REL=20.0
DEB_REL=$(REL)+dfsg
get-orig-source:
Modified: erlang/trunk/debian/scripts/analyse
===================================================================
--- erlang/trunk/debian/scripts/analyse 2017-04-24 06:48:02 UTC (rev 1924)
+++ erlang/trunk/debian/scripts/analyse 2017-07-02 15:09:08 UTC (rev 1925)
@@ -56,10 +56,10 @@
cut -c 20- >> debian/erlang-dev.install
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
+ edoc eldap erl-docgen et eunit ic-java ic inets jinterface megaco mnesia
+ observer odbc os-mon parsetools public-key reltool
runtime-tools snmp ssh ssl syntax-tools tools
- typer wx xmerl'
+ wx xmerl'
CMD='grep -v -E -e ./usr/lib/erlang/usr/include |
grep -v -E -f debian/patterns/erlang-base.patterns |
More information about the Pkg-erlang-commits
mailing list