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

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Wed Mar 24 13:23:00 UTC 2010 

Author: sgolovan
Date: 2010-03-24 13:22:58 +0000 (Wed, 24 Mar 2010)
New Revision: 1227

Modified:
   yaws/trunk/debian/changelog
   yaws/trunk/debian/control
   yaws/trunk/debian/patches/clean.diff
   yaws/trunk/debian/patches/ctl.diff
   yaws/trunk/debian/patches/docs.diff
   yaws/trunk/debian/patches/gnu.diff
   yaws/trunk/debian/patches/install.diff
   yaws/trunk/debian/patches/installapps.diff
   yaws/trunk/debian/patches/installdocs.diff
   yaws/trunk/debian/patches/man.diff
   yaws/trunk/debian/patches/mime.diff
   yaws/trunk/debian/rules
Log:
  * New upstream release.
  * Bumped standards version to 3.8.4.


Modified: yaws/trunk/debian/changelog
===================================================================
--- yaws/trunk/debian/changelog	2010-03-20 16:11:25 UTC (rev 1226)
+++ yaws/trunk/debian/changelog	2010-03-24 13:22:58 UTC (rev 1227)
@@ -1,8 +1,9 @@
-yaws (1.87-2) UNRELEASED; urgency=low
+yaws (1.88-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Bumped standards version to 3.8.4.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sat, 16 Jan 2010 00:01:40 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 24 Mar 2010 15:43:06 +0300
 
 yaws (1.87-1) unstable; urgency=low
 

Modified: yaws/trunk/debian/control
===================================================================
--- yaws/trunk/debian/control	2010-03-20 16:11:25 UTC (rev 1226)
+++ yaws/trunk/debian/control	2010-03-24 13:22:58 UTC (rev 1227)
@@ -7,7 +7,7 @@
  erlang-dev (>= 1:13.b.1-3), erlang-edoc, erlang-mnesia,
  texlive-latex-base, texlive-latex-recommended, texlive-fonts-recommended,
  texlive-font-utils, texlive-extra-utils, ghostscript, quilt
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://yaws.hyber.org/
 Vcs-Svn: svn://svn.debian.org//svn/pkg-erlang/yaws/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-erlang/yaws/trunk/

Modified: yaws/trunk/debian/patches/clean.diff
===================================================================
--- yaws/trunk/debian/patches/clean.diff	2010-03-20 16:11:25 UTC (rev 1226)
+++ yaws/trunk/debian/patches/clean.diff	2010-03-24 13:22:58 UTC (rev 1227)
@@ -1,7 +1,7 @@
 Patch fixes cleaning up after build process.
 
---- yaws-1.86.orig/Makefile
-+++ yaws-1.86/Makefile
+--- yaws-1.88.orig/Makefile
++++ yaws-1.88/Makefile
 @@ -37,6 +37,7 @@
  
  conf_clean:
@@ -10,8 +10,8 @@
  
  local_install: all
  	(cd scripts && $(MAKE) local_install)
---- yaws-1.86.orig/doc/Makefile
-+++ yaws-1.86/doc/Makefile
+--- yaws-1.88.orig/doc/Makefile
++++ yaws-1.88/doc/Makefile
 @@ -41,6 +41,7 @@
  
  clean:
@@ -20,8 +20,8 @@
  
  install:
  	-install -d $(DESTDIR)$(PREFIX)/share/doc/yaws-$(YAWS_VSN)
---- yaws-1.86.orig/applications/wiki/scripts/Makefile
-+++ yaws-1.86/applications/wiki/scripts/Makefile
+--- yaws-1.88.orig/applications/wiki/scripts/Makefile
++++ yaws-1.88/applications/wiki/scripts/Makefile
 @@ -27,7 +27,7 @@
  	chmod +x $@
  
@@ -31,8 +31,8 @@
  
  
  install:
---- yaws-1.86.orig/applications/yapp/Makefile
-+++ yaws-1.86/applications/yapp/Makefile
+--- yaws-1.88.orig/applications/yapp/Makefile
++++ yaws-1.88/applications/yapp/Makefile
 @@ -21,7 +21,7 @@
  	$(ERL) -noshell  -run edoc_run application "'$(APPNAME)'" '"."' '$(DOC_OPTS)' -s init stop
  

Modified: yaws/trunk/debian/patches/ctl.diff
===================================================================
--- yaws/trunk/debian/patches/ctl.diff	2010-03-20 16:11:25 UTC (rev 1226)
+++ yaws/trunk/debian/patches/ctl.diff	2010-03-24 13:22:58 UTC (rev 1227)
@@ -1,8 +1,8 @@
 Patch adds processing the case when ctlfile is parsable but its
 content is invalid.
 
---- yaws-1.86.orig/src/yaws_ctl.erl
-+++ yaws-1.86/src/yaws_ctl.erl
+--- yaws-1.88.orig/src/yaws_ctl.erl
++++ yaws-1.88/src/yaws_ctl.erl
 @@ -384,6 +384,8 @@
                  Err ->
                      Err

Modified: yaws/trunk/debian/patches/docs.diff
===================================================================
--- yaws/trunk/debian/patches/docs.diff	2010-03-20 16:11:25 UTC (rev 1226)
+++ yaws/trunk/debian/patches/docs.diff	2010-03-24 13:22:58 UTC (rev 1227)
@@ -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.86.orig/doc/Makefile
-+++ yaws-1.86/doc/Makefile
+--- yaws-1.88.orig/doc/Makefile
++++ yaws-1.88/doc/Makefile
 @@ -17,9 +17,6 @@
  	@if [ -z "$(PDFLATEX)" ]; then \
  		echo "Need pdflatex"; exit 1; \
@@ -14,8 +14,8 @@
  
  
  
---- yaws-1.86.orig/doc/yaws.tex
-+++ yaws-1.86/doc/yaws.tex
+--- yaws-1.88.orig/doc/yaws.tex
++++ yaws-1.88/doc/yaws.tex
 @@ -1,18 +1,18 @@
  \documentclass[11pt,oneside,english]{book}
 -\newif\ifpdf

Modified: yaws/trunk/debian/patches/gnu.diff
===================================================================
--- yaws/trunk/debian/patches/gnu.diff	2010-03-20 16:11:25 UTC (rev 1226)
+++ yaws/trunk/debian/patches/gnu.diff	2010-03-24 13:22:58 UTC (rev 1227)
@@ -1,8 +1,8 @@
 Patch by Sergei Golovan allows YWAS to build on hurd-i386 architecture.
 
---- yaws-1.86.orig/configure
-+++ yaws-1.86/configure
-@@ -4073,6 +4073,16 @@
+--- yaws-1.88.orig/configure
++++ yaws-1.88/configure
+@@ -4099,6 +4099,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.86.orig/configure.in
-+++ yaws-1.86/configure.in
-@@ -258,6 +258,13 @@
+--- yaws-1.88.orig/configure.in
++++ yaws-1.88/configure.in
+@@ -256,6 +256,13 @@
             FPIC=-fPIC
             AC_SUBST(FPIC)
             ;;

Modified: yaws/trunk/debian/patches/install.diff
===================================================================
--- yaws/trunk/debian/patches/install.diff	2010-03-20 16:11:25 UTC (rev 1226)
+++ yaws/trunk/debian/patches/install.diff	2010-03-24 13:22:58 UTC (rev 1227)
@@ -1,8 +1,8 @@
 Patch fixes logdir and etcdir. Also yaws paths in the examples are
 corrected.
 
---- yaws-1.86.orig/scripts/Makefile
-+++ yaws-1.86/scripts/Makefile
+--- yaws-1.88.orig/scripts/Makefile
++++ yaws-1.88/scripts/Makefile
 @@ -41,7 +41,7 @@
  	@echo PREFIX is $(PREFIX)
  	cat yaws.conf.template | \
@@ -12,8 +12,8 @@
  		./Subst %vardir% "$(VARDIR)"  | \
  		./Subst %host% `hostname`  | \
  		./Subst %port% 80  | \
---- yaws-1.86.orig/scripts/Install
-+++ yaws-1.86/scripts/Install
+--- yaws-1.88.orig/scripts/Install
++++ yaws-1.88/scripts/Install
 @@ -19,7 +19,7 @@
  v=${vardir}
  
@@ -23,8 +23,8 @@
  install -d ${destdir}${vardir}/log/yaws
  
  cat yaws.template | \
---- yaws-1.86.orig/www/embed.yaws
-+++ yaws-1.86/www/embed.yaws
+--- yaws-1.88.orig/www/embed.yaws
++++ yaws-1.88/www/embed.yaws
 @@ -186,7 +186,7 @@
    </p>
  <div class="box">
@@ -43,8 +43,8 @@
  Erlang (BEAM) emulator version 5.3.b1 [source] [hipe]
  
  Eshell V5.3.b1  (abort with ^G)
---- yaws-1.86.orig/www/ybed.erl
-+++ yaws-1.86/www/ybed.erl
+--- yaws-1.88.orig/www/ybed.erl
++++ yaws-1.88/www/ybed.erl
 @@ -8,7 +8,7 @@
  -module(ybed).
  -compile(export_all).

Modified: yaws/trunk/debian/patches/installapps.diff
===================================================================
--- yaws/trunk/debian/patches/installapps.diff	2010-03-20 16:11:25 UTC (rev 1226)
+++ yaws/trunk/debian/patches/installapps.diff	2010-03-24 13:22:58 UTC (rev 1227)
@@ -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.86.orig/applications/yapp/Makefile
-+++ yaws-1.86/applications/yapp/Makefile
+--- yaws-1.88.orig/applications/yapp/Makefile
++++ yaws-1.88/applications/yapp/Makefile
 @@ -24,8 +24,10 @@
  	rm -rf doc/*.html doc/edoc-info doc/stylesheet.css doc/*.png
  

Modified: yaws/trunk/debian/patches/installdocs.diff
===================================================================
--- yaws/trunk/debian/patches/installdocs.diff	2010-03-20 16:11:25 UTC (rev 1226)
+++ yaws/trunk/debian/patches/installdocs.diff	2010-03-24 13:22:58 UTC (rev 1227)
@@ -2,8 +2,8 @@
 yaws version number in directory name, see section 12.3 of
 Debian Policy Manual).
 
---- yaws-1.86.orig/doc/Makefile
-+++ yaws-1.86/doc/Makefile
+--- yaws-1.88.orig/doc/Makefile
++++ yaws-1.88/doc/Makefile
 @@ -44,6 +44,5 @@
  	rm  -f *.out ../www/yaws.ps ../www/yaws.pdf 2> /dev/null || true
  

Modified: yaws/trunk/debian/patches/man.diff
===================================================================
--- yaws/trunk/debian/patches/man.diff	2010-03-20 16:11:25 UTC (rev 1226)
+++ yaws/trunk/debian/patches/man.diff	2010-03-24 13:22:58 UTC (rev 1227)
@@ -1,11 +1,11 @@
 Patch fixes erros in yaws manual pages.
 
---- yaws-1.86.orig/man/yaws.conf.5
-+++ yaws-1.86/man/yaws.conf.5
-@@ -198,11 +198,11 @@
+--- yaws-1.88.orig/man/yaws.conf.5
++++ yaws-1.88/man/yaws.conf.5
+@@ -202,11 +202,11 @@
  .SH SERVER PART
- Yaws can virthost several webservers on the same ip address as well
- as several webservers on different ip addresses. This includes SSL servers.
+ Yaws can virthost several web servers on the same IP address as well
+ as several web servers on different IP addresses. This includes SSL servers.
 -.pp
 +.PP
  Each virtual host is defined within a matching pair of \fB<server ServerName>\fR
@@ -16,7 +16,7 @@
  The following directives are allowed inside a server definition.
  .TP
  \fBport = Port \fR
-@@ -256,7 +256,7 @@
+@@ -260,7 +260,7 @@
  
  <extra_cgi_vars dir='/path/to/some/scripts'>
  var = val
@@ -25,7 +25,7 @@
  </extra_cgi_vars>
  .fi
  
-@@ -266,7 +266,7 @@
+@@ -270,7 +270,7 @@
  
  .TP
  \fBfcgi_app_server = Host:Port \fR
@@ -34,16 +34,16 @@
  The TCP port number is not optional.
  There is no default value.
  
-@@ -300,7 +300,7 @@
- \fBpartial_post_size = Integer\fR
+@@ -304,7 +304,7 @@
+ \fBpartial_post_size = Integer | nolimit\fR
  When a yaws file receives large POSTs, the amount of data received
  in each chunk is determined by the this parameter.
 -The deafult value is 10240.
 +The default value is 10240.
  
+ 
  .TP
- \fBdav = true | false\fR
-@@ -420,7 +420,7 @@
+@@ -429,7 +429,7 @@
  At startup of the server, Module:start/1 will be called.
  The #sconf{} record (defined in yaws.hrl) will be used
  as the input argument. This makes it possible for a user
@@ -52,26 +52,17 @@
  as well as getting hold of user specific configuration data,
  see the explanation for the <opaque> context.
  
-@@ -589,7 +589,7 @@
- pair.
- 
- The usage of User:Password in the actual config file is deprecated
--as of release 1.51. It is prefered to have the users in a file called
-+as of release 1.51. It is preferred to have the users in a file called
- \fI.yaws_auth\fR in the actual directory. The .yaws_auth file has to be
- file parseable by \fIfile:consult/1\fR
- 
-@@ -646,7 +646,7 @@
+@@ -658,7 +658,7 @@
  </server>
  .fi
  
 -.pp
 +.PP
- And this example shows a similar setup but two webservers on the same ip address
+ And this example shows a similar setup but two web servers on the same IP address
  
  .nf
---- yaws-1.86.orig/man/yaws_api.5
-+++ yaws-1.86/man/yaws_api.5
+--- yaws-1.88.orig/man/yaws_api.5
++++ yaws-1.88/man/yaws_api.5
 @@ -197,8 +197,8 @@
  from a process. The other process can call this function to deliver
  these chunks. It requires the \fBout/1\fR function to return the

Modified: yaws/trunk/debian/patches/mime.diff
===================================================================
--- yaws/trunk/debian/patches/mime.diff	2010-03-20 16:11:25 UTC (rev 1226)
+++ yaws/trunk/debian/patches/mime.diff	2010-03-24 13:22:58 UTC (rev 1227)
@@ -1,8 +1,8 @@
 Patch makes using system wide mime.types instead of possibly outdated
 mime.types, supplied by upstream.
 
---- yaws-1.86.orig/src/mime_type_c.erl
-+++ yaws-1.86/src/mime_type_c.erl
+--- yaws-1.88.orig/src/mime_type_c.erl
++++ yaws-1.88/src/mime_type_c.erl
 @@ -21,7 +21,7 @@
  
  

Modified: yaws/trunk/debian/rules
===================================================================
--- yaws/trunk/debian/rules	2010-03-20 16:11:25 UTC (rev 1226)
+++ yaws/trunk/debian/rules	2010-03-24 13:22:58 UTC (rev 1227)
@@ -6,7 +6,7 @@
 # dh-make output file, you may use that output file without restriction.
 # This special exception was added by Craig Small in version 0.37 of dh-make.
 
-VSN=1.87
+VSN=1.88
 
 export HOME := $(CURDIR)/debian

More information about the Pkg-erlang-commits mailing list