[Pkg-erlang-commits] r1657 - in erlang/branches/backport-wheezy: . debian debian/manpages debian/patches debian/patterns debian/scripts
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Fri Jul 25 16:47:03 UTC 2014
Author: sgolovan
Date: 2014-07-25 16:47:03 +0000 (Fri, 25 Jul 2014)
New Revision: 1657
Added:
erlang/branches/backport-wheezy/debian/erlang-mode.emacsen-compat
erlang/branches/backport-wheezy/debian/patches/symlinks.patch
Removed:
erlang/branches/backport-wheezy/debian/patches/powerpc.patch
Modified:
erlang/branches/backport-wheezy/
erlang/branches/backport-wheezy/debian/changelog
erlang/branches/backport-wheezy/debian/erlang-base-hipe.lintian-overrides
erlang/branches/backport-wheezy/debian/erlang-base-hipe.postinst
erlang/branches/backport-wheezy/debian/erlang-base-hipe.prerm
erlang/branches/backport-wheezy/debian/erlang-base.lintian-overrides
erlang/branches/backport-wheezy/debian/erlang-base.postinst
erlang/branches/backport-wheezy/debian/erlang-base.prerm
erlang/branches/backport-wheezy/debian/erlang-debugger.lintian-overrides
erlang/branches/backport-wheezy/debian/erlang-dialyzer.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/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/rpath.patch
erlang/branches/backport-wheezy/debian/patches/series
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]
* Merged changes from the 1:17.1-dfsg-4 tag.
* Backport to wheezy.
* Switched back to wxWidgets 2.8 for wheezy.
Property changes on: erlang/branches/backport-wheezy
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental:1283-1305,1468-1497,1591-1615
/erlang/tags/1:17.0-dfsg-3:1617-1637
/erlang/trunk:1539-1616
+ /erlang/branches/experimental:1283-1305,1468-1497,1591-1615
/erlang/tags/1:17.1-dfsg-4:1655-1656
/erlang/trunk:1539-1640
Modified: erlang/branches/backport-wheezy/debian/changelog
===================================================================
--- erlang/branches/backport-wheezy/debian/changelog 2014-07-14 10:11:32 UTC (rev 1656)
+++ erlang/branches/backport-wheezy/debian/changelog 2014-07-25 16:47:03 UTC (rev 1657)
@@ -1,9 +1,39 @@
-erlang (1:17.0-dfsg-3~bpo70+2) UNRELEASED; urgency=low
+erlang (1:17.1-dfsg-4~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> Wed, 25 Jun 2014 13:39:25 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Fri, 25 Jul 2014 20:44:41 +0400
+erlang (1:17.1-dfsg-4) unstable; urgency=medium
+
+ * Created new file erlang-mode.emacsen-compat with zero value to comply
+ with emacsen-common policy.
+
+ -- Sergei Golovan <sgolovan at debian.org> Mon, 14 Jul 2014 13:34:09 +0400
+
+erlang (1:17.1-dfsg-3) unstable; urgency=medium
+
+ * Added patch by upstream which fixes regression in 17.1 (a few functions
+ in the filelib module do not follow symlinks, closes: #754083).
+
+ -- Sergei Golovan <sgolovan at debian.org> Mon, 07 Jul 2014 18:53:29 +0400
+
+erlang (1:17.1-dfsg-2) unstable; urgency=medium
+
+ * Fixed stopping and starting Erlang based services on upgrading the
+ erlang-base and erlang-base-hipe packages.
+
+ -- Sergei Golovan <sgolovan at debian.org> Mon, 07 Jul 2014 08:22:41 +0400
+
+erlang (1:17.1-dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ * Removed patch which defines HiPE architecture for powerpc because it
+ has been applied upstream.
+
+ -- Sergei Golovan <sgolovan at debian.org> Thu, 26 Jun 2014 09:43:41 +0400
+
erlang (1:17.0-dfsg-3~bpo70+1) wheezy-backports; urgency=low
* Backport to wheezy.
Property changes on: erlang/branches/backport-wheezy/debian/erlang-base-hipe.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/erlang-base-hipe.lintian-overrides:1591-1615
/erlang/branches/experimental/debian/lintian/erlang-base-hipe.lintian-overrides:1283-1305,1468-1497
/erlang/tags/1:17.0-dfsg-3/debian/erlang-base-hipe.lintian-overrides:1617-1637
/erlang/trunk/debian/erlang-base-hipe.lintian-overrides:1539-1616
+ /erlang/branches/experimental/debian/erlang-base-hipe.lintian-overrides:1591-1615
/erlang/branches/experimental/debian/lintian/erlang-base-hipe.lintian-overrides:1283-1305,1468-1497
/erlang/tags/1:17.1-dfsg-4/debian/erlang-base-hipe.lintian-overrides:1655-1656
/erlang/trunk/debian/erlang-base-hipe.lintian-overrides:1539-1640
Modified: erlang/branches/backport-wheezy/debian/erlang-base-hipe.postinst
===================================================================
--- erlang/branches/backport-wheezy/debian/erlang-base-hipe.postinst 2014-07-14 10:11:32 UTC (rev 1656)
+++ erlang/branches/backport-wheezy/debian/erlang-base-hipe.postinst 2014-07-25 16:47:03 UTC (rev 1657)
@@ -50,7 +50,9 @@
rl=$(runlevel | awk '{print $2}')
failed=""
for service in $services ; do
- if [ -f /usr/share/file-rc/rc -o -f /usr/lib/file-rc/rc ] && [ -f /etc/runlevel.conf ] ; then
+ if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+ idl="invoke-rc.d ${service}"
+ elif [ -f /usr/share/file-rc/rc -o -f /usr/lib/file-rc/rc ] && [ -f /etc/runlevel.conf ] ; then
idl=$(filerc $rl $service)
else
idl=$(ls /etc/rc${rl}.d/S??${service} 2> /dev/null | head -1)
Modified: erlang/branches/backport-wheezy/debian/erlang-base-hipe.prerm
===================================================================
--- erlang/branches/backport-wheezy/debian/erlang-base-hipe.prerm 2014-07-14 10:11:32 UTC (rev 1656)
+++ erlang/branches/backport-wheezy/debian/erlang-base-hipe.prerm 2014-07-25 16:47:03 UTC (rev 1657)
@@ -39,7 +39,9 @@
rl=$(runlevel | awk '{print $2}')
failed=""
for service in $services ; do
- if [ -f /usr/share/file-rc/rc -o -f /usr/lib/file-rc/rc ] && [ -f /etc/runlevel.conf ] ; then
+ if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+ idl="invoke-rc.d ${service}"
+ elif [ -f /usr/share/file-rc/rc -o -f /usr/lib/file-rc/rc ] && [ -f /etc/runlevel.conf ] ; then
idl=$(filerc $rl $service)
else
idl=$(ls /etc/rc${rl}.d/S??${service} 2> /dev/null | head -1)
Property changes on: erlang/branches/backport-wheezy/debian/erlang-base.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/erlang-base.lintian-overrides:1591-1615
/erlang/branches/experimental/debian/lintian/erlang-base.lintian-overrides:1283-1305,1468-1497
/erlang/tags/1:17.0-dfsg-3/debian/erlang-base.lintian-overrides:1617-1637
/erlang/trunk/debian/erlang-base.lintian-overrides:1539-1616
+ /erlang/branches/experimental/debian/erlang-base.lintian-overrides:1591-1615
/erlang/branches/experimental/debian/lintian/erlang-base.lintian-overrides:1283-1305,1468-1497
/erlang/tags/1:17.1-dfsg-4/debian/erlang-base.lintian-overrides:1655-1656
/erlang/trunk/debian/erlang-base.lintian-overrides:1539-1640
Modified: erlang/branches/backport-wheezy/debian/erlang-base.postinst
===================================================================
--- erlang/branches/backport-wheezy/debian/erlang-base.postinst 2014-07-14 10:11:32 UTC (rev 1656)
+++ erlang/branches/backport-wheezy/debian/erlang-base.postinst 2014-07-25 16:47:03 UTC (rev 1657)
@@ -50,7 +50,9 @@
rl=$(runlevel | awk '{print $2}')
failed=""
for service in $services ; do
- if [ -f /usr/share/file-rc/rc -o -f /usr/lib/file-rc/rc ] && [ -f /etc/runlevel.conf ] ; then
+ if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+ idl="invoke-rc.d ${service}"
+ elif [ -f /usr/share/file-rc/rc -o -f /usr/lib/file-rc/rc ] && [ -f /etc/runlevel.conf ] ; then
idl=$(filerc $rl $service)
else
idl=$(ls /etc/rc${rl}.d/S??${service} 2> /dev/null | head -1)
Modified: erlang/branches/backport-wheezy/debian/erlang-base.prerm
===================================================================
--- erlang/branches/backport-wheezy/debian/erlang-base.prerm 2014-07-14 10:11:32 UTC (rev 1656)
+++ erlang/branches/backport-wheezy/debian/erlang-base.prerm 2014-07-25 16:47:03 UTC (rev 1657)
@@ -39,7 +39,9 @@
rl=$(runlevel | awk '{print $2}')
failed=""
for service in $services ; do
- if [ -f /usr/share/file-rc/rc -o -f /usr/lib/file-rc/rc ] && [ -f /etc/runlevel.conf ] ; then
+ if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+ idl="invoke-rc.d ${service}"
+ elif [ -f /usr/share/file-rc/rc -o -f /usr/lib/file-rc/rc ] && [ -f /etc/runlevel.conf ] ; then
idl=$(filerc $rl $service)
else
idl=$(ls /etc/rc${rl}.d/S??${service} 2> /dev/null | head -1)
Property changes on: erlang/branches/backport-wheezy/debian/erlang-debugger.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/erlang-debugger.lintian-overrides:1591-1615
/erlang/branches/experimental/debian/lintian/erlang-debugger.lintian-overrides:1283-1305,1468-1497
/erlang/tags/1:17.0-dfsg-3/debian/erlang-debugger.lintian-overrides:1617-1637
/erlang/trunk/debian/erlang-debugger.lintian-overrides:1539-1616
+ /erlang/branches/experimental/debian/erlang-debugger.lintian-overrides:1591-1615
/erlang/branches/experimental/debian/lintian/erlang-debugger.lintian-overrides:1283-1305,1468-1497
/erlang/tags/1:17.1-dfsg-4/debian/erlang-debugger.lintian-overrides:1655-1656
/erlang/trunk/debian/erlang-debugger.lintian-overrides:1539-1640
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,1591-1615
/erlang/tags/1:17.0-dfsg-3/debian/erlang-dialyzer.manpages:1617-1637
/erlang/trunk/debian/erlang-dialyzer.manpages:1539-1616
+ /erlang/branches/experimental/debian/erlang-dialyzer.manpages:1283-1305,1468-1497,1591-1615
/erlang/trunk/debian/erlang-dialyzer.manpages:1539-1640
Property changes on: erlang/branches/backport-wheezy/debian/erlang-edoc.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/erlang-edoc.lintian-overrides:1591-1615
/erlang/branches/experimental/debian/lintian/erlang-edoc.lintian-overrides:1283-1305,1468-1497
/erlang/tags/1:17.0-dfsg-3/debian/erlang-edoc.lintian-overrides:1617-1637
/erlang/trunk/debian/erlang-edoc.lintian-overrides:1539-1616
+ /erlang/branches/experimental/debian/erlang-edoc.lintian-overrides:1591-1615
/erlang/branches/experimental/debian/lintian/erlang-edoc.lintian-overrides:1283-1305,1468-1497
/erlang/tags/1:17.1-dfsg-4/debian/erlang-edoc.lintian-overrides:1655-1656
/erlang/trunk/debian/erlang-edoc.lintian-overrides:1539-1640
Property changes on: erlang/branches/backport-wheezy/debian/erlang-erl-docgen.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/erlang-erl-docgen.lintian-overrides:1591-1615
/erlang/branches/experimental/debian/lintian/erlang-erl-docgen.lintian-overrides:1283-1305,1468-1497
/erlang/tags/1:17.0-dfsg-3/debian/erlang-erl-docgen.lintian-overrides:1617-1637
/erlang/trunk/debian/erlang-erl-docgen.lintian-overrides:1539-1616
+ /erlang/branches/experimental/debian/erlang-erl-docgen.lintian-overrides:1591-1615
/erlang/branches/experimental/debian/lintian/erlang-erl-docgen.lintian-overrides:1283-1305,1468-1497
/erlang/tags/1:17.1-dfsg-4/debian/erlang-erl-docgen.lintian-overrides:1655-1656
/erlang/trunk/debian/erlang-erl-docgen.lintian-overrides:1539-1640
Property changes on: erlang/branches/backport-wheezy/debian/erlang-examples.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/erlang-examples.lintian-overrides:1591-1615
/erlang/branches/experimental/debian/lintian/erlang-examples.lintian-overrides:1283-1305,1468-1497
/erlang/tags/1:17.0-dfsg-3/debian/erlang-examples.lintian-overrides:1617-1637
/erlang/trunk/debian/erlang-examples.lintian-overrides:1539-1616
+ /erlang/branches/experimental/debian/erlang-examples.lintian-overrides:1591-1615
/erlang/branches/experimental/debian/lintian/erlang-examples.lintian-overrides:1283-1305,1468-1497
/erlang/tags/1:17.1-dfsg-4/debian/erlang-examples.lintian-overrides:1655-1656
/erlang/trunk/debian/erlang-examples.lintian-overrides:1539-1640
Property changes on: erlang/branches/backport-wheezy/debian/erlang-gs.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/erlang-gs.lintian-overrides:1591-1615
/erlang/branches/experimental/debian/lintian/erlang-gs.lintian-overrides:1283-1305,1468-1497
/erlang/tags/1:17.0-dfsg-3/debian/erlang-gs.lintian-overrides:1617-1637
/erlang/trunk/debian/erlang-gs.lintian-overrides:1539-1616
+ /erlang/branches/experimental/debian/erlang-gs.lintian-overrides:1591-1615
/erlang/branches/experimental/debian/lintian/erlang-gs.lintian-overrides:1283-1305,1468-1497
/erlang/tags/1:17.1-dfsg-4/debian/erlang-gs.lintian-overrides:1655-1656
/erlang/trunk/debian/erlang-gs.lintian-overrides:1539-1640
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,1591-1615
/erlang/tags/1:17.0-dfsg-3/debian/erlang-ic-java.links.in:1617-1637
/erlang/trunk/debian/erlang-ic-java.links.in:1539-1616
+ /erlang/branches/experimental/debian/erlang-ic-java.links.in:1283-1305,1468-1497,1591-1615
/erlang/trunk/debian/erlang-ic-java.links.in:1539-1640
Copied: erlang/branches/backport-wheezy/debian/erlang-mode.emacsen-compat (from rev 1656, erlang/tags/1:17.1-dfsg-4/debian/erlang-mode.emacsen-compat)
===================================================================
--- erlang/branches/backport-wheezy/debian/erlang-mode.emacsen-compat (rev 0)
+++ erlang/branches/backport-wheezy/debian/erlang-mode.emacsen-compat 2014-07-25 16:47:03 UTC (rev 1657)
@@ -0,0 +1 @@
+0
Property changes on: erlang/branches/backport-wheezy/debian/erlang-observer.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/erlang-observer.lintian-overrides:1591-1615
/erlang/branches/experimental/debian/lintian/erlang-observer.lintian-overrides:1283-1305,1468-1497
/erlang/tags/1:17.0-dfsg-3/debian/erlang-observer.lintian-overrides:1617-1637
/erlang/trunk/debian/erlang-observer.lintian-overrides:1539-1616
+ /erlang/branches/experimental/debian/erlang-observer.lintian-overrides:1591-1615
/erlang/branches/experimental/debian/lintian/erlang-observer.lintian-overrides:1283-1305,1468-1497
/erlang/tags/1:17.1-dfsg-4/debian/erlang-observer.lintian-overrides:1655-1656
/erlang/trunk/debian/erlang-observer.lintian-overrides:1539-1640
Property changes on: erlang/branches/backport-wheezy/debian/erlang-percept.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/erlang-percept.lintian-overrides:1591-1615
/erlang/branches/experimental/debian/lintian/erlang-percept.lintian-overrides:1283-1305,1468-1497
/erlang/tags/1:17.0-dfsg-3/debian/erlang-percept.lintian-overrides:1617-1637
/erlang/trunk/debian/erlang-percept.lintian-overrides:1539-1616
+ /erlang/branches/experimental/debian/erlang-percept.lintian-overrides:1591-1615
/erlang/branches/experimental/debian/lintian/erlang-percept.lintian-overrides:1283-1305,1468-1497
/erlang/tags/1:17.1-dfsg-4/debian/erlang-percept.lintian-overrides:1655-1656
/erlang/trunk/debian/erlang-percept.lintian-overrides:1539-1640
Property changes on: erlang/branches/backport-wheezy/debian/erlang-pman.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/erlang-pman.lintian-overrides:1591-1615
/erlang/branches/experimental/debian/lintian/erlang-pman.lintian-overrides:1283-1305,1468-1497
/erlang/tags/1:17.0-dfsg-3/debian/erlang-pman.lintian-overrides:1617-1637
/erlang/trunk/debian/erlang-pman.lintian-overrides:1539-1616
+ /erlang/branches/experimental/debian/erlang-pman.lintian-overrides:1591-1615
/erlang/branches/experimental/debian/lintian/erlang-pman.lintian-overrides:1283-1305,1468-1497
/erlang/tags/1:17.1-dfsg-4/debian/erlang-pman.lintian-overrides:1655-1656
/erlang/trunk/debian/erlang-pman.lintian-overrides:1539-1640
Property changes on: erlang/branches/backport-wheezy/debian/erlang-tv.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/erlang-tv.lintian-overrides:1591-1615
/erlang/branches/experimental/debian/lintian/erlang-tv.lintian-overrides:1283-1305,1468-1497
/erlang/tags/1:17.0-dfsg-3/debian/erlang-tv.lintian-overrides:1617-1637
/erlang/trunk/debian/erlang-tv.lintian-overrides:1539-1616
+ /erlang/branches/experimental/debian/erlang-tv.lintian-overrides:1591-1615
/erlang/branches/experimental/debian/lintian/erlang-tv.lintian-overrides:1283-1305,1468-1497
/erlang/tags/1:17.1-dfsg-4/debian/erlang-tv.lintian-overrides:1655-1656
/erlang/trunk/debian/erlang-tv.lintian-overrides:1539-1640
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,1591-1615
/erlang/tags/1:17.0-dfsg-3/debian/erlang-typer.manpages:1617-1637
/erlang/trunk/debian/erlang-typer.manpages:1539-1616
+ /erlang/branches/experimental/debian/erlang-typer.manpages:1283-1305,1468-1497,1591-1615
/erlang/trunk/debian/erlang-typer.manpages:1539-1640
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,1591-1615
/erlang/tags/1:17.0-dfsg-3/debian/erlang-webtool.manpages:1617-1637
/erlang/trunk/debian/erlang-webtool.manpages:1539-1616
+ /erlang/branches/experimental/debian/erlang-webtool.manpages:1283-1305,1468-1497,1591-1615
/erlang/trunk/debian/erlang-webtool.manpages:1539-1640
Property changes on: erlang/branches/backport-wheezy/debian/erlang-wx.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/erlang-wx.lintian-overrides:1591-1615
/erlang/branches/experimental/debian/lintian/erlang-wx.lintian-overrides:1283-1305,1468-1497
/erlang/tags/1:17.0-dfsg-3/debian/erlang-wx.lintian-overrides:1617-1637
/erlang/trunk/debian/erlang-wx.lintian-overrides:1539-1616
+ /erlang/branches/experimental/debian/erlang-wx.lintian-overrides:1591-1615
/erlang/branches/experimental/debian/lintian/erlang-wx.lintian-overrides:1283-1305,1468-1497
/erlang/tags/1:17.1-dfsg-4/debian/erlang-wx.lintian-overrides:1655-1656
/erlang/trunk/debian/erlang-wx.lintian-overrides:1539-1640
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,1591-1615
/erlang/tags/1:17.0-dfsg-3/debian/manpages/erlang-depends.1:1617-1637
/erlang/trunk/debian/manpages/erlang-depends.1:1539-1616
+ /erlang/branches/experimental/debian/manpages/erlang-depends.1:1283-1305,1468-1497,1591-1615
/erlang/trunk/debian/manpages/erlang-depends.1:1539-1640
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,1591-1615
/erlang/tags/1:17.0-dfsg-3/debian/manpages/typer.1:1617-1637
/erlang/trunk/debian/manpages/typer.1:1539-1616
+ /erlang/branches/experimental/debian/manpages/typer.1:1283-1305,1468-1497,1591-1615
/erlang/trunk/debian/manpages/typer.1:1539-1640
Modified: erlang/branches/backport-wheezy/debian/patches/emacs.patch
===================================================================
--- erlang/branches/backport-wheezy/debian/patches/emacs.patch 2014-07-14 10:11:32 UTC (rev 1656)
+++ erlang/branches/backport-wheezy/debian/patches/emacs.patch 2014-07-25 16:47:03 UTC (rev 1657)
@@ -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
-@@ -1287,23 +1287,22 @@
+@@ -1285,23 +1285,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.
-@@ -2026,7 +2025,7 @@
+@@ -2024,7 +2023,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 '()
-@@ -2037,7 +2036,7 @@
+@@ -2035,7 +2034,7 @@
(defun erlang-man-get-files (dir)
"Return files in directory DIR."
@@ -62,7 +62,7 @@
(defun erlang-man-module (&optional module)
-@@ -2057,7 +2056,7 @@
+@@ -2055,7 +2054,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))
-@@ -2198,9 +2197,9 @@
+@@ -2196,9 +2195,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 2014-07-14 10:11:32 UTC (rev 1656)
+++ erlang/branches/backport-wheezy/debian/patches/gnu.patch 2014-07-25 16:47:03 UTC (rev 1657)
@@ -13,7 +13,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -479,7 +479,7 @@
+@@ -481,7 +481,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.
-@@ -1331,7 +1331,7 @@
+@@ -1334,7 +1334,7 @@
solaris*)
enable_child_waiter_thread=yes
;;
Modified: erlang/branches/backport-wheezy/debian/patches/hppa.patch
===================================================================
--- erlang/branches/backport-wheezy/debian/patches/hppa.patch 2014-07-14 10:11:32 UTC (rev 1656)
+++ erlang/branches/backport-wheezy/debian/patches/hppa.patch 2014-07-25 16:47:03 UTC (rev 1657)
@@ -8,7 +8,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -2135,6 +2135,14 @@
+@@ -2160,6 +2160,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 2014-07-14 10:11:32 UTC (rev 1656)
+++ erlang/branches/backport-wheezy/debian/patches/java.patch 2014-07-25 16:47:03 UTC (rev 1657)
@@ -8,7 +8,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -4667,7 +4667,8 @@
+@@ -4682,7 +4682,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,
Deleted: erlang/branches/backport-wheezy/debian/patches/powerpc.patch
===================================================================
--- erlang/branches/backport-wheezy/debian/patches/powerpc.patch 2014-07-14 10:11:32 UTC (rev 1656)
+++ erlang/branches/backport-wheezy/debian/patches/powerpc.patch 2014-07-25 16:47:03 UTC (rev 1657)
@@ -1,14 +0,0 @@
-Author: Sergei Golovan <sgolovan at debian.org>
-Description: Patch defines HiPE architecture ppc for powerpc arch.
-Last-Modified: Mon, 08 Mar 2010 12:23:16 +0300
-
---- a/erts/configure.in
-+++ b/erts/configure.in
-@@ -671,6 +671,7 @@
- x86_64) ARCH=amd64;;
- amd64) ARCH=amd64;;
- macppc) ARCH=ppc;;
-+ powerpc) ARCH=ppc;;
- ppc) ARCH=ppc;;
- ppc64) ARCH=ppc64;;
- "Power Macintosh") ARCH=ppc;;
Modified: erlang/branches/backport-wheezy/debian/patches/rpath.patch
===================================================================
--- erlang/branches/backport-wheezy/debian/patches/rpath.patch 2014-07-14 10:11:32 UTC (rev 1656)
+++ erlang/branches/backport-wheezy/debian/patches/rpath.patch 2014-07-25 16:47:03 UTC (rev 1657)
@@ -6,7 +6,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -4525,9 +4525,9 @@
+@@ -4540,9 +4540,9 @@
SSL_CC_RUNTIME_LIBRARY_PATH=
SSL_LD_RUNTIME_LIBRARY_PATH=
SSL_DED_LD_RUNTIME_LIBRARY_PATH=
Modified: erlang/branches/backport-wheezy/debian/patches/series
===================================================================
--- erlang/branches/backport-wheezy/debian/patches/series 2014-07-14 10:11:32 UTC (rev 1656)
+++ erlang/branches/backport-wheezy/debian/patches/series 2014-07-25 16:47:03 UTC (rev 1657)
@@ -7,5 +7,5 @@
docs.patch
java.patch
hppa.patch
-powerpc.patch
javascript.patch
+symlinks.patch
Modified: erlang/branches/backport-wheezy/debian/patches/sparc.patch
===================================================================
--- erlang/branches/backport-wheezy/debian/patches/sparc.patch 2014-07-14 10:11:32 UTC (rev 1656)
+++ erlang/branches/backport-wheezy/debian/patches/sparc.patch 2014-07-25 16:47:03 UTC (rev 1657)
@@ -7,7 +7,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -660,7 +660,7 @@
+@@ -662,7 +662,7 @@
fi
case $chk_arch_ in
Copied: erlang/branches/backport-wheezy/debian/patches/symlinks.patch (from rev 1656, erlang/tags/1:17.1-dfsg-4/debian/patches/symlinks.patch)
===================================================================
--- erlang/branches/backport-wheezy/debian/patches/symlinks.patch (rev 0)
+++ erlang/branches/backport-wheezy/debian/patches/symlinks.patch 2014-07-25 16:47:03 UTC (rev 1657)
@@ -0,0 +1,210 @@
+Description: This fixes a bug introduced in f11aabdc9fec593c31e6c4f3fa25c1707e9c35df where
+ filelib:eval_read_file_info/2 was made to use file:read_link_info/1 to never
+ follow symlinks. This fixed wildcard/1 but broke every other function using
+ eval_read_file_info/2.
+Author: Anthony Ramine <n.oxyde at gmail.com>
+Last-Modified: Tue, 1 Jul 2014 00:58:26 +0200
+
+--- a/erts/preloaded/src/erl_prim_loader.erl
++++ b/erts/preloaded/src/erl_prim_loader.erl
+@@ -42,11 +42,11 @@
+
+ %% Public
+ -export([start/3, set_path/1, get_path/0, get_file/1, get_files/2,
+- list_dir/1, read_file_info/1, get_cwd/0, get_cwd/1]).
++ list_dir/1, read_file_info/1, read_link_info/1, get_cwd/0, get_cwd/1]).
+
+ %% Used by erl_boot_server
+ -export([prim_init/0, prim_get_file/2, prim_list_dir/2,
+- prim_read_file_info/2, prim_get_cwd/2]).
++ prim_read_file_info/3, prim_get_cwd/2]).
+
+ %% Used by escript and code
+ -export([set_primary_archive/4, release_archives/0]).
+@@ -223,6 +223,12 @@ list_dir(Dir) ->
+ read_file_info(File) ->
+ check_file_result(read_file_info, File, request({read_file_info,File})).
+
++-spec read_link_info(Filename) -> {'ok', FileInfo} | 'error' when
++ Filename :: string(),
++ FileInfo :: file:file_info().
++read_link_info(File) ->
++ check_file_result(read_link_info, File, request({read_link_info,File})).
++
+ -spec get_cwd() -> {'ok', string()} | 'error'.
+ get_cwd() ->
+ check_file_result(get_cwd, [], request({get_cwd,[]})).
+@@ -325,6 +331,9 @@ loop(State, Parent, Paths) ->
+ {read_file_info,File} ->
+ {Res,State1} = handle_read_file_info(State, File),
+ {Res,State1,Paths};
++ {read_link_info,File} ->
++ {Res,State1} = handle_read_link_info(State, File),
++ {Res,State1,Paths};
+ {get_cwd,[]} ->
+ {Res,State1} = handle_get_cwd(State, []),
+ {Res,State1,Paths};
+@@ -387,10 +396,15 @@ handle_list_dir(State = #state{loader = inet}, Dir) ->
+ ?SAFE2(inet_list_dir(State, Dir), State).
+
+ handle_read_file_info(State = #state{loader = efile}, File) ->
+- ?SAFE2(efile_read_file_info(State, File), State);
++ ?SAFE2(efile_read_file_info(State, File, true), State);
+ handle_read_file_info(State = #state{loader = inet}, File) ->
+ ?SAFE2(inet_read_file_info(State, File), State).
+
++handle_read_link_info(State = #state{loader = efile}, File) ->
++ ?SAFE2(efile_read_file_info(State, File, false), State);
++handle_read_link_info(State = #state{loader = inet}, File) ->
++ ?SAFE2(inet_read_link_info(State, File), State).
++
+ handle_get_cwd(State = #state{loader = efile}, Drive) ->
+ ?SAFE2(efile_get_cwd(State, Drive), State);
+ handle_get_cwd(State = #state{loader = inet}, Drive) ->
+@@ -514,8 +528,8 @@ efile_list_dir(#state{prim_state = PS} = State, Dir) ->
+ {Res, PS2} = prim_list_dir(PS, Dir),
+ {Res, State#state{prim_state = PS2}}.
+
+-efile_read_file_info(#state{prim_state = PS} = State, File) ->
+- {Res, PS2} = prim_read_file_info(PS, File),
++efile_read_file_info(#state{prim_state = PS} = State, File, FollowLinks) ->
++ {Res, PS2} = prim_read_file_info(PS, File, FollowLinks),
+ {Res, State#state{prim_state = PS2}}.
+
+ efile_get_cwd(#state{prim_state = PS} = State, Drive) ->
+@@ -718,6 +732,10 @@ inet_list_dir(State, Dir) ->
+ inet_read_file_info(State, File) ->
+ inet_send_and_rcv({read_file_info,File}, read_file_info, State).
+
++%% -> {{ok,Info},State} | {{error,Reason},State}
++inet_read_link_info(State, File) ->
++ inet_send_and_rcv({read_link_info,File}, read_link_info, State).
++
+ %% -> {{ok,Cwd},State} | {{error,Reason},State}
+ inet_get_cwd(State, []) ->
+ inet_send_and_rcv(get_cwd, get_cwd, State);
+@@ -951,16 +969,18 @@ prim_list_dir(PS, Dir) ->
+ debug(PS, {return, Res2}),
+ {Res2, PS3}.
+
+--spec prim_read_file_info(prim_state(), file:filename()) ->
++-spec prim_read_file_info(prim_state(), file:filename(), boolean()) ->
+ {{'ok', #file_info{}}, prim_state()}
+ | {{'error', term()}, prim_state()}.
+-prim_read_file_info(PS, File) ->
++prim_read_file_info(PS, File, FollowLinks) ->
+ debug(PS, {read_file_info, File}),
+ {Res2, PS2} =
+ case name_split(PS#prim_state.primary_archive, File) of
+ {file, PrimFile} ->
+- Res = prim_file:read_file_info(PrimFile),
+- {Res, PS};
++ case FollowLinks of
++ true -> {prim_file:read_file_info(PrimFile), PS};
++ false -> {prim_file:read_link_info(PrimFile), PS}
++ end;
+ {archive, ArchiveFile, []} ->
+ %% Fake top directory
+ debug(PS, {archive_read_file_info, ArchiveFile}),
+--- a/lib/kernel/src/erl_boot_server.erl
++++ b/lib/kernel/src/erl_boot_server.erl
+@@ -341,9 +341,13 @@ handle_command(S, PS, Msg) ->
+ send_file_result(S, list_dir, Res),
+ PS2;
+ {read_file_info,File} ->
+- {Res, PS2} = erl_prim_loader:prim_read_file_info(PS, File),
++ {Res, PS2} = erl_prim_loader:prim_read_file_info(PS, File, true),
+ send_file_result(S, read_file_info, Res),
+ PS2;
++ {read_link_info,File} ->
++ {Res, PS2} = erl_prim_loader:prim_read_file_info(PS, File, false),
++ send_file_result(S, read_link_info, Res),
++ PS2;
+ get_cwd ->
+ {Res, PS2} = erl_prim_loader:prim_get_cwd(PS, []),
+ send_file_result(S, get_cwd, Res),
+--- a/lib/stdlib/src/filelib.erl
++++ b/lib/stdlib/src/filelib.erl
+@@ -265,7 +265,7 @@ do_wildcard(Pattern, Cwd, Mod) ->
+ lists:sort(Files).
+
+ do_wildcard_1({exists,File}, Mod) ->
+- case eval_read_file_info(File, Mod) of
++ case eval_read_link_info(File, Mod) of
+ {ok,_} -> [File];
+ _ -> []
+ end;
+@@ -488,7 +488,7 @@ badpattern(Reason) ->
+ error({badpattern,Reason}).
+
+ eval_read_file_info(File, file) ->
+- file:read_link_info(File);
++ file:read_file_info(File);
+ eval_read_file_info(File, erl_prim_loader) ->
+ case erl_prim_loader:read_file_info(File) of
+ error -> {error, erl_prim_loader};
+@@ -497,6 +497,16 @@ eval_read_file_info(File, erl_prim_loader) ->
+ eval_read_file_info(File, Mod) ->
+ Mod:read_file_info(File).
+
++eval_read_link_info(File, file) ->
++ file:read_link_info(File);
++eval_read_link_info(File, erl_prim_loader) ->
++ case erl_prim_loader:read_link_info(File) of
++ error -> {error, erl_prim_loader};
++ Res-> Res
++ end;
++eval_read_link_info(File, Mod) ->
++ Mod:read_link_info(File).
++
+ eval_list_dir(Dir, file) ->
+ file:list_dir(Dir);
+ eval_list_dir(Dir, erl_prim_loader) ->
+--- a/lib/stdlib/test/filelib_SUITE.erl
++++ b/lib/stdlib/test/filelib_SUITE.erl
+@@ -23,7 +23,8 @@
+ init_per_group/2,end_per_group/2,
+ init_per_testcase/2,end_per_testcase/2,
+ wildcard_one/1,wildcard_two/1,wildcard_errors/1,
+- fold_files/1,otp_5960/1,ensure_dir_eexist/1,symlinks/1]).
++ fold_files/1,otp_5960/1,ensure_dir_eexist/1,ensure_dir_symlink/1,
++ symlinks/1]).
+
+ -import(lists, [foreach/2]).
+
+@@ -43,7 +44,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
+
+ all() ->
+ [wildcard_one, wildcard_two, wildcard_errors,
+- fold_files, otp_5960, ensure_dir_eexist, symlinks].
++ fold_files, otp_5960, ensure_dir_eexist, ensure_dir_symlink, symlinks].
+
+ groups() ->
+ [].
+@@ -367,6 +368,26 @@ ensure_dir_eexist(Config) when is_list(Config) ->
+ ?line {error, eexist} = filelib:ensure_dir(NeedFileB),
+ ok.
+
++ensure_dir_symlink(Config) when is_list(Config) ->
++ PrivDir = ?config(priv_dir, Config),
++ Dir = filename:join(PrivDir, "ensure_dir_symlink"),
++ Name = filename:join(Dir, "same_name_as_file_and_dir"),
++ ok = filelib:ensure_dir(Name),
++ ok = file:write_file(Name, <<"some string\n">>),
++ %% With a symlink to the directory.
++ Symlink = filename:join(PrivDir, "ensure_dir_symlink_link"),
++ case file:make_symlink(Dir, Symlink) of
++ {error,enotsup} ->
++ {skip,"Symlinks not supported on this platform"};
++ {error,eperm} ->
++ {win32,_} = os:type(),
++ {skip,"Windows user not privileged to create symlinks"};
++ ok ->
++ SymlinkedName = filename:join(Symlink, "same_name_as_file_and_dir"),
++ ok = filelib:ensure_dir(SymlinkedName)
++ end.
++
++
+ symlinks(Config) when is_list(Config) ->
+ PrivDir = ?config(priv_dir, Config),
+ Dir = filename:join(PrivDir, ?MODULE_STRING++"_symlinks"),
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,1591-1615
/erlang/tags/1:17.0-dfsg-3/debian/patterns/erlang-base-hipe.patterns:1617-1637
/erlang/trunk/debian/patterns/erlang-base-hipe.patterns:1539-1616
+ /erlang/branches/experimental/debian/patterns/erlang-base-hipe.patterns:1283-1305,1468-1497,1591-1615
/erlang/trunk/debian/patterns/erlang-base-hipe.patterns:1539-1640
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,1591-1615
/erlang/tags/1:17.0-dfsg-3/debian/patterns/erlang-base.patterns:1617-1637
/erlang/trunk/debian/patterns/erlang-base.patterns:1539-1616
+ /erlang/branches/experimental/debian/patterns/erlang-base.patterns:1283-1305,1468-1497,1591-1615
/erlang/trunk/debian/patterns/erlang-base.patterns:1539-1640
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,1591-1615
/erlang/tags/1:17.0-dfsg-3/debian/patterns/erlang-common-test.patterns:1617-1637
/erlang/trunk/debian/patterns/erlang-common-test.patterns:1539-1616
+ /erlang/branches/experimental/debian/patterns/erlang-common-test.patterns:1283-1305,1468-1497,1591-1615
/erlang/trunk/debian/patterns/erlang-common-test.patterns:1539-1640
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,1591-1615
/erlang/tags/1:17.0-dfsg-3/debian/patterns/erlang-ic.patterns:1617-1637
/erlang/trunk/debian/patterns/erlang-ic.patterns:1539-1616
+ /erlang/branches/experimental/debian/patterns/erlang-ic.patterns:1283-1305,1468-1497,1591-1615
/erlang/trunk/debian/patterns/erlang-ic.patterns:1539-1640
Modified: erlang/branches/backport-wheezy/debian/rules
===================================================================
--- erlang/branches/backport-wheezy/debian/rules 2014-07-14 10:11:32 UTC (rev 1656)
+++ erlang/branches/backport-wheezy/debian/rules 2014-07-25 16:47:03 UTC (rev 1657)
@@ -489,7 +489,7 @@
binary: binary-indep binary-arch
-REL=17.0
+REL=17.1
RELDIR=$(REL)
DEB_REL=$(REL)-dfsg
Property changes on: erlang/branches/backport-wheezy/debian/scripts/analyse
___________________________________________________________________
Modified: svn:mergeinfo
- /erlang/branches/experimental/debian/scripts/analyse:1283-1305,1468-1497,1591-1615
/erlang/tags/1:17.0-dfsg-3/debian/scripts/analyse:1617-1637
/erlang/trunk/debian/scripts/analyse:1539-1616
+ /erlang/branches/experimental/debian/scripts/analyse:1283-1305,1468-1497,1591-1615
/erlang/trunk/debian/scripts/analyse:1539-1640
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,1591-1615
/erlang/tags/1:17.0-dfsg-3/debian/scripts/erlang-depends.in:1617-1637
/erlang/trunk/debian/scripts/erlang-depends.in:1539-1616
+ /erlang/branches/experimental/debian/scripts/erlang-depends.in:1283-1305,1468-1497,1591-1615
/erlang/trunk/debian/scripts/erlang-depends.in:1539-1640
More information about the Pkg-erlang-commits
mailing list