[Pkg-erlang-commits] r1557 - in yaws/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Sat Oct 19 13:40:04 UTC 2013
Author: sgolovan
Date: 2013-10-19 13:40:03 +0000 (Sat, 19 Oct 2013)
New Revision: 1557
Removed:
yaws/trunk/debian/patches/sha.diff
Modified:
yaws/trunk/debian/changelog
yaws/trunk/debian/patches/docs.diff
yaws/trunk/debian/patches/gnu.diff
yaws/trunk/debian/patches/installapps.diff
yaws/trunk/debian/patches/m32m64.diff
yaws/trunk/debian/patches/series
yaws/trunk/debian/rules
Log:
[yaws]
* New upstream release.
* Removed patch which fixed building with Erlang R16B01.
Modified: yaws/trunk/debian/changelog
===================================================================
--- yaws/trunk/debian/changelog 2013-10-17 19:09:56 UTC (rev 1556)
+++ yaws/trunk/debian/changelog 2013-10-19 13:40:03 UTC (rev 1557)
@@ -1,8 +1,9 @@
-yaws (1.96-5) UNRELEASED; urgency=low
+yaws (1.97-1) unstable; urgency=low
- * NOT RELEASED YET
+ * New upstream release.
+ * Removed patch which fixed building with Erlang R16B01.
- -- Sergei Golovan <sgolovan at debian.org> Mon, 23 Sep 2013 10:55:58 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Sat, 19 Oct 2013 17:37:30 +0400
yaws (1.96-4) unstable; urgency=low
Modified: yaws/trunk/debian/patches/docs.diff
===================================================================
--- yaws/trunk/debian/patches/docs.diff 2013-10-17 19:09:56 UTC (rev 1556)
+++ yaws/trunk/debian/patches/docs.diff 2013-10-19 13:40:03 UTC (rev 1557)
@@ -2,8 +2,8 @@
docs. Also, it renames \ifpdf to \ifpdfoutput to avoid clash with ifpdf
package (sourced by geometry package in TeXLive 2009).
---- yaws-1.96.orig/doc/Makefile
-+++ yaws-1.96/doc/Makefile
+--- a/doc/Makefile
++++ b/doc/Makefile
@@ -17,9 +17,6 @@
@if [ -z "$(PDFLATEX)" ]; then \
echo "Need pdflatex"; exit 1; \
@@ -14,8 +14,8 @@
---- yaws-1.96.orig/doc/yaws.tex
-+++ yaws-1.96/doc/yaws.tex
+--- a/doc/yaws.tex
++++ b/doc/yaws.tex
@@ -34,7 +34,7 @@
\usepackage[T1]{fontenc}
@@ -25,8 +25,8 @@
\makeatother
\begin{document}
---- yaws-1.96.orig/man/Makefile
-+++ yaws-1.96/man/Makefile
+--- a/man/Makefile
++++ b/man/Makefile
@@ -7,6 +7,7 @@
cp yaws.1 $(DESTDIR)$(PREFIX)/share/man/man1
cp yaws.conf.5 $(DESTDIR)$(PREFIX)/share/man/man5
@@ -35,4 +35,3 @@
-
Modified: yaws/trunk/debian/patches/gnu.diff
===================================================================
--- yaws/trunk/debian/patches/gnu.diff 2013-10-17 19:09:56 UTC (rev 1556)
+++ yaws/trunk/debian/patches/gnu.diff 2013-10-19 13:40:03 UTC (rev 1557)
@@ -1,8 +1,8 @@
Patch by Sergei Golovan allows YWAS to build on hurd-i386 architecture.
---- yaws-1.96.orig/configure
-+++ yaws-1.96/configure
-@@ -4240,6 +4240,16 @@
+--- a/configure
++++ b/configure
+@@ -4191,6 +4191,16 @@
FPIC=-fPIC
;;
@@ -19,9 +19,9 @@
*cygwin*)
# Extract the first word of "werl", so it can be a program name with args.
set dummy werl; ac_word=$2
---- yaws-1.96.orig/configure.in
-+++ yaws-1.96/configure.in
-@@ -304,6 +304,13 @@
+--- a/configure.in
++++ b/configure.in
+@@ -299,6 +299,13 @@
FPIC=-fPIC
AC_SUBST(FPIC)
;;
Modified: yaws/trunk/debian/patches/installapps.diff
===================================================================
--- yaws/trunk/debian/patches/installapps.diff 2013-10-17 19:09:56 UTC (rev 1556)
+++ yaws/trunk/debian/patches/installapps.diff 2013-10-19 13:40:03 UTC (rev 1557)
@@ -1,8 +1,8 @@
Patch makes yaws applications installing under /usr/lib/yaws directory
and docs installing to /usr/share/doc/yaws directory.
---- yaws-1.96.orig/applications/yapp/Makefile
-+++ yaws-1.96/applications/yapp/Makefile
+--- a/applications/yapp/Makefile
++++ b/applications/yapp/Makefile
@@ -24,8 +24,10 @@
rm -rf doc/*.html doc/edoc-info doc/stylesheet.css doc/*.png
Modified: yaws/trunk/debian/patches/m32m64.diff
===================================================================
--- yaws/trunk/debian/patches/m32m64.diff 2013-10-17 19:09:56 UTC (rev 1556)
+++ yaws/trunk/debian/patches/m32m64.diff 2013-10-19 13:40:03 UTC (rev 1557)
@@ -1,9 +1,9 @@
Patch by Sergei Golovan removes -m32 or -m64 gcc command line options
(which lead to FTBFS) for all non-x86* architectures.
---- yaws-1.96.orig/configure
-+++ yaws-1.96/configure
-@@ -4089,16 +4089,15 @@
+--- a/configure
++++ b/configure
+@@ -4088,16 +4088,15 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: found 64-bit Erlang" >&5
$as_echo "$as_me: found 64-bit Erlang" >&6;}
case "$host_cpu" in
@@ -24,9 +24,9 @@
esac
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
---- yaws-1.96.orig/configure.in
-+++ yaws-1.96/configure.in
-@@ -231,14 +231,13 @@
+--- a/configure.in
++++ b/configure.in
+@@ -230,14 +230,13 @@
end end)])],
[AC_MSG_NOTICE(found 64-bit Erlang)
case "$host_cpu" in
Modified: yaws/trunk/debian/patches/series
===================================================================
--- yaws/trunk/debian/patches/series 2013-10-17 19:09:56 UTC (rev 1556)
+++ yaws/trunk/debian/patches/series 2013-10-19 13:40:03 UTC (rev 1557)
@@ -2,4 +2,3 @@
gnu.diff
docs.diff
m32m64.diff
-sha.diff
Deleted: yaws/trunk/debian/patches/sha.diff
===================================================================
--- yaws/trunk/debian/patches/sha.diff 2013-10-17 19:09:56 UTC (rev 1556)
+++ yaws/trunk/debian/patches/sha.diff 2013-10-19 13:40:03 UTC (rev 1557)
@@ -1,9 +0,0 @@
---- yaws-1.96.orig/src/yaws_websockets.erl
-+++ yaws-1.96/src/yaws_websockets.erl
-@@ -1247,5 +1247,5 @@
-
- hash_nonce(Nonce) ->
- Salted = Nonce ++ "258EAFA5-E914-47DA-95CA-C5AB0DC85B11",
-- HashBin = crypto:sha(Salted),
-+ HashBin = crypto:hash(sha, Salted),
- base64:encode_to_string(HashBin).
Modified: yaws/trunk/debian/rules
===================================================================
--- yaws/trunk/debian/rules 2013-10-17 19:09:56 UTC (rev 1556)
+++ yaws/trunk/debian/rules 2013-10-19 13:40:03 UTC (rev 1557)
@@ -158,7 +158,7 @@
erlang-depends
dh_gencontrol
-v=1.96
+v=1.97
get-orig-source:
wget -O - http://yaws.hyber.org/download/yaws-$(v).tar.gz | tar zx
More information about the Pkg-erlang-commits
mailing list