[Pkg-erlang-commits] r1576 - in erlang/branches/backport-wheezy: . debian debian/manpages debian/patches debian/patterns debian/scripts
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Thu Dec 12 09:08:38 UTC 2013
Author: sgolovan
Date: 2013-12-12 09:08:38 +0000 (Thu, 12 Dec 2013)
New Revision: 1576
Modified:
erlang/branches/backport-wheezy/
erlang/branches/backport-wheezy/debian/changelog
erlang/branches/backport-wheezy/debian/control
erlang/branches/backport-wheezy/debian/erlang-appmon.lintian-overrides
erlang/branches/backport-wheezy/debian/erlang-base-hipe.lintian-overrides
erlang/branches/backport-wheezy/debian/erlang-base.lintian-overrides
erlang/branches/backport-wheezy/debian/erlang-debugger.lintian-overrides
erlang/branches/backport-wheezy/debian/erlang-dialyzer.manpages
erlang/branches/backport-wheezy/debian/erlang-diameter.links.in
erlang/branches/backport-wheezy/debian/erlang-diameter.manpages
erlang/branches/backport-wheezy/debian/erlang-edoc.lintian-overrides
erlang/branches/backport-wheezy/debian/erlang-erl-docgen.lintian-overrides
erlang/branches/backport-wheezy/debian/erlang-examples.lintian-overrides
erlang/branches/backport-wheezy/debian/erlang-gs.lintian-overrides
erlang/branches/backport-wheezy/debian/erlang-ic-java.links.in
erlang/branches/backport-wheezy/debian/erlang-observer.lintian-overrides
erlang/branches/backport-wheezy/debian/erlang-percept.lintian-overrides
erlang/branches/backport-wheezy/debian/erlang-pman.lintian-overrides
erlang/branches/backport-wheezy/debian/erlang-tv.lintian-overrides
erlang/branches/backport-wheezy/debian/erlang-typer.manpages
erlang/branches/backport-wheezy/debian/erlang-webtool.manpages
erlang/branches/backport-wheezy/debian/erlang-wx.lintian-overrides
erlang/branches/backport-wheezy/debian/manpages/erlang-depends.1
erlang/branches/backport-wheezy/debian/manpages/typer.1
erlang/branches/backport-wheezy/debian/patches/clean.patch
erlang/branches/backport-wheezy/debian/patches/docs.patch
erlang/branches/backport-wheezy/debian/patches/emacs.patch
erlang/branches/backport-wheezy/debian/patches/gnu.patch
erlang/branches/backport-wheezy/debian/patches/hppa.patch
erlang/branches/backport-wheezy/debian/patches/java.patch
erlang/branches/backport-wheezy/debian/patches/man.patch
erlang/branches/backport-wheezy/debian/patches/powerpc.patch
erlang/branches/backport-wheezy/debian/patches/rpath.patch
erlang/branches/backport-wheezy/debian/patches/sparc.patch
erlang/branches/backport-wheezy/debian/patterns/erlang-base-hipe.patterns
erlang/branches/backport-wheezy/debian/patterns/erlang-base.patterns
erlang/branches/backport-wheezy/debian/patterns/erlang-common-test.patterns
erlang/branches/backport-wheezy/debian/patterns/erlang-ic.patterns
erlang/branches/backport-wheezy/debian/rules
erlang/branches/backport-wheezy/debian/scripts/analyse
erlang/branches/backport-wheezy/debian/scripts/erlang-depends.in
Log:
[erlang-backports-wheezy]
* Backport to wheezy.
* Switched back to wxWidgets 2.8 for wheezy.
-- Sergei Golovan <sgolovan at debian.org> Thu, 12 Dec 2013 12:46:42 +0400
* New upstream release.
* Refreshed patches.
* Removed patch wich fixes segfault in erlang-wx because it is applied
upstream.
* Removed link diameterc.1.gz because the original manpage is renamed
from diameter-compile.1.gz to diameterc.1.gz.
-- Sergei Golovan <sgolovan at debian.org> Thu, 12 Dec 2013 12:03:35 +0400
* Switched to wxWidgets 3.0 from 2.8 for erlang-wx application.
* Fixed segfault on adding items to a wxListBox widget (reproducible with
wxWidgets 3.0).
* Added new erlang-dbg package with symbol files for libraries and
binaries in the other packages (except erlang-base-hipe).
-- Sergei Golovan <sgolovan at debian.org> Thu, 21 Nov 2013 14:51:50 +0400
Property changes on: erlang/branches/backport-wheezy
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental:1283-1305,1468-1497
/erlang/trunk:1274-1282
+ /erlang/branches/experimental:1283-1305,1468-1497
/erlang/trunk:1274-1282,1539-1575
Modified: erlang/branches/backport-wheezy/debian/changelog
===================================================================
--- erlang/branches/backport-wheezy/debian/changelog 2013-12-12 08:35:38 UTC (rev 1575)
+++ erlang/branches/backport-wheezy/debian/changelog 2013-12-12 09:08:38 UTC (rev 1576)
@@ -1,9 +1,31 @@
-erlang (1:16.b.2-dfsg-1~bpo70+2) UNRELEASED; urgency=low
+erlang (1:16.b.3-dfsg-1~bpo70+1) wheezy-backports; urgency=low
- * NOT RELEASED YET
+ * Backport to wheezy.
+ * Switched back to wxWidgets 2.8 for wheezy.
- -- Sergei Golovan <sgolovan at debian.org> Tue, 15 Oct 2013 13:48:10 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Thu, 12 Dec 2013 12:46:42 +0400
+erlang (1:16.b.3-dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ * Refreshed patches.
+ * Removed patch wich fixes segfault in erlang-wx because it is applied
+ upstream.
+ * Removed link diameterc.1.gz because the original manpage is renamed
+ from diameter-compile.1.gz to diameterc.1.gz.
+
+ -- Sergei Golovan <sgolovan at debian.org> Thu, 12 Dec 2013 12:03:35 +0400
+
+erlang (1:16.b.2-dfsg-2) unstable; urgency=low
+
+ * Switched to wxWidgets 3.0 from 2.8 for erlang-wx application.
+ * Fixed segfault on adding items to a wxListBox widget (reproducible with
+ wxWidgets 3.0).
+ * Added new erlang-dbg package with symbol files for libraries and
+ binaries in the other packages (except erlang-base-hipe).
+
+ -- Sergei Golovan <sgolovan at debian.org> Thu, 21 Nov 2013 14:51:50 +0400
+
erlang (1:16.b.2-dfsg-1~bpo70+1) wheezy-backports; urgency=low
* Backport to wheezy.
Modified: erlang/branches/backport-wheezy/debian/control
===================================================================
--- erlang/branches/backport-wheezy/debian/control 2013-12-12 08:35:38 UTC (rev 1575)
+++ erlang/branches/backport-wheezy/debian/control 2013-12-12 09:08:38 UTC (rev 1576)
@@ -571,6 +571,18 @@
libraries.
+Package: erlang-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: erlang-base (= ${binary:Version}), ${misc:Depends}
+Suggests: erlang, erlang-manpages, erlang-doc
+Description: Erlang/OTP symbol files
+ The files containing debug symbols for binaries and libraries in Erlang
+ to help in debugging applications build with them. You will not normally
+ need to install this package.
+
+
Package: erlang-src
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}
Property changes on: erlang/branches/backport-wheezy/debian/erlang-appmon.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/lintian/erlang-appmon.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/lintian/erlang-appmon.lintian-overrides:1274-1282
+ /erlang/branches/experimental/debian/lintian/erlang-appmon.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/erlang-appmon.lintian-overrides:1539-1575
/erlang/trunk/debian/lintian/erlang-appmon.lintian-overrides:1274-1282
Property changes on: erlang/branches/backport-wheezy/debian/erlang-base-hipe.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/lintian/erlang-base-hipe.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/lintian/erlang-base-hipe.lintian-overrides:1274-1282
+ /erlang/branches/experimental/debian/lintian/erlang-base-hipe.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/erlang-base-hipe.lintian-overrides:1539-1575
/erlang/trunk/debian/lintian/erlang-base-hipe.lintian-overrides:1274-1282
Property changes on: erlang/branches/backport-wheezy/debian/erlang-base.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/lintian/erlang-base.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/lintian/erlang-base.lintian-overrides:1274-1282
+ /erlang/branches/experimental/debian/lintian/erlang-base.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/erlang-base.lintian-overrides:1539-1575
/erlang/trunk/debian/lintian/erlang-base.lintian-overrides:1274-1282
Property changes on: erlang/branches/backport-wheezy/debian/erlang-debugger.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/lintian/erlang-debugger.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/lintian/erlang-debugger.lintian-overrides:1274-1282
+ /erlang/branches/experimental/debian/lintian/erlang-debugger.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/erlang-debugger.lintian-overrides:1539-1575
/erlang/trunk/debian/lintian/erlang-debugger.lintian-overrides:1274-1282
Property changes on: erlang/branches/backport-wheezy/debian/erlang-dialyzer.manpages
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/erlang-dialyzer.manpages:1283-1305,1468-1497
/erlang/trunk/debian/erlang-dialyzer.manpages:1274-1282
+ /erlang/branches/experimental/debian/erlang-dialyzer.manpages:1283-1305,1468-1497
/erlang/trunk/debian/erlang-dialyzer.manpages:1274-1282,1539-1575
Modified: erlang/branches/backport-wheezy/debian/erlang-diameter.links.in
===================================================================
--- erlang/branches/backport-wheezy/debian/erlang-diameter.links.in 2013-12-12 08:35:38 UTC (rev 1575)
+++ erlang/branches/backport-wheezy/debian/erlang-diameter.links.in 2013-12-12 09:08:38 UTC (rev 1576)
@@ -1,2 +1 @@
usr/lib/erlang/lib/diameter- at DIAMETER_VSN@/bin/diameterc usr/bin/diameterc
-usr/share/man/man1/diameter_compile.1.gz usr/share/man/man1/diameterc.1.gz
Modified: erlang/branches/backport-wheezy/debian/erlang-diameter.manpages
===================================================================
--- erlang/branches/backport-wheezy/debian/erlang-diameter.manpages 2013-12-12 08:35:38 UTC (rev 1575)
+++ erlang/branches/backport-wheezy/debian/erlang-diameter.manpages 2013-12-12 09:08:38 UTC (rev 1576)
@@ -1 +1 @@
-debian/erlang-docs/usr/lib/erlang/man/man1/diameter_compile.1
+debian/erlang-docs/usr/lib/erlang/man/man1/diameterc.1
Property changes on: erlang/branches/backport-wheezy/debian/erlang-edoc.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/lintian/erlang-edoc.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/lintian/erlang-edoc.lintian-overrides:1274-1282
+ /erlang/branches/experimental/debian/lintian/erlang-edoc.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/erlang-edoc.lintian-overrides:1539-1575
/erlang/trunk/debian/lintian/erlang-edoc.lintian-overrides:1274-1282
Property changes on: erlang/branches/backport-wheezy/debian/erlang-erl-docgen.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/lintian/erlang-erl-docgen.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/lintian/erlang-erl-docgen.lintian-overrides:1274-1282
+ /erlang/branches/experimental/debian/lintian/erlang-erl-docgen.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/erlang-erl-docgen.lintian-overrides:1539-1575
/erlang/trunk/debian/lintian/erlang-erl-docgen.lintian-overrides:1274-1282
Property changes on: erlang/branches/backport-wheezy/debian/erlang-examples.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/lintian/erlang-examples.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/lintian/erlang-examples.lintian-overrides:1274-1282
+ /erlang/branches/experimental/debian/lintian/erlang-examples.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/erlang-examples.lintian-overrides:1539-1575
/erlang/trunk/debian/lintian/erlang-examples.lintian-overrides:1274-1282
Property changes on: erlang/branches/backport-wheezy/debian/erlang-gs.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/lintian/erlang-gs.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/lintian/erlang-gs.lintian-overrides:1274-1282
+ /erlang/branches/experimental/debian/lintian/erlang-gs.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/erlang-gs.lintian-overrides:1539-1575
/erlang/trunk/debian/lintian/erlang-gs.lintian-overrides:1274-1282
Property changes on: erlang/branches/backport-wheezy/debian/erlang-ic-java.links.in
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/erlang-ic-java.links.in:1283-1305,1468-1497
/erlang/trunk/debian/erlang-ic-java.links.in:1274-1282
+ /erlang/branches/experimental/debian/erlang-ic-java.links.in:1283-1305,1468-1497
/erlang/trunk/debian/erlang-ic-java.links.in:1274-1282,1539-1575
Property changes on: erlang/branches/backport-wheezy/debian/erlang-observer.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/lintian/erlang-observer.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/lintian/erlang-observer.lintian-overrides:1274-1282
+ /erlang/branches/experimental/debian/lintian/erlang-observer.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/erlang-observer.lintian-overrides:1539-1575
/erlang/trunk/debian/lintian/erlang-observer.lintian-overrides:1274-1282
Property changes on: erlang/branches/backport-wheezy/debian/erlang-percept.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/lintian/erlang-percept.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/lintian/erlang-percept.lintian-overrides:1274-1282
+ /erlang/branches/experimental/debian/lintian/erlang-percept.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/erlang-percept.lintian-overrides:1539-1575
/erlang/trunk/debian/lintian/erlang-percept.lintian-overrides:1274-1282
Property changes on: erlang/branches/backport-wheezy/debian/erlang-pman.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/lintian/erlang-pman.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/lintian/erlang-pman.lintian-overrides:1274-1282
+ /erlang/branches/experimental/debian/lintian/erlang-pman.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/erlang-pman.lintian-overrides:1539-1575
/erlang/trunk/debian/lintian/erlang-pman.lintian-overrides:1274-1282
Property changes on: erlang/branches/backport-wheezy/debian/erlang-tv.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/lintian/erlang-tv.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/lintian/erlang-tv.lintian-overrides:1274-1282
+ /erlang/branches/experimental/debian/lintian/erlang-tv.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/erlang-tv.lintian-overrides:1539-1575
/erlang/trunk/debian/lintian/erlang-tv.lintian-overrides:1274-1282
Property changes on: erlang/branches/backport-wheezy/debian/erlang-typer.manpages
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/erlang-typer.manpages:1283-1305,1468-1497
/erlang/trunk/debian/erlang-typer.manpages:1274-1282
+ /erlang/branches/experimental/debian/erlang-typer.manpages:1283-1305,1468-1497
/erlang/trunk/debian/erlang-typer.manpages:1274-1282,1539-1575
Property changes on: erlang/branches/backport-wheezy/debian/erlang-webtool.manpages
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/erlang-webtool.manpages:1283-1305,1468-1497
/erlang/trunk/debian/erlang-webtool.manpages:1274-1282
+ /erlang/branches/experimental/debian/erlang-webtool.manpages:1283-1305,1468-1497
/erlang/trunk/debian/erlang-webtool.manpages:1274-1282,1539-1575
Property changes on: erlang/branches/backport-wheezy/debian/erlang-wx.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/lintian/erlang-wx.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/lintian/erlang-wx.lintian-overrides:1274-1282
+ /erlang/branches/experimental/debian/lintian/erlang-wx.lintian-overrides:1283-1305,1468-1497
/erlang/trunk/debian/erlang-wx.lintian-overrides:1539-1575
/erlang/trunk/debian/lintian/erlang-wx.lintian-overrides:1274-1282
Property changes on: erlang/branches/backport-wheezy/debian/manpages/erlang-depends.1
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/manpages/erlang-depends.1:1283-1305,1468-1497
/erlang/trunk/debian/manpages/erlang-depends.1:1274-1282
+ /erlang/branches/experimental/debian/manpages/erlang-depends.1:1283-1305,1468-1497
/erlang/trunk/debian/manpages/erlang-depends.1:1274-1282,1539-1575
Property changes on: erlang/branches/backport-wheezy/debian/manpages/typer.1
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/manpages/typer.1:1283-1305,1468-1497
/erlang/trunk/debian/manpages/typer.1:1274-1282
+ /erlang/branches/experimental/debian/manpages/typer.1:1283-1305,1468-1497
/erlang/trunk/debian/manpages/typer.1:1274-1282,1539-1575
Modified: erlang/branches/backport-wheezy/debian/patches/clean.patch
===================================================================
--- erlang/branches/backport-wheezy/debian/patches/clean.patch 2013-12-12 08:35:38 UTC (rev 1575)
+++ erlang/branches/backport-wheezy/debian/patches/clean.patch 2013-12-12 09:08:38 UTC (rev 1576)
@@ -3,8 +3,8 @@
Erlang leaves many files after make clean. This patch contains
a hack to remove them.
---- erlang-16.b.2-dfsg.orig/Makefile.in
-+++ erlang-16.b.2-dfsg/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
@@ -995,6 +995,7 @@
find . -type f -name SKIP -print | xargs $(RM)
cd erts && ERL_TOP=$(ERL_TOP) $(MAKE) clean
Modified: erlang/branches/backport-wheezy/debian/patches/docs.patch
===================================================================
--- erlang/branches/backport-wheezy/debian/patches/docs.patch 2013-12-12 08:35:38 UTC (rev 1575)
+++ erlang/branches/backport-wheezy/debian/patches/docs.patch 2013-12-12 09:08:38 UTC (rev 1576)
@@ -3,8 +3,8 @@
and a few bugs with docs installation.
Last-modified: Thu, 09 Dec 2010 10:45:56 +0300
---- erlang-16.b.2-dfsg.orig/lib/erl_docgen/priv/xsl/db_man.xsl
-+++ erlang-16.b.2-dfsg/lib/erl_docgen/priv/xsl/db_man.xsl
+--- a/lib/erl_docgen/priv/xsl/db_man.xsl
++++ b/lib/erl_docgen/priv/xsl/db_man.xsl
@@ -508,7 +508,7 @@
<xsl:text>
.RS 2</xsl:text>
<xsl:text>
.LP
</xsl:text>
@@ -23,8 +23,8 @@
</xsl:template>
---- erlang-16.b.2-dfsg.orig/lib/megaco/doc/src/Makefile
-+++ erlang-16.b.2-dfsg/lib/megaco/doc/src/Makefile
+--- a/lib/megaco/doc/src/Makefile
++++ b/lib/megaco/doc/src/Makefile
@@ -169,8 +169,6 @@
$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
@@ -34,8 +34,8 @@
release_spec:
---- erlang-16.b.2-dfsg.orig/lib/stdlib/doc/src/re.xml
-+++ erlang-16.b.2-dfsg/lib/stdlib/doc/src/re.xml
+--- a/lib/stdlib/doc/src/re.xml
++++ b/lib/stdlib/doc/src/re.xml
@@ -310,7 +310,7 @@
metacharacter should not match before it. Setting this without
<c>multiline</c> (at compile time) causes circumflex never to
@@ -56,8 +56,8 @@
<tag><c>{offset, integer() >= 0}</c></tag>
---- erlang-16.b.2-dfsg.orig/lib/tools/Makefile
-+++ erlang-16.b.2-dfsg/lib/tools/Makefile
+--- a/lib/tools/Makefile
++++ b/lib/tools/Makefile
@@ -23,7 +23,7 @@
# Macros
# ----------------------------------------------------
Modified: erlang/branches/backport-wheezy/debian/patches/emacs.patch
===================================================================
--- erlang/branches/backport-wheezy/debian/patches/emacs.patch 2013-12-12 08:35:38 UTC (rev 1575)
+++ erlang/branches/backport-wheezy/debian/patches/emacs.patch 2013-12-12 09:08:38 UTC (rev 1576)
@@ -3,8 +3,8 @@
Also, it fixes manpage name regexp matching only 3erl manpages in
section 3.
---- erlang-16.b.2-dfsg.orig/lib/tools/emacs/erlang.el
-+++ erlang-16.b.2-dfsg/lib/tools/emacs/erlang.el
+--- a/lib/tools/emacs/erlang.el
++++ b/lib/tools/emacs/erlang.el
@@ -495,8 +495,8 @@
(defvar erlang-man-dirs
'(("Man - Commands" "/man/man1" t)
@@ -16,7 +16,7 @@
"*The man directories displayed in the Erlang menu.
Each item in the list should be a list with three elements, the first
-@@ -1280,23 +1280,22 @@
+@@ -1282,23 +1282,22 @@
(or (fboundp 'eval-when-compile)
(defmacro eval-when-compile (&rest rest) nil))
@@ -44,7 +44,7 @@
;; defvar some obsolete variables, which we still support for
;; backwards compatibility reasons.
-@@ -2015,7 +2014,7 @@
+@@ -2017,7 +2016,7 @@
(defun erlang-man-make-menu-item (file)
"Create a menu item containing the name of the man page."
@@ -53,7 +53,7 @@
(let ((page (substring file (match-beginning 1) (match-end 1))))
(list (capitalize page)
(list 'lambda '()
-@@ -2026,7 +2025,7 @@
+@@ -2028,7 +2027,7 @@
(defun erlang-man-get-files (dir)
"Return files in directory DIR."
@@ -62,7 +62,7 @@
(defun erlang-man-module (&optional module)
-@@ -2046,7 +2045,7 @@
+@@ -2048,7 +2047,7 @@
(if (or (null module) (string= module ""))
(error "No Erlang module name given"))
(let ((dir-list erlang-man-dirs)
@@ -71,7 +71,7 @@
(file nil)
file-list)
(while (and dir-list (null file))
-@@ -2187,9 +2186,9 @@
+@@ -2189,9 +2188,9 @@
(error nil))
(if file
(let ((process-environment (copy-sequence process-environment)))
Modified: erlang/branches/backport-wheezy/debian/patches/gnu.patch
===================================================================
--- erlang/branches/backport-wheezy/debian/patches/gnu.patch 2013-12-12 08:35:38 UTC (rev 1575)
+++ erlang/branches/backport-wheezy/debian/patches/gnu.patch 2013-12-12 09:08:38 UTC (rev 1576)
@@ -11,9 +11,9 @@
(4) Switch some PATH_MAX occurrences to MAXPATHLEN;
---- erlang-16.b.2-dfsg.orig/erts/configure.in
-+++ erlang-16.b.2-dfsg/erts/configure.in
-@@ -433,7 +433,7 @@
+--- a/erts/configure.in
++++ b/erts/configure.in
+@@ -420,7 +420,7 @@
dnl NOTE: CPPFLAGS will be included in CFLAGS at the end
case $host_os in
@@ -22,7 +22,7 @@
win32)
# The ethread library requires _WIN32_WINNT of at least 0x0403.
# -D_WIN32_WINNT=* from CPPFLAGS is saved in ETHR_DEFS.
-@@ -1248,7 +1248,7 @@
+@@ -1235,7 +1235,7 @@
solaris*)
enable_child_waiter_thread=yes
;;
@@ -31,8 +31,8 @@
AC_MSG_CHECKING([whether dlopen() needs to be called before first call to dlerror()])
if test "x$ETHR_THR_LIB_BASE_TYPE" != "xposix_nptl"; then
AC_DEFINE(ERTS_NEED_DLOPEN_BEFORE_DLERROR,[1],
---- erlang-16.b.2-dfsg.orig/lib/os_mon/c_src/memsup.c
-+++ erlang-16.b.2-dfsg/lib/os_mon/c_src/memsup.c
+--- a/lib/os_mon/c_src/memsup.c
++++ b/lib/os_mon/c_src/memsup.c
@@ -98,6 +98,11 @@
#include <time.h>
#include <errno.h>
@@ -45,9 +45,9 @@
#ifdef BSD4_4
#include <sys/types.h>
#include <sys/sysctl.h>
---- erlang-16.b.2-dfsg.orig/erts/emulator/drivers/common/inet_drv.c
-+++ erlang-16.b.2-dfsg/erts/emulator/drivers/common/inet_drv.c
-@@ -519,6 +519,11 @@
+--- a/erts/emulator/drivers/common/inet_drv.c
++++ b/erts/emulator/drivers/common/inet_drv.c
+@@ -550,6 +550,11 @@
inet_driver_select((d)->port, (ErlDrvEvent)(long)(d)->event, (flags), (onoff)); \
} while(0)
@@ -59,9 +59,9 @@
#endif /* #ifdef __WIN32__ #else */
---- erlang-16.b.2-dfsg.orig/erts/etc/common/erlexec.c
-+++ erlang-16.b.2-dfsg/erts/etc/common/erlexec.c
-@@ -1540,7 +1540,7 @@
+--- a/erts/etc/common/erlexec.c
++++ b/erts/etc/common/erlexec.c
+@@ -1546,7 +1546,7 @@
if (!bindir) {
/* Determine bindir from absolute path to executable */
char *p;
@@ -70,7 +70,7 @@
strncpy(buffer, argv[0], sizeof(buffer));
buffer[sizeof(buffer)-1] = '\0';
-@@ -1554,7 +1554,7 @@
+@@ -1560,7 +1560,7 @@
if (!rootdir) {
/* Determine rootdir from absolute path to bindir */
char *p;
@@ -79,8 +79,8 @@
strncpy(buffer, bindir, sizeof(buffer));
buffer[sizeof(buffer)-1] = '\0';
---- erlang-16.b.2-dfsg.orig/erts/etc/common/escript.c
-+++ erlang-16.b.2-dfsg/erts/etc/common/escript.c
+--- a/erts/etc/common/escript.c
++++ b/erts/etc/common/escript.c
@@ -53,7 +53,7 @@
# define IS_DIRSEP(c) ((c) == '/')
# define DIRSEPSTR "/"
@@ -90,8 +90,8 @@
# define ERL_NAME "erl"
#endif
---- erlang-16.b.2-dfsg.orig/erts/etc/unix/dyn_erl.c
-+++ erlang-16.b.2-dfsg/erts/etc/unix/dyn_erl.c
+--- a/erts/etc/unix/dyn_erl.c
++++ b/erts/etc/unix/dyn_erl.c
@@ -149,8 +149,8 @@
static char *
find_prog(char *origpath)
Modified: erlang/branches/backport-wheezy/debian/patches/hppa.patch
===================================================================
--- erlang/branches/backport-wheezy/debian/patches/hppa.patch 2013-12-12 08:35:38 UTC (rev 1575)
+++ erlang/branches/backport-wheezy/debian/patches/hppa.patch 2013-12-12 09:08:38 UTC (rev 1576)
@@ -6,9 +6,9 @@
Forwarded: no
Last-updated: Mon, 22 Feb 2010 10:34:34 +0300
---- erlang-16.b.2-dfsg.orig/erts/configure.in
-+++ erlang-16.b.2-dfsg/erts/configure.in
-@@ -1991,6 +1991,14 @@
+--- a/erts/configure.in
++++ b/erts/configure.in
+@@ -2006,6 +2006,14 @@
AC_CHECK_DECLS([posix2time, time2posix],,,[#include <time.h>])
disable_vfork=false
Modified: erlang/branches/backport-wheezy/debian/patches/java.patch
===================================================================
--- erlang/branches/backport-wheezy/debian/patches/java.patch 2013-12-12 08:35:38 UTC (rev 1575)
+++ erlang/branches/backport-wheezy/debian/patches/java.patch 2013-12-12 09:08:38 UTC (rev 1576)
@@ -6,9 +6,9 @@
Forwarded: yes
Last-updated: Sat, 13 Feb 2010 10:08:42 +0300
---- erlang-16.b.2-dfsg.orig/erts/configure.in
-+++ erlang-16.b.2-dfsg/erts/configure.in
-@@ -4490,7 +4490,8 @@
+--- a/erts/configure.in
++++ b/erts/configure.in
+@@ -4505,7 +4505,8 @@
dnl Make sure it's at least JDK 1.5
AC_CACHE_CHECK(for JDK version 1.5,
ac_cv_prog_javac_ver_1_5,
@@ -18,8 +18,8 @@
ac_cv_prog_javac_ver_1_5=yes, ac_cv_prog_javac_ver_1_5=no)])
if test $ac_cv_prog_javac_ver_1_5 = no; then
unset -v JAVAC
---- erlang-16.b.2-dfsg.orig/lib/test_server/src/configure.in
-+++ erlang-16.b.2-dfsg/lib/test_server/src/configure.in
+--- a/lib/test_server/src/configure.in
++++ b/lib/test_server/src/configure.in
@@ -392,7 +392,8 @@
dnl Make sure it's at least JDK 1.5
AC_CACHE_CHECK(for JDK version 1.5,
Modified: erlang/branches/backport-wheezy/debian/patches/man.patch
===================================================================
--- erlang/branches/backport-wheezy/debian/patches/man.patch 2013-12-12 08:35:38 UTC (rev 1575)
+++ erlang/branches/backport-wheezy/debian/patches/man.patch 2013-12-12 09:08:38 UTC (rev 1576)
@@ -4,9 +4,9 @@
(Erlang manual pages are placed to /usr/share/man/ hierarchy
as required by Debian policy.)
---- erlang-16.b.2-dfsg.orig/erts/etc/common/erlexec.c
-+++ erlang-16.b.2-dfsg/erts/etc/common/erlexec.c
-@@ -715,8 +715,10 @@
+--- a/erts/etc/common/erlexec.c
++++ b/erts/etc/common/erlexec.c
+@@ -721,8 +721,10 @@
error("-man not supported on Windows");
#else
argv[i] = "man";
Modified: erlang/branches/backport-wheezy/debian/patches/powerpc.patch
===================================================================
--- erlang/branches/backport-wheezy/debian/patches/powerpc.patch 2013-12-12 08:35:38 UTC (rev 1575)
+++ erlang/branches/backport-wheezy/debian/patches/powerpc.patch 2013-12-12 09:08:38 UTC (rev 1576)
@@ -2,9 +2,9 @@
Description: Patch defines HiPE architecture ppc for powerpc arch.
Last-Modified: Mon, 08 Mar 2010 12:23:16 +0300
---- erlang-16.b.2-dfsg.orig/erts/configure.in
-+++ erlang-16.b.2-dfsg/erts/configure.in
-@@ -625,6 +625,7 @@
+--- a/erts/configure.in
++++ b/erts/configure.in
+@@ -612,6 +612,7 @@
x86_64) ARCH=amd64;;
amd64) ARCH=amd64;;
macppc) ARCH=ppc;;
Modified: erlang/branches/backport-wheezy/debian/patches/rpath.patch
===================================================================
--- erlang/branches/backport-wheezy/debian/patches/rpath.patch 2013-12-12 08:35:38 UTC (rev 1575)
+++ erlang/branches/backport-wheezy/debian/patches/rpath.patch 2013-12-12 09:08:38 UTC (rev 1576)
@@ -4,9 +4,9 @@
Forwarded: no
Last-modified:Sat, 27 Feb 2010 09:34:43 +0300
---- erlang-16.b.2-dfsg.orig/erts/configure.in
-+++ erlang-16.b.2-dfsg/erts/configure.in
-@@ -4348,9 +4348,9 @@
+--- a/erts/configure.in
++++ b/erts/configure.in
+@@ -4363,9 +4363,9 @@
SSL_CC_RUNTIME_LIBRARY_PATH=
SSL_LD_RUNTIME_LIBRARY_PATH=
SSL_DED_LD_RUNTIME_LIBRARY_PATH=
Modified: erlang/branches/backport-wheezy/debian/patches/sparc.patch
===================================================================
--- erlang/branches/backport-wheezy/debian/patches/sparc.patch 2013-12-12 08:35:38 UTC (rev 1575)
+++ erlang/branches/backport-wheezy/debian/patches/sparc.patch 2013-12-12 09:08:38 UTC (rev 1576)
@@ -5,9 +5,9 @@
(2) Fixes FTBFS(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=328031).
---- erlang-16.b.2-dfsg.orig/erts/configure.in
-+++ erlang-16.b.2-dfsg/erts/configure.in
-@@ -614,7 +614,7 @@
+--- a/erts/configure.in
++++ b/erts/configure.in
+@@ -601,7 +601,7 @@
fi
case $chk_arch_ in
@@ -16,8 +16,8 @@
sparc64) ARCH=sparc64;;
sun4v) ARCH=ultrasparc;;
i86pc) ARCH=x86;;
---- erlang-16.b.2-dfsg.orig/erts/emulator/beam/beam_emu.c
-+++ erlang-16.b.2-dfsg/erts/emulator/beam/beam_emu.c
+--- a/erts/emulator/beam/beam_emu.c
++++ b/erts/emulator/beam/beam_emu.c
@@ -967,16 +967,6 @@
* in registers.
*/
Property changes on: erlang/branches/backport-wheezy/debian/patterns/erlang-base-hipe.patterns
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/patterns/erlang-base-hipe.patterns:1283-1305,1468-1497
/erlang/trunk/debian/patterns/erlang-base-hipe.patterns:1274-1282
+ /erlang/branches/experimental/debian/patterns/erlang-base-hipe.patterns:1283-1305,1468-1497
/erlang/trunk/debian/patterns/erlang-base-hipe.patterns:1274-1282,1539-1575
Property changes on: erlang/branches/backport-wheezy/debian/patterns/erlang-base.patterns
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/patterns/erlang-base.patterns:1283-1305,1468-1497
/erlang/trunk/debian/patterns/erlang-base.patterns:1274-1282
+ /erlang/branches/experimental/debian/patterns/erlang-base.patterns:1283-1305,1468-1497
/erlang/trunk/debian/patterns/erlang-base.patterns:1274-1282,1539-1575
Property changes on: erlang/branches/backport-wheezy/debian/patterns/erlang-common-test.patterns
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/patterns/erlang-common-test.patterns:1283-1305,1468-1497
/erlang/trunk/debian/patterns/erlang-common-test.patterns:1274-1282
+ /erlang/branches/experimental/debian/patterns/erlang-common-test.patterns:1283-1305,1468-1497
/erlang/trunk/debian/patterns/erlang-common-test.patterns:1274-1282,1539-1575
Property changes on: erlang/branches/backport-wheezy/debian/patterns/erlang-ic.patterns
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/patterns/erlang-ic.patterns:1283-1305,1468-1497
/erlang/trunk/debian/patterns/erlang-ic.patterns:1274-1282
+ /erlang/branches/experimental/debian/patterns/erlang-ic.patterns:1283-1305,1468-1497
/erlang/trunk/debian/patterns/erlang-ic.patterns:1274-1282,1539-1575
Modified: erlang/branches/backport-wheezy/debian/rules
===================================================================
--- erlang/branches/backport-wheezy/debian/rules 2013-12-12 08:35:38 UTC (rev 1575)
+++ erlang/branches/backport-wheezy/debian/rules 2013-12-12 09:08:38 UTC (rev 1576)
@@ -444,7 +444,7 @@
dh_installman -a -Nerlang-base-hipe
dh_installmenu -a -Nerlang-base-hipe
dh_link -a -Nerlang-base-hipe
- dh_strip -a -Nerlang-base-hipe
+ dh_strip -a -Nerlang-base-hipe --dbg-package=erlang-dbg
dh_compress -a -Nerlang-base-hipe
dh_fixperms -a -Nerlang-base-hipe
dh_makeshlibs -a -Nerlang-base-hipe
@@ -489,9 +489,9 @@
binary: binary-indep binary-arch
-REL=R16B02
-RELDIR=R16B02
-DEB_REL=16.b.2-dfsg
+REL=R16B03
+RELDIR=R16B03
+DEB_REL=16.b.3-dfsg
get-orig-source:
CURDIR=`pwd` && TMPDIR=`mktemp -d /tmp/erlang.XXXXXX` && \
Property changes on: erlang/branches/backport-wheezy/debian/scripts/analyse
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/scripts/analyse:1283-1305,1468-1497
/erlang/trunk/debian/scripts/analyse:1274-1282
+ /erlang/branches/experimental/debian/scripts/analyse:1283-1305,1468-1497
/erlang/trunk/debian/scripts/analyse:1274-1282,1539-1575
Property changes on: erlang/branches/backport-wheezy/debian/scripts/erlang-depends.in
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/scripts/erlang-depends.in:1283-1305,1468-1497
/erlang/trunk/debian/scripts/erlang-depends.in:1274-1282
+ /erlang/branches/experimental/debian/scripts/erlang-depends.in:1283-1305,1468-1497
/erlang/trunk/debian/scripts/erlang-depends.in:1274-1282,1539-1575
More information about the Pkg-erlang-commits
mailing list