[Pkg-erlang-commits] r1455 - in yaws/trunk/debian: . conf patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2012-06-24 11:48:42 +0000 (Sun, 24 Jun 2012)
New Revision: 1455

Removed:
   yaws/trunk/debian/patches/install.diff
Modified:
   yaws/trunk/debian/changelog
   yaws/trunk/debian/conf/yaws.conf
   yaws/trunk/debian/patches/series
   yaws/trunk/debian/rules
Log:
[yaws]
  * Don't compress the yaws.eps logo in the examples.
  * Removed use_fdsrv option from the yaws.conf because its support is
    removed by upstream.
  * Removed unnecessary patch.


Modified: yaws/trunk/debian/changelog
===================================================================
--- yaws/trunk/debian/changelog	2012-06-24 11:11:44 UTC (rev 1454)
+++ yaws/trunk/debian/changelog	2012-06-24 11:48:42 UTC (rev 1455)
@@ -5,8 +5,11 @@
   * Added a patch which strengthens the random number generation for the
     chat and mail applications. It also ensures all the characters in
     the yaws_session_server cookies are printable.
+  * Don't compress the yaws.eps logo in the examples.
+  * Removed use_fdsrv option from the yaws.conf because its support is
+    removed by upstream.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sun, 24 Jun 2012 15:10:50 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Sun, 24 Jun 2012 15:45:00 +0400
 
 yaws (1.92-4) unstable; urgency=low
 

Modified: yaws/trunk/debian/conf/yaws.conf
===================================================================
--- yaws/trunk/debian/conf/yaws.conf	2012-06-24 11:11:44 UTC (rev 1454)
+++ yaws/trunk/debian/conf/yaws.conf	2012-06-24 11:48:42 UTC (rev 1455)
@@ -139,19 +139,6 @@
 keepalive_timeout = 30000
 
 
-# All unices are broken since it's not possible to bind to
-# a privileged port (< 1024) unless uid==0
-# There is a contrib in jungerl which makes it possible by means 
-# of an external setuid root programm called fdsrv to listen to
-# to privileged port.
-# If we use this feature, it requires fdsrv to be properly installed.
-# Doesn't yet work with SSL.
-# Read http://yaws.hyber.org/privbind.yaws for more info and a better
-# solution than fd_srv
-
-use_fdsrv = false
-
-
 # Load external config files. To add virtual server, don't
 # edit this config file. Instead, put additional config to
 # /etc/yaws/config.d/ and it will be sourced during yaws

Deleted: yaws/trunk/debian/patches/install.diff
===================================================================
--- yaws/trunk/debian/patches/install.diff	2012-06-24 11:11:44 UTC (rev 1454)
+++ yaws/trunk/debian/patches/install.diff	2012-06-24 11:48:42 UTC (rev 1455)
@@ -1,25 +0,0 @@
-Patch fixes logdir and etcdir. Also yaws paths in the examples are
-corrected.
-
---- yaws-1.93.orig/scripts/Makefile
-+++ yaws-1.93/scripts/Makefile
-@@ -13,7 +13,7 @@
- 	VARDIR="${HOME}/var" ./local-install true
- 
- yaws.conf:
--	YAWSDIR='$(LIBDIR)/yaws' LOGDIR='$(PREFIX)/var/log/yaws' \
-+	YAWSDIR='$(LIBDIR)/yaws' LOGDIR='$(VARDIR)/log/yaws' \
- 	VARDIR='$(VARDIR)' PORT=80 DOCROOT='$(VARDIR)/yaws/www' \
- 	CERTDIR='$(ETCDIR)/yaws' SSLPORT=443 ./gen-yaws-conf > $@
- 
---- yaws-1.93.orig/scripts/Install
-+++ yaws-1.93/scripts/Install
-@@ -18,7 +18,7 @@
- v=${vardir}
- 
- install -d ${destdir}${prefix}/bin
--install -d ${destdir}${prefix}/etc
-+install -d ${destdir}${etcdir}
- install -d ${destdir}${vardir}/log/yaws
- 
- cat yaws.template | \

Modified: yaws/trunk/debian/patches/series
===================================================================
--- yaws/trunk/debian/patches/series	2012-06-24 11:11:44 UTC (rev 1454)
+++ yaws/trunk/debian/patches/series	2012-06-24 11:48:42 UTC (rev 1455)
@@ -1,4 +1,3 @@
-install.diff
 installapps.diff
 gnu.diff
 docs.diff

Modified: yaws/trunk/debian/rules
===================================================================
--- yaws/trunk/debian/rules	2012-06-24 11:11:44 UTC (rev 1454)
+++ yaws/trunk/debian/rules	2012-06-24 11:48:42 UTC (rev 1455)
@@ -184,7 +184,7 @@
 	dh_installman -i
 	dh_link -i
 	dh_strip -i
-	dh_compress -i -X.erl -X.beam -X.yaws -X.pdf -X .ps
+	dh_compress -i -X.erl -X.beam -X.yaws -X.pdf -X .ps -X .eps
 	dh_fixperms -i
 	dh_installdeb -i
 	dh_shlibdeps -i
@@ -206,7 +206,7 @@
 	dh_installman -a
 	dh_link -a
 	dh_strip -a
-	dh_compress -a -X.erl -X.beam -X.yaws -X.pdf -X.ps
+	dh_compress -a -X.erl -X.beam -X.yaws -X.pdf -X.ps -X.eps
 	dh_fixperms -a
 	dh_installdeb -a
 	dh_shlibdeps -a