[Pkg-erlang-commits] r1757 - in yaws/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Sat Mar 26 08:05:22 UTC 2016
Author: sgolovan
Date: 2016-03-26 08:05:21 +0000 (Sat, 26 Mar 2016)
New Revision: 1757
Added:
yaws/trunk/debian/patches/doc.diff
Modified:
yaws/trunk/debian/changelog
yaws/trunk/debian/patches/series
yaws/trunk/debian/rules
yaws/trunk/debian/yaws.dirs
yaws/trunk/debian/yaws.init
yaws/trunk/debian/yaws.install
Log:
[yaws]
* Fixed the paths of run_erl and to_erl utilities in the /usr/bin/yaws
script.
* Fixed FTBFS when dpkg-buildpackage -A is called to build architecture
independent packages only (closes: #806664).
* Moved the default Yaws default web files to /usr/share/yaws/www as
this directory is listed in the config files.
* Added --chdir option to the start-stop-daemon command execution to make
sure the Yaws working directory is its home and not the root.
* Fixed the compression_level option name in docs (closes: #815207).
Modified: yaws/trunk/debian/changelog
===================================================================
--- yaws/trunk/debian/changelog 2016-03-17 19:51:20 UTC (rev 1756)
+++ yaws/trunk/debian/changelog 2016-03-26 08:05:21 UTC (rev 1757)
@@ -1,8 +1,16 @@
-yaws (2.0.2-2) UNRELEASED; urgency=medium
+yaws (2.0.2-2) unstable; urgency=medium
- * NOT RELEASED YET
+ * Fixed the paths of run_erl and to_erl utilities in the /usr/bin/yaws
+ script.
+ * Fixed FTBFS when dpkg-buildpackage -A is called to build architecture
+ independent packages only (closes: #806664).
+ * Moved the default Yaws default web files to /usr/share/yaws/www as
+ this directory is listed in the config files.
+ * Added --chdir option to the start-stop-daemon command execution to make
+ sure the Yaws working directory is its home and not the root.
+ * Fixed the compression_level option name in docs (closes: #815207).
- -- Sergei Golovan <sgolovan at debian.org> Fri, 20 Nov 2015 13:47:32 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Sat, 26 Mar 2016 11:03:59 +0300
yaws (2.0.2-1) unstable; urgency=medium
Added: yaws/trunk/debian/patches/doc.diff
===================================================================
--- yaws/trunk/debian/patches/doc.diff (rev 0)
+++ yaws/trunk/debian/patches/doc.diff 2016-03-26 08:05:21 UTC (rev 1757)
@@ -0,0 +1,27 @@
+Author: Sergei Golovan
+Description: Patch fixes the compression_level option name in a documentation.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815207
+Last-Modified: Sat, 26 Mar 2016 11:03:08 +0300
+
+--- a/doc/yaws.tex
++++ b/doc/yaws.tex
+@@ -2728,7 +2728,7 @@
+ used, the specified value must be strictly positive. The default
+ value is nolimit.
+
+- \item \verb+compress_level = none | default | best_compression | best_speed | 0..9+ ---\\
++ \item \verb+compression_level = none | default | best_compression | best_speed | 0..9+ ---\\
+ Defines the compression level to be used. 0 (none), gives no
+ compression at all, 1 (best\_speed) gives best speed and 9
+ (best\_compression) gives best compression. The default value is
+--- a/man/yaws.conf.5
++++ b/man/yaws.conf.5
+@@ -567,7 +567,7 @@
+ .RE
+
+ .IP
+-\fBcompress_level = none | default | best_compression | best_speed | 0..9\fR
++\fBcompression_level = none | default | best_compression | best_speed | 0..9\fR
+ .RS 12
+ Defines the compression level to be used. 0 (none), gives no compression at all,
+ 1 (best_speed) gives best speed and 9 (best_compression) gives best
Modified: yaws/trunk/debian/patches/series
===================================================================
--- yaws/trunk/debian/patches/series 2016-03-17 19:51:20 UTC (rev 1756)
+++ yaws/trunk/debian/patches/series 2016-03-26 08:05:21 UTC (rev 1757)
@@ -1 +1,2 @@
r18.diff
+doc.diff
Modified: yaws/trunk/debian/rules
===================================================================
--- yaws/trunk/debian/rules 2016-03-17 19:51:20 UTC (rev 1756)
+++ yaws/trunk/debian/rules 2016-03-26 08:05:21 UTC (rev 1757)
@@ -76,13 +76,12 @@
# Compile the Yapp application
cd applications/yapp ; TYPE="$(TYPE)" $(MAKE)
-override_dh_auto_build-indep:
+override_dh_auto_build-indep: override_dh_auto_build-arch
dh_testdir
#
# Build applications included into yaws distribution
for appdir in chat mail wiki ; do \
- (cd applications/$$appdir ; \
- TYPE="$(TYPE)" $(MAKE) || exit 1) \
+ (cd applications/$$appdir ; TYPE="$(TYPE)" $(MAKE) || exit 1) \
done
#
# Build documentation
@@ -95,40 +94,45 @@
override_dh_auto_install-arch:
dh_testdir
#
- # Install the package into debian/yaws.
+ # Install the package into debian/tmp.
$(MAKE) install DESTDIR=$(TMPDIR)
#
- # Install the Yapp application
+ # 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 unneeded .la files
- rm -vf $(TMPDIR)/usr/lib/yaws-*/priv/lib/*.la
- #
# 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 unneeded .la files
+ rm -vf $(TMPDIR)/usr/lib/yaws-*/priv/lib/*.la
+ #
sed -e "s/@YAWS_VSN@/$(YAWS_VSN)/g" \
debian/erlang-yaws.maintscript.in >debian/erlang-yaws.maintscript || exit 1
#
dh_install -a
-override_dh_auto_install-indep:
+override_dh_auto_install-indep: override_dh_auto_install-arch
dh_testdir
#
+ # Install the package into debian/tmp.
+ $(MAKE) install DESTDIR=$(TMPDIR)
+ #
# 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 app in chat mail wiki ; do \
- (cd applications/$$app ; \
- $(MAKE) install DESTDIR=$(TMPDIR) || exit 1) \
+ (cd applications/$$app ; $(MAKE) install DESTDIR=$(TMPDIR) || exit 1) \
done
#
+ # Fix permissions on examples
+ chmod a-x $(TMPDIR)/var/yaws/www/testdir/index.html
+ #
+ # Fix run_erl and to_erl paths.
+ sed -e 's:/lib/erlang/erts-[\d.]*/:/:g' $(TMPDIR)/usr/bin/yaws
+ #
# Fix permissions of application files
find $(TMPDIR)/var/yaws -type f -exec chmod a-x \{\} \;
#
Modified: yaws/trunk/debian/yaws.dirs
===================================================================
--- yaws/trunk/debian/yaws.dirs 2016-03-17 19:51:20 UTC (rev 1756)
+++ yaws/trunk/debian/yaws.dirs 2016-03-26 08:05:21 UTC (rev 1757)
@@ -4,4 +4,4 @@
usr/bin
usr/local/lib/yaws-appmods/ebin
usr/local/lib/yaws-appmods/include
-usr/share/yaws
+usr/share/yaws/www
Modified: yaws/trunk/debian/yaws.init
===================================================================
--- yaws/trunk/debian/yaws.init 2016-03-17 19:51:20 UTC (rev 1756)
+++ yaws/trunk/debian/yaws.init 2016-03-26 08:05:21 UTC (rev 1757)
@@ -48,6 +48,7 @@
HOME="$YAWS_HOME" start-stop-daemon --quiet \
--user $YAWS_USER \
--chuid $YAWS_USER \
+ --chdir $YAWS_HOME \
--exec $DAEMON \
--start \
-- \
Modified: yaws/trunk/debian/yaws.install
===================================================================
--- yaws/trunk/debian/yaws.install 2016-03-17 19:51:20 UTC (rev 1756)
+++ yaws/trunk/debian/yaws.install 2016-03-26 08:05:21 UTC (rev 1757)
@@ -5,5 +5,5 @@
debian/conf/localhost.conf /etc/yaws/conf.avail/
debian/conf/localhost-ssl.conf /etc/yaws/conf.avail/
debian/logrotate/yaws /etc/logrotate.d/
-debian/index.html /usr/share/yaws/
-www/icons/yaws.gif /usr/share/yaws/
+debian/index.html /usr/share/yaws/www/
+www/icons/yaws.gif /usr/share/yaws/www/
More information about the Pkg-erlang-commits
mailing list