[Pkg-erlang-commits] r1722 - in yaws/trunk/debian: . conf patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Tue Aug 18 07:28:52 UTC 2015
Author: sgolovan
Date: 2015-08-18 07:28:52 +0000 (Tue, 18 Aug 2015)
New Revision: 1722
Added:
yaws/trunk/debian/erlang-yapp.docs
yaws/trunk/debian/erlang-yapp.install
Removed:
yaws/trunk/debian/patches/docs.diff
yaws/trunk/debian/patches/gnu.diff
yaws/trunk/debian/patches/m32m64.diff
Modified:
yaws/trunk/debian/changelog
yaws/trunk/debian/conf/localhost-ssl.conf
yaws/trunk/debian/conf/localhost.conf
yaws/trunk/debian/conf/yaws-chat.conf
yaws/trunk/debian/conf/yaws-mail.conf
yaws/trunk/debian/conf/yaws-wiki.conf
yaws/trunk/debian/conf/yaws-yapp.conf
yaws/trunk/debian/conf/yaws.conf
yaws/trunk/debian/control
yaws/trunk/debian/erlang-yaws.install
yaws/trunk/debian/patches/r18.diff
yaws/trunk/debian/patches/series
yaws/trunk/debian/rules
yaws/trunk/debian/yaws-application.postinst.in
yaws/trunk/debian/yaws-chat.install
yaws/trunk/debian/yaws-chat.links
yaws/trunk/debian/yaws-doc.install
yaws/trunk/debian/yaws-mail.install
yaws/trunk/debian/yaws-mail.links
yaws/trunk/debian/yaws-wiki.install
yaws/trunk/debian/yaws-wiki.links
yaws/trunk/debian/yaws-yapp.install
yaws/trunk/debian/yaws-yapp.links
yaws/trunk/debian/yaws.README.Debian
yaws/trunk/debian/yaws.dirs
Log:
[yaws]
* New upstream release.
* Simplified the get-orig-source target in debian/rules because the upstream
no longer creates the yaws symlink at the upper level in the tarball.
* Moved the Yaws applications web files to /usr/share/yaws-<application>/www,
or to /var/lib/yaws-wiki/www.
* Converted directory /usr/lib/yaws into a symlink since upstream now
installs Yaws binaries into /usr/lib/yaws-<version> instead of
/usr/lib/yaws.
Modified: yaws/trunk/debian/changelog
===================================================================
--- yaws/trunk/debian/changelog 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/changelog 2015-08-18 07:28:52 UTC (rev 1722)
@@ -1,8 +1,17 @@
-yaws (1.98-6) UNRELEASED; urgency=medium
+yaws (1.99-1) unstable; urgency=medium
- * NOT RELEASED YET
+ * New upstream release.
+ * Simplified the get-orig-source target in debian/rules because the upstream
+ no longer creates the yaws symlink at the upper level in the tarball.
+ * Moved the Yaws applications web files to /usr/share/yaws-<application>/www,
+ or to /var/lib/yaws-wiki/www.
+ * Converted directory /usr/lib/yaws into a symlink since upstream now
+ installs Yaws binaries into /usr/lib/yaws-<version> instead of
+ /usr/lib/yaws.
+ * Moved the directory for custom Yaws modules from /usr/lib/yaws/custom to
+ /usr/local/lib/yaws.
- -- Sergei Golovan <sgolovan at debian.org> Sun, 05 Jul 2015 17:26:46 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Tue, 18 Aug 2015 09:03:50 +0300
yaws (1.98-5) unstable; urgency=medium
Modified: yaws/trunk/debian/conf/localhost-ssl.conf
===================================================================
--- yaws/trunk/debian/conf/localhost-ssl.conf 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/conf/localhost-ssl.conf 2015-08-18 07:28:52 UTC (rev 1722)
@@ -14,7 +14,7 @@
<server localhost>
port = 8443
listen = 0.0.0.0
- docroot = /usr/share/yaws
+ docroot = /usr/share/yaws/www
# dir_listings = true
<ssl>
keyfile = /etc/yaws/yaws-key.pem
Modified: yaws/trunk/debian/conf/localhost.conf
===================================================================
--- yaws/trunk/debian/conf/localhost.conf 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/conf/localhost.conf 2015-08-18 07:28:52 UTC (rev 1722)
@@ -14,7 +14,7 @@
<server localhost>
port = 8080
listen = 0.0.0.0
- docroot = /usr/share/yaws
+ docroot = /usr/share/yaws/www
# dir_listings = true
</server>
Modified: yaws/trunk/debian/conf/yaws-chat.conf
===================================================================
--- yaws/trunk/debian/conf/yaws-chat.conf 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/conf/yaws-chat.conf 2015-08-18 07:28:52 UTC (rev 1722)
@@ -4,7 +4,7 @@
# beam code is placed. The daemon will add this
# directory to its search path
-ebin_dir = /usr/lib/yaws/chat/ebin
+ebin_dir = /usr/lib/yaws-chat/ebin
# Edit the following virtual server definition to
# enable chat server.
@@ -12,6 +12,6 @@
#<server chat>
# port = 8080
# listen = 0.0.0.0
-# docroot = /usr/share/yaws-chat
+# docroot = /usr/share/yaws-chat/www
#</server>
Modified: yaws/trunk/debian/conf/yaws-mail.conf
===================================================================
--- yaws/trunk/debian/conf/yaws-mail.conf 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/conf/yaws-mail.conf 2015-08-18 07:28:52 UTC (rev 1722)
@@ -4,7 +4,7 @@
# beam code is placed. The daemon will add this
# directory to its search path
-ebin_dir = /usr/lib/yaws/mail/ebin
+ebin_dir = /usr/lib/yaws-mail/ebin
# Edit the following virtual server definition to
# enable webmail application.
@@ -12,6 +12,6 @@
#<server mail>
# port = 8080
# listen = 0.0.0.0
-# docroot = /usr/share/yaws-mail
+# docroot = /usr/share/yaws-mail/www
#</server>
Modified: yaws/trunk/debian/conf/yaws-wiki.conf
===================================================================
--- yaws/trunk/debian/conf/yaws-wiki.conf 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/conf/yaws-wiki.conf 2015-08-18 07:28:52 UTC (rev 1722)
@@ -4,7 +4,7 @@
# beam code is placed. The daemon will add this
# directory to its search path
-ebin_dir = /usr/lib/yaws/wiki/ebin
+ebin_dir = /usr/lib/yaws-wiki/ebin
# Edit the following virtual server definition to
# enable yaws wiki.
@@ -12,6 +12,6 @@
#<server wiki>
# port = 8080
# listen = 0.0.0.0
-# docroot = /var/lib/yaws-wiki
+# docroot = /var/lib/yaws-wiki/www
#</server>
Modified: yaws/trunk/debian/conf/yaws-yapp.conf
===================================================================
--- yaws/trunk/debian/conf/yaws-yapp.conf 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/conf/yaws-yapp.conf 2015-08-18 07:28:52 UTC (rev 1722)
@@ -4,7 +4,7 @@
# beam code is placed. The daemon will add this
# directory to its search path
-ebin_dir = /usr/lib/yaws/yapp/ebin
+ebin_dir = /usr/lib/yapp/ebin
# Start yapp at startup
@@ -20,7 +20,7 @@
#<server yapp>
# port = 8080
# listen = 0.0.0.0
-# docroot = /usr/share/yaws-yapp
+# docroot = /usr/share/yaws-yapp/www
# dir_listings = true
# arg_rewrite_mod = yapp
# <opaque>
Modified: yaws/trunk/debian/conf/yaws.conf
===================================================================
--- yaws/trunk/debian/conf/yaws.conf 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/conf/yaws.conf 2015-08-18 07:28:52 UTC (rev 1722)
@@ -1,32 +1,29 @@
# conf for yaws
+# First we have a set of globals that apply to all virtual servers
-# first we have a set of globals
-# That apply to all virtual servers
-
-
# This is the directory where all logfiles for
-# all virtual servers will be written
+# all virtual servers will be written.
logdir = /var/log/yaws
-# This the path to a directory where additional
-# beam code can be placed. The daemon will add this
-# directory to its search path
+# These are the paths to directories where additional
+# beam code can be placed. The daemon will add these
+# directories to its search path.
-ebin_dir = /usr/lib/yaws/custom/ebin
+ebin_dir = /usr/local/lib/yaws/ebin
# This is a directory where application specific .hrl
-# files can be placed. application specifig .yaws code can
-# then include these .hrl files
+# files can be placed. Application-specific .yaws code can
+# then include these .hrl files.
-include_dir = /usr/lib/yaws/custom/include
+include_dir = /usr/local/lib/yaws/include
# Set this to an integer value to control
-# max number of connections from clients into the server
+# max number of connections from clients into the server.
max_connections = nolimit
@@ -35,7 +32,7 @@
# kept alive using keepalive. Setting this parameter to an integer X
# will ensure that connections are closed once they have been used X times.
# This can be a useful to guard against long running connections
-# collecting too much garbage in the erlang VM.
+# collecting too much garbage in the Erlang VM.
keepalive_maxuses = nolimit
@@ -57,16 +54,17 @@
acceptor_pool_size = 8
+
# This is a debug variable, possible values are http | traffic | false
# It is also possible to set the trace (possibly to the tty) while
# invoking yaws from the shell as in
-# yaws -i -T -x (see man yaws)
+# yaws -i -T -x (see man yaws).
trace = false
# Enable this if we want to use the old OTP ssl implementation
-# OTP R13B03 is known to work with this flag set to false (default)
+# OTP R13B03 is known to work with this flag set to false (default).
use_old_ssl = false
@@ -80,9 +78,9 @@
# By default yaws will copy the erlang error_log and
-# end write it to a wrap log called report.log (in the logdir)
-# this feature can be turned off. This would typically
-# be the case when yaws runs within another larger app
+# append it to a wrap log called report.log (in the logdir).
+# This feature can be turned off. This would typically
+# be the case when yaws runs within another larger app.
copy_error_log = true
@@ -99,7 +97,7 @@
log_resolve_hostname = false
-# Fail completely or not if yaws fails to bind a listen socket
+# Fail completely or not if yaws fails to bind a listen socket.
fail_on_bind_err = true
@@ -112,11 +110,15 @@
#auth_log = true
-# When we're running multiple yaws systems on the same
+# When we're running multiple yaws systems on the same
# host, we need to give each yaws system an individual
# name. Yaws will write a number of runtime files under
-# /tmp/yaws/${id}
+# ${HOME}/.yaws/yaws/${id}
# The default value is "default"
+# If we're not planning to run multiple webservers on the
+# same host it's much better to leave this value unset since
+# then all the ctl function (--stop et.el) work without having
+# to supply the id.
#
# In Debian system init script supplies id from the command
# line, so it's not necessary to specify it here
@@ -126,9 +128,10 @@
# Earlier versions of Yaws picked the first virtual host
# in a list of hosts with the same IP/PORT when the Host:
-# header doesn't match any name on any Host
+# header doesn't match any name on any Host.
# This is often nice in testing environments but not
-# acceptable in real live hosting scenarios
+# acceptable in real-world hosting scenarios;
+# think http://porn.bigcompany.com
pick_first_virthost_on_nomatch = true
@@ -162,6 +165,8 @@
# port = 8080
# listen = 0.0.0.0
# docroot = /var/www/yaws
+# auth_log = true
+# appmods = <cgi-bin, yaws_appmod_cgi>
#</server>
#<server localhost>
@@ -170,6 +175,8 @@
# docroot = /var/www/yaws-webdav
# dir_listings = true
# dav = true
+# auth_log = true
+# statistics = true
# <auth>
# realm = foobar
# dir = /
@@ -179,16 +186,17 @@
#</server>
-# And then an ssl server
+# Now an SSL server
#<server www>
# port = 8443
# docroot = /var/www/yaws-ssl
# listen = 0.0.0.0
# dir_listings = true
+# auth_log = true
# <ssl>
# keyfile = /etc/yaws/yaws-key.pem
# certfile = /etc/yaws/yaws-cert.pem
+# depth = 0
# </ssl>
#</server>
-
Modified: yaws/trunk/debian/control
===================================================================
--- yaws/trunk/debian/control 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/control 2015-08-18 07:28:52 UTC (rev 1722)
@@ -16,7 +16,7 @@
Architecture: all
Provides: httpd, httpd-cgi
Depends: erlang-yaws (>= ${binary:Version}), adduser, ssl-cert, lsb-base (>= 3.0-6), ${misc:Depends}
-Suggests: yaws-doc, yaws-chat, yaws-mail, yaws-wiki, yaws-yapp, logrotate
+Suggests: yaws-doc, yaws-chat, yaws-mail, yaws-wiki, yaws-yapp, erlang-yapp, logrotate
Description: High performance HTTP 1.1 webserver written in Erlang
Yaws is a high performance HTTP 1.1 webserver written in Erlang. It is a
multithreaded webserver where one Erlang light weight process is used to
@@ -29,6 +29,7 @@
Architecture: any
Depends: ${erlang-abi:Depends}, ${erlang:Depends}, ${shlibs:Depends}, ${misc:Depends}
Suggests: yaws, yaws-doc, zip, bzip2
+Breaks: yaws (<< 1.99), yaws-chat (<< 1.99), yaws-mail (<< 1.99), yaws-wiki (<< 1.99), yaws-yapp (<< 1.99)
Replaces: yaws (<< 1.88-2)
Description: Erlang application which implements HTTP webserver
Yaws is a high performance HTTP 1.1 webserver written in Erlang. It is a
@@ -38,13 +39,28 @@
This package includes Erlang Yaws application suitable to work in embedded
mode where it runs as a webserver in another Erlang application.
+Package: erlang-yapp
+Architecture: any
+Depends: ${erlang:Depends}, erlang-yaws (= ${binary:Version}), ${misc:Depends}
+Suggests: yaws-yapp
+Replaces: yaws-yapp (<< 1.99-1)
+Description: Erlang application for deploying Yaws webserver applications
+ Yaws-yapp (Yaws application handler) is a helper application.
+ It takes care of adding, and removing, the applications into a running
+ server. When anyone access the server with an URL that matches the path
+ for an added application, the docroot will be temporarily switched
+ to where the web pages for that application are located.
+ .
+ This package includes the Yapp Erlang module which can be used in Yaws
+ embedded mode without separate server config.
+
Package: yaws-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
Suggests: erlang-yaws, yaws
Replaces: yaws (<< 1.87)
-Description: Documentation and examples for Yaws web server
+Description: Documentation and examples for Yaws webserver
Yaws is a high performance HTTP 1.1 webserver written in Erlang. It is a
multithreaded webserver where one Erlang light weight process is used to
handle each client.
@@ -55,14 +71,14 @@
Section: web
Architecture: all
Depends: ${erlang:Depends}, yaws (>= ${binary:Version}), ${misc:Depends}
-Description: Chat application for Yaws web server
+Description: Chat application for Yaws webserver
Yaws-chat allows one to create a very simple web-based chatroom.
Package: yaws-mail
Section: web
Architecture: all
Depends: ${erlang:Depends}, yaws (>= ${binary:Version}), ${misc:Depends}
-Description: Webmail application for Yaws web server
+Description: Webmail application for Yaws webserver
Yaws-mail is a small stateless webmail application. It requires
SMTP and POP3 servers to operate and does not store email locally.
@@ -70,17 +86,20 @@
Section: web
Architecture: all
Depends: ${erlang:Depends}, yaws (>= ${binary:Version}), ${misc:Depends}
-Description: Wiki application for Yaws web server
+Description: Wiki application for Yaws webserver
Yaws-wiki is a small wiki application, written in Erlang for Yaws
- web server.
+ webserver.
Package: yaws-yapp
Section: web
Architecture: all
-Depends: ${erlang:Depends}, yaws (>= ${binary:Version}), ${misc:Depends}
-Description: Provides an easy way to deploy applications for Yaws web server
+Depends: ${erlang:Depends}, yaws (>= ${binary:Version}), erlang-yapp (>= ${binary:Version}), ${misc:Depends}
+Description: Provides an easy way to deploy applications for Yaws webserver
Yaws-yapp (Yaws application handler) is a helper application.
It takes care of adding, and removing, the applications into a running
server. When anyone access the server with an URL that matches the path
for an added application, the docroot will be temporarily switched
to where the web pages for that application are located.
+ .
+ This package provides Yapp config file which is intended to use along
+ with fully installed Yaws webserver.
Copied: yaws/trunk/debian/erlang-yapp.docs (from rev 1691, yaws/trunk/debian/yaws-yapp.docs)
===================================================================
--- yaws/trunk/debian/erlang-yapp.docs (rev 0)
+++ yaws/trunk/debian/erlang-yapp.docs 2015-08-18 07:28:52 UTC (rev 1722)
@@ -0,0 +1 @@
+applications/yapp/README
Copied: yaws/trunk/debian/erlang-yapp.install (from rev 1691, yaws/trunk/debian/yaws-yapp.install)
===================================================================
--- yaws/trunk/debian/erlang-yapp.install (rev 0)
+++ yaws/trunk/debian/erlang-yapp.install 2015-08-18 07:28:52 UTC (rev 1722)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/yapp* /usr/lib
Modified: yaws/trunk/debian/erlang-yaws.install
===================================================================
--- yaws/trunk/debian/erlang-yaws.install 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/erlang-yaws.install 2015-08-18 07:28:52 UTC (rev 1722)
@@ -1,3 +1,4 @@
-debian/tmp/usr/lib /usr/
+debian/tmp/usr/lib/pkgconfig /usr/lib/
+debian/tmp/usr/lib/yaws* /usr/lib/
debian/tmp/usr/share/man/man5/yaws_api.5 /usr/share/man/man5/
debian/tmp/usr/share/man/man5/yaws_soap_lib.5 /usr/share/man/man5/
Deleted: yaws/trunk/debian/patches/docs.diff
===================================================================
--- yaws/trunk/debian/patches/docs.diff 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/patches/docs.diff 2015-08-18 07:28:52 UTC (rev 1722)
@@ -1,37 +0,0 @@
-Patch removes dependency om non-free latex2html package when building
-docs. Also, it renames \ifpdf to \ifpdfoutput to avoid clash with ifpdf
-package (sourced by geometry package in TeXLive 2009).
-
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -17,9 +17,6 @@
- @if [ -z "$(PDFLATEX)" ]; then \
- echo "Need pdflatex"; exit 1; \
- fi
-- @if [ -z "`which latex2html`" ]; then \
-- echo "Need latex2html"; exit 1; \
-- fi
-
-
-
---- a/doc/yaws.tex
-+++ b/doc/yaws.tex
-@@ -34,7 +34,7 @@
-
- \usepackage[T1]{fontenc}
- \usepackage{xspace}
--\usepackage{html}
-+%\usepackage{html}
-
- \makeatother
- \begin{document}
---- 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
- cp yaws_api.5 $(DESTDIR)$(PREFIX)/share/man/man5
-+ cp yaws_soap_lib.5 $(DESTDIR)$(PREFIX)/share/man/man5
-
-
-
Deleted: yaws/trunk/debian/patches/gnu.diff
===================================================================
--- yaws/trunk/debian/patches/gnu.diff 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/patches/gnu.diff 2015-08-18 07:28:52 UTC (rev 1722)
@@ -1,37 +0,0 @@
-Patch by Sergei Golovan allows YWAS to build on hurd-i386 architecture.
-
---- a/configure
-+++ b/configure
-@@ -4191,6 +4191,16 @@
- FPIC=-fPIC
-
- ;;
-+ *gnu*)
-+ cat >>confdefs.h <<\_ACEOF
-+#define GNU 1
-+_ACEOF
-+
-+ LD_SHARED="gcc -shared"
-+
-+ FPIC=-fpic
-+
-+ ;;
- *cygwin*)
- # Extract the first word of "werl", so it can be a program name with args.
- set dummy werl; ac_word=$2
---- a/configure.in
-+++ b/configure.in
-@@ -299,6 +299,13 @@
- FPIC=-fPIC
- AC_SUBST(FPIC)
- ;;
-+ *gnu*)
-+ AC_DEFINE(GNU)
-+ LD_SHARED="gcc -shared"
-+ AC_SUBST(LD_SHARED)
-+ FPIC=-fPIC
-+ AC_SUBST(FPIC)
-+ ;;
- *cygwin*)
- AC_PATH_PROG(WERL, werl)
- AC_SUBST(WERL)
Deleted: yaws/trunk/debian/patches/m32m64.diff
===================================================================
--- yaws/trunk/debian/patches/m32m64.diff 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/patches/m32m64.diff 2015-08-18 07:28:52 UTC (rev 1722)
@@ -1,47 +0,0 @@
-Patch by Sergei Golovan removes -m32 or -m64 gcc command line options
-(which lead to FTBFS) for all non-x86* architectures.
-
---- 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
-- x86_64) CBIT= ;;
-- *) CBIT=-m64 ;;
-+ i?86) CBIT=-m64 ;;
-+ *) CBIT= ;;
- esac
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: found 32-bit Erlang" >&5
- $as_echo "$as_me: found 32-bit Erlang" >&6;}
- case "$host_cpu" in
-- i?86) CBIT= ;;
-- armv6l) CBIT= ;;
-- *) CBIT=-m32 ;;
-+ x86_64) CBIT=-m32 ;;
-+ *) CBIT= ;;
- esac
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
---- a/configure.in
-+++ b/configure.in
-@@ -230,14 +230,13 @@
- end end)])],
- [AC_MSG_NOTICE(found 64-bit Erlang)
- case "$host_cpu" in
-- x86_64) CBIT= ;;
-- *) CBIT=-m64 ;;
-+ i?86) CBIT=-m64 ;;
-+ *) CBIT= ;;
- esac],
- [AC_MSG_NOTICE(found 32-bit Erlang)
- case "$host_cpu" in
-- i?86) CBIT= ;;
-- armv6l) CBIT= ;;
-- *) CBIT=-m32 ;;
-+ x86_64) CBIT=-m32 ;;
-+ *) CBIT= ;;
- esac])
- CFLAGS="$CFLAGS $CBIT"
- LD_SHARED="$CC $CBIT -shared"
Modified: yaws/trunk/debian/patches/r18.diff
===================================================================
--- yaws/trunk/debian/patches/r18.diff 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/patches/r18.diff 2015-08-18 07:28:52 UTC (rev 1722)
@@ -2,16 +2,16 @@
Description: Patch removes treating warnings as errors during the build
process. This fixes FTBFS with Erlang 18.
Debian-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790625
-Last-Modified: Sun, 05 Jul 2015 17:21:29 +0300
+Last-Modified: Tue, 18 Aug 2015 09:03:33 +0300
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -63,7 +63,7 @@
+--- a/include.mk
++++ b/include.mk
+@@ -3,7 +3,7 @@
+ am__v_ERLC_0 = @echo " ERLC " $@;
+ am__v_ERLC_1 =
-
- EBIN_FILES=$(MODULES:%=../ebin/%.$(EMULATOR)) ../ebin/yaws.app ../ebin/yaws.appup
--ERLC_FLAGS+=-Werror $(DEBUG_FLAGS) -pa ../../yaws -I ../include
-+ERLC_FLAGS+=$(DEBUG_FLAGS) -pa ../../yaws -I ../include
-
- #
- # Targets
+-ERLC_GENERIC_FLAGS = -Werror +debug_info $(DEBUG_ERLC_FLAGS) \
++ERLC_GENERIC_FLAGS = +debug_info $(DEBUG_ERLC_FLAGS) \
+ -pa $(top_srcdir) -pa $(top_builddir) -pa $(top_builddir)/ebin \
+ -I $(top_srcdir)/include -I $(srcdir)/../include \
+ -I $(top_builddir)/include -I $(builddir)/../include
Modified: yaws/trunk/debian/patches/series
===================================================================
--- yaws/trunk/debian/patches/series 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/patches/series 2015-08-18 07:28:52 UTC (rev 1722)
@@ -1,5 +1 @@
-installapps.diff
-gnu.diff
-docs.diff
-m32m64.diff
r18.diff
Modified: yaws/trunk/debian/rules
===================================================================
--- yaws/trunk/debian/rules 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/rules 2015-08-18 07:28:52 UTC (rev 1722)
@@ -37,17 +37,16 @@
dh_testroot
#
# Clean up applications included into yaws distribution
- [ ! -f include.mk ] || \
+ [ ! -f Makefile ] || \
for appdir in applications/* ; do \
(cd $$appdir ; \
$(MAKE) clean || exit 1 ; \
$(MAKE) cleandocs || exit 1) \
done
- rm -rf applications/chat/ebin
#
# Clean up after the build process.
- [ ! -f include.mk ] || $(MAKE) clean
- [ ! -f include.mk ] || $(MAKE) conf_clean
+ [ ! -f Makefile ] || $(MAKE) clean
+ [ ! -f Makefile ] || $(MAKE) conf_clean
rm -f priv/charset.def
#
rm -f erl_crash.dump
@@ -69,16 +68,17 @@
dh_testdir
#
# Compile the package.
- mkdir -p examples/ebin
TYPE="$(TYPE)" $(MAKE) DLL_LIBS=-lc
+ #
+ # Compile the Yapp application
+ cd applications/yapp ; TYPE="$(TYPE)" $(MAKE)
override_dh_auto_build-indep:
dh_testdir
#
# Build applications included into yaws distribution
- for appdir in applications/* ; do \
- (cd $$appdir ; \
- mkdir -p ebin ; \
+ for appdir in chat mail wiki ; do \
+ (cd applications/$$appdir ; \
TYPE="$(TYPE)" $(MAKE) || exit 1) \
done
#
@@ -95,21 +95,21 @@
# Install the package into debian/yaws.
$(MAKE) install DESTDIR=$(TMPDIR)
#
- # Fix location of epam binary
- mv $(TMPDIR)/usr/lib/yaws/priv/lib/epam $(TMPDIR)/usr/lib/yaws/priv/
+ # Install the Yapp application
+ cd applications/yapp ; $(MAKE) install DESTDIR=$(TMPDIR)
#
# Fix permissions on examples
chmod a-x $(TMPDIR)/var/yaws/www/testdir/index.html
#
- # Remove duplicated headers
- rm -f $(TMPDIR)/usr/lib/yaws/*.hrl
+ # Remove unneeded .la files
+ rm -vf $(TMPDIR)/usr/lib/yaws-*/priv/lib/*.la
#
- # Remove useless .empty files and .xvpics directory
- find $(TMPDIR) -type f -name '.*' -print -exec rm -rf \{\} \;
+ # Relocate examples
+ mv $(TMPDIR)/usr/lib/yaws-*/examples $(TMPDIR)/var/yaws/
+ mv $(TMPDIR)/usr/lib/yapp-*/examples $(TMPDIR)/var/yaws/examples/yapp
+ mv $(TMPDIR)/usr/lib/yapp-*/priv $(TMPDIR)/var/yaws/yapp-priv
+ mv $(TMPDIR)/usr/lib/yapp-*/doc $(TMPDIR)/var/yaws/yapp-doc
#
- # Remove empty directories
- rm -rf $(TMPDIR)/usr/lib/yaws/examples/
- #
dh_install -a
override_dh_auto_install-indep:
@@ -118,31 +118,16 @@
# Install applications (and READMEs) included into yaws distribution
# Application beams go to /usr/lib/yaws/$application/ebin
# Other application files go to /usr/share/yaws-$application/docroot
- for appdir in applications/* ; do \
- (cd $$appdir ; \
- app=`basename $$appdir` ; \
- $(MAKE) install DESTDIR=$(DESTDIR)-$$app \
- EBININSTALLDIR=$(DESTDIR)-$$app/usr/lib/yaws/$$app/ebin \
- CHATINSTALLDIR=$(DESTDIR)-chat/usr/share/yaws-chat \
- MAILINSTALLDIR=$(DESTDIR)-mail/usr/share/yaws-mail \
- WIKIINSTALLDIR=$(DESTDIR)-wiki/var/lib/yaws-wiki || exit 1) \
+ for app in chat mail wiki ; do \
+ (cd applications/$$app ; \
+ $(MAKE) install DESTDIR=$(TMPDIR) || exit 1) \
done
#
# Fix permissions of application files
- for appdir in applications/* ; do \
- app=`basename $$appdir` ; \
- find $(DESTDIR)-$$app -type f -exec chmod a-x \{\} \; ; \
- done
+ find $(TMPDIR)/var/yaws -type f -exec chmod a-x \{\} \;
#
- # Remove useless empty files
- for appdir in applications/* ; do \
- app=`basename $$appdir` ; \
- find $(DESTDIR)-$$app -type f -name '.*' -print -exec rm -f \{\} \; ; \
- done
- #
# Generate postinst and postrm scripts for applications
- for appdir in applications/* ; do \
- app=`basename $$appdir` ; \
+ for app in chat mail wiki yapp ; do \
sed -e "s/@APPLICATION@/$$app/g" \
debian/yaws-application.postinst.in >debian/yaws-$$app.postinst || exit 1; \
sed -e "s/@APPLICATION@/$$app/g" \
@@ -152,19 +137,16 @@
dh_install -i
override_dh_compress:
- dh_compress -X.erl -X.beam -X.yaws -X.pdf -X .ps -X .eps
+ dh_compress -X.erl -X.beam -X.yaws -X.pdf -X .ps -X .eps -X Makefile
override_dh_gencontrol:
erlang-depends
dh_gencontrol
-v=1.98
+v=1.99
get-orig-source:
- wget -O - http://yaws.hyber.org/download/yaws-$(v).tar.gz | tar zx
- tar zcf yaws_$(v).orig.tar.gz yaws-$(v)
- rm -r yaws-$(v)
- rm yaws
+ wget -O yaws_$(v).orig.tar.gz http://yaws.hyber.org/download/yaws-$(v).tar.gz
.PHONY: override_dh_auto_clean override_dh_auto_configure override_dh_auto_build-arch \
override_dh_auto_build-indep override_dh_auto_test override_dh_auto_install-arch \
Modified: yaws/trunk/debian/yaws-application.postinst.in
===================================================================
--- yaws/trunk/debian/yaws-application.postinst.in 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/yaws-application.postinst.in 2015-08-18 07:28:52 UTC (rev 1722)
@@ -27,7 +27,7 @@
# Wiki requires write permissions, so give them to make wiki working
# out-of-the-box
if [ "@APPLICATION@" = "wiki" ] ; then
- chown yaws:yaws /var/lib/yaws- at APPLICATION@
+ chown yaws:yaws /var/lib/yaws- at APPLICATION@/www
fi
# Create config symlink
Modified: yaws/trunk/debian/yaws-chat.install
===================================================================
--- yaws/trunk/debian/yaws-chat.install 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/yaws-chat.install 2015-08-18 07:28:52 UTC (rev 1722)
@@ -1 +1,3 @@
-debian/conf/yaws-chat.conf /etc/yaws/conf.avail/
+debian/tmp/var/yaws/chat/www /usr/share/yaws-chat/
+debian/tmp/var/yaws/chat/ebin /usr/lib/yaws-chat/
+debian/conf/yaws-chat.conf /etc/yaws/conf.avail/
Modified: yaws/trunk/debian/yaws-chat.links
===================================================================
--- yaws/trunk/debian/yaws-chat.links 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/yaws-chat.links 2015-08-18 07:28:52 UTC (rev 1722)
@@ -1 +1 @@
-usr/share/yaws-chat usr/lib/yaws/chat/priv/docroot
+usr/share/yaws-chat/www usr/lib/yaws-chat/www
Modified: yaws/trunk/debian/yaws-doc.install
===================================================================
--- yaws/trunk/debian/yaws-doc.install 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/yaws-doc.install 2015-08-18 07:28:52 UTC (rev 1722)
@@ -1 +1,3 @@
-debian/tmp/var/yaws/* usr/share/doc/yaws-doc/examples/
+debian/tmp/var/yaws/examples usr/share/doc/yaws-doc/
+debian/tmp/var/yaws/www usr/share/doc/yaws-doc/examples/
+debian/tmp/var/yaws/yapp-doc/* usr/share/doc/yaws-doc/yapp/
Modified: yaws/trunk/debian/yaws-mail.install
===================================================================
--- yaws/trunk/debian/yaws-mail.install 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/yaws-mail.install 2015-08-18 07:28:52 UTC (rev 1722)
@@ -1 +1,4 @@
-debian/conf/yaws-mail.conf /etc/yaws/conf.avail/
+debian/conf/yaws-mail.conf /etc/yaws/conf.avail/
+debian/tmp/etc/mail/yaws-webmail.conf /etc/mail/
+debian/tmp/var/yaws/mail/www /usr/share/yaws-mail/
+debian/tmp/var/yaws/mail/ebin /usr/lib/yaws-mail/
Modified: yaws/trunk/debian/yaws-mail.links
===================================================================
--- yaws/trunk/debian/yaws-mail.links 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/yaws-mail.links 2015-08-18 07:28:52 UTC (rev 1722)
@@ -1 +1 @@
-usr/share/yaws-mail usr/lib/yaws/mail/priv/docroot
+usr/share/yaws-mail/www usr/lib/yaws-mail/www
Modified: yaws/trunk/debian/yaws-wiki.install
===================================================================
--- yaws/trunk/debian/yaws-wiki.install 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/yaws-wiki.install 2015-08-18 07:28:52 UTC (rev 1722)
@@ -1 +1,3 @@
+debian/tmp/var/yaws/wiki/www /var/lib/yaws-wiki/
+debian/tmp/var/yaws/wiki/ebin /usr/lib/yaws-wiki/
debian/conf/yaws-wiki.conf /etc/yaws/conf.avail/
Modified: yaws/trunk/debian/yaws-wiki.links
===================================================================
--- yaws/trunk/debian/yaws-wiki.links 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/yaws-wiki.links 2015-08-18 07:28:52 UTC (rev 1722)
@@ -1,2 +1,2 @@
-var/lib/yaws-wiki usr/lib/yaws/wiki/priv/docroot
-var/lib/yaws-wiki usr/share/yaws-wiki
+var/lib/yaws-wiki/www usr/share/yaws-wiki/www
+var/lib/yaws-wiki/www usr/lib/yaws-wiki/www
Modified: yaws/trunk/debian/yaws-yapp.install
===================================================================
--- yaws/trunk/debian/yaws-yapp.install 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/yaws-yapp.install 2015-08-18 07:28:52 UTC (rev 1722)
@@ -1 +1,2 @@
debian/conf/yaws-yapp.conf /etc/yaws/conf.avail/
+debian/tmp/var/yaws/yapp-priv/docroot/* /usr/share/yaws-yapp/www
Modified: yaws/trunk/debian/yaws-yapp.links
===================================================================
--- yaws/trunk/debian/yaws-yapp.links 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/yaws-yapp.links 2015-08-18 07:28:52 UTC (rev 1722)
@@ -1 +1 @@
-usr/share/yaws-yapp usr/lib/yaws/yapp/priv/docroot
+usr/share/yaws-yapp/www usr/lib/yaws-yapp/priv/docroot
Modified: yaws/trunk/debian/yaws.README.Debian
===================================================================
--- yaws/trunk/debian/yaws.README.Debian 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/yaws.README.Debian 2015-08-18 07:28:52 UTC (rev 1722)
@@ -1,7 +1,7 @@
Yaws allows one to use PAM for authentication purposes. Though epam binary
-which is used for that isn't suid root (this doesn't allow to authenticate
-using shadow system passwords). The local administrator may want to
-override permissions for /usr/lib/yaws/priv/epam.
+which is used for that isn't suid root (this doesn't allow yaws user to
+authenticate against shadow system passwords). The local administrator may
+want to override permissions for /usr/lib/yaws/priv/epam.
To make it sgid shadow run
Modified: yaws/trunk/debian/yaws.dirs
===================================================================
--- yaws/trunk/debian/yaws.dirs 2015-08-17 13:11:06 UTC (rev 1721)
+++ yaws/trunk/debian/yaws.dirs 2015-08-18 07:28:52 UTC (rev 1722)
@@ -2,6 +2,6 @@
etc/yaws/conf.avail
etc/yaws/conf.d
usr/bin
-usr/lib/yaws/custom/ebin
-usr/lib/yaws/custom/include
+usr/local/lib/yaws/ebin
+usr/local/lib/yaws/include
usr/share/yaws
More information about the Pkg-erlang-commits
mailing list