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

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Fri Oct 30 19:36:37 UTC 2009 

Author: sgolovan
Date: 2009-10-30 19:36:37 +0000 (Fri, 30 Oct 2009)
New Revision: 1119

Modified:
   yaws/trunk/debian/changelog
   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:
[yaws]
  * New upstream release.


Modified: yaws/trunk/debian/changelog
===================================================================
--- yaws/trunk/debian/changelog	2009-10-18 05:56:58 UTC (rev 1118)
+++ yaws/trunk/debian/changelog	2009-10-30 19:36:37 UTC (rev 1119)
@@ -1,8 +1,8 @@
-yaws (1.84-3) UNRELEASED; urgency=low
+yaws (1.85-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sat, 17 Oct 2009 17:35:02 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Fri, 30 Oct 2009 22:36:02 +0300
 
 yaws (1.84-2) unstable; urgency=low
 

Modified: yaws/trunk/debian/patches/clean.diff
===================================================================
--- yaws/trunk/debian/patches/clean.diff	2009-10-18 05:56:58 UTC (rev 1118)
+++ yaws/trunk/debian/patches/clean.diff	2009-10-30 19:36:37 UTC (rev 1119)
@@ -1,7 +1,7 @@
 Patch fixes cleaning up after build process.
 
---- yaws-1.82.orig/Makefile
-+++ yaws-1.82/Makefile
+--- yaws-1.85.orig/Makefile
++++ yaws-1.85/Makefile
 @@ -37,6 +37,7 @@
  
  conf_clean:
@@ -10,9 +10,9 @@
  
  local_install: all
  	(cd scripts && $(MAKE) local_install)
---- yaws-1.82.orig/doc/Makefile
-+++ yaws-1.82/doc/Makefile
-@@ -28,6 +28,7 @@
+--- yaws-1.85.orig/doc/Makefile
++++ yaws-1.85/doc/Makefile
+@@ -41,6 +41,7 @@
  
  clean:
  	rm  -f *.ps *.dvi *.log *.aux *.pdf *.toc *.beam 2> /dev/null || true
@@ -20,8 +20,8 @@
  
  install:
  	-install -d $(DESTDIR)$(PREFIX)/share/doc/yaws-$(YAWS_VSN)
---- yaws-1.82.orig/applications/wiki/scripts/Makefile
-+++ yaws-1.82/applications/wiki/scripts/Makefile
+--- yaws-1.85.orig/applications/wiki/scripts/Makefile
++++ yaws-1.85/applications/wiki/scripts/Makefile
 @@ -27,7 +27,7 @@
  	chmod +x $@
  
@@ -31,8 +31,8 @@
  
  
  install:
---- yaws-1.82.orig/applications/yapp/Makefile
-+++ yaws-1.82/applications/yapp/Makefile
+--- yaws-1.85.orig/applications/yapp/Makefile
++++ yaws-1.85/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	2009-10-18 05:56:58 UTC (rev 1118)
+++ yaws/trunk/debian/patches/ctl.diff	2009-10-30 19:36:37 UTC (rev 1119)
@@ -1,9 +1,9 @@
 Patch adds processing the case when ctlfile is parsable but its
 content is invalid.
 
---- yaws-1.82.orig/src/yaws_ctl.erl
-+++ yaws-1.82/src/yaws_ctl.erl
-@@ -319,6 +319,8 @@
+--- yaws-1.85.orig/src/yaws_ctl.erl
++++ yaws-1.85/src/yaws_ctl.erl
+@@ -384,6 +384,8 @@
                  Err ->
                      Err
              end;
@@ -12,7 +12,7 @@
          Err ->
              Err
      end.
-@@ -339,6 +341,13 @@
+@@ -404,6 +406,13 @@
              io:format("No yaws system responds~n",[]),
              timer:sleep(10),
              erlang:halt(2);

Modified: yaws/trunk/debian/patches/docs.diff
===================================================================
--- yaws/trunk/debian/patches/docs.diff	2009-10-18 05:56:58 UTC (rev 1118)
+++ yaws/trunk/debian/patches/docs.diff	2009-10-30 19:36:37 UTC (rev 1119)
@@ -1,8 +1,20 @@
 Patch removes dependency om non-free latex2html package when building
 docs.
 
---- yaws-1.82.orig/doc/yaws.tex
-+++ yaws-1.82/doc/yaws.tex
+--- yaws-1.85.orig/doc/Makefile
++++ yaws-1.85/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
+ 
+ 
+ 
+--- yaws-1.85.orig/doc/yaws.tex
++++ yaws-1.85/doc/yaws.tex
 @@ -44,7 +44,7 @@
  
  \usepackage[T1]{fontenc}

Modified: yaws/trunk/debian/patches/gnu.diff
===================================================================
--- yaws/trunk/debian/patches/gnu.diff	2009-10-18 05:56:58 UTC (rev 1118)
+++ yaws/trunk/debian/patches/gnu.diff	2009-10-30 19:36:37 UTC (rev 1119)
@@ -1,8 +1,8 @@
 Patch by Sergei Golovan allows YWAS to build on hurd-i386 architecture.
 
---- yaws-1.82.orig/configure
-+++ yaws-1.82/configure
-@@ -3957,6 +3957,16 @@
+--- yaws-1.85.orig/configure
++++ yaws-1.85/configure
+@@ -4255,6 +4255,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.82.orig/configure.in
-+++ yaws-1.82/configure.in
-@@ -241,6 +241,13 @@
+--- yaws-1.85.orig/configure.in
++++ yaws-1.85/configure.in
+@@ -258,6 +258,13 @@
             FPIC=-fPIC
             AC_SUBST(FPIC)
             ;;

Modified: yaws/trunk/debian/patches/install.diff
===================================================================
--- yaws/trunk/debian/patches/install.diff	2009-10-18 05:56:58 UTC (rev 1118)
+++ yaws/trunk/debian/patches/install.diff	2009-10-30 19:36:37 UTC (rev 1119)
@@ -2,9 +2,9 @@
 make its use more convenient. Also yaws paths in the examples are
 corrected.
 
---- yaws-1.82.orig/src/Makefile
-+++ yaws-1.82/src/Makefile
-@@ -98,15 +98,15 @@
+--- yaws-1.85.orig/src/Makefile
++++ yaws-1.85/src/Makefile
+@@ -101,15 +101,15 @@
  	rm -f $(EBIN_FILES) yaws_generated.erl charset.def mime_types.erl yaws_configure.hrl
  
  install: regen all docsinstall
@@ -27,8 +27,8 @@
  	$(RM) yaws_generated.erl ../ebin/yaws_generated.beam 2>/dev/null || true
  
  docsinstall:
---- yaws-1.82.orig/Makefile
-+++ yaws-1.82/Makefile
+--- yaws-1.85.orig/Makefile
++++ yaws-1.85/Makefile
 @@ -25,7 +25,7 @@
  	@echo
  	@echo "** etc files went into        ${ETCDIR}"	
@@ -47,8 +47,8 @@
  	@echo "** var files will go into     ${VARDIR}"
  	@echo
  	@echo "--------------------------------"
---- yaws-1.82.orig/c_src/Makefile
-+++ yaws-1.82/c_src/Makefile
+--- yaws-1.85.orig/c_src/Makefile
++++ yaws-1.85/c_src/Makefile
 @@ -1,5 +1,5 @@
  include ../include.mk
 -
@@ -74,8 +74,8 @@
  	fi
  endif
  
---- yaws-1.82.orig/scripts/Makefile
-+++ yaws-1.82/scripts/Makefile
+--- yaws-1.85.orig/scripts/Makefile
++++ yaws-1.85/scripts/Makefile
 @@ -1,5 +1,5 @@
  include ../include.mk
 -
@@ -83,23 +83,26 @@
  
  all debug:	../bin/yaws yaws.conf
  
-@@ -40,7 +40,7 @@
+@@ -40,8 +40,8 @@
  yaws.conf:
  	@echo PREFIX is $(PREFIX)
  	cat yaws.conf.template | \
 -		./Subst %yawsdir% "$(PREFIX)/lib/yaws"  | \
+-		./Subst %logdir% "$(PREFIX)/var/log/yaws"  | \
 +		./Subst %yawsdir% "$(PREFIX)/lib/erlang/lib/yaws-$(YAWS_VSN)"  | \
- 		./Subst %logdir% "/var/log/yaws"  | \
++ 		./Subst %logdir% "/var/log/yaws"  | \
  		./Subst %vardir% "$(VARDIR)"  | \
  		./Subst %host% `hostname`  | \
---- yaws-1.82.orig/scripts/Install
-+++ yaws-1.82/scripts/Install
-@@ -19,10 +19,10 @@
+ 		./Subst %port% 80  | \
+--- yaws-1.85.orig/scripts/Install
++++ yaws-1.85/scripts/Install
+@@ -19,11 +19,11 @@
  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 | \
 -    ./Subst %yawsdir% ${prefix}/lib/yaws | \
@@ -107,7 +110,7 @@
      ./Subst %vardir% ${vardir} | \
      ./Subst %erl% "${erl}" | \
      ./Subst %run_erl% "${bindir}/run_erl" | \
-@@ -31,8 +31,8 @@
+@@ -32,8 +32,8 @@
  
  chmod +x ${destdir}${prefix}/bin/yaws
  
@@ -118,8 +121,8 @@
  
  ## seems gentoo don't like to be installed in /usr/local/etc
  ## since /sbin/runscript still reads /etc/conf.d
---- yaws-1.82.orig/www/embed.yaws
-+++ yaws-1.82/www/embed.yaws
+--- yaws-1.85.orig/www/embed.yaws
++++ yaws-1.85/www/embed.yaws
 @@ -186,7 +186,7 @@
    </p>
  <div class="box">
@@ -138,8 +141,8 @@
  Erlang (BEAM) emulator version 5.3.b1 [source] [hipe]
  
  Eshell V5.3.b1  (abort with ^G)
---- yaws-1.82.orig/www/ybed.erl
-+++ yaws-1.82/www/ybed.erl
+--- yaws-1.85.orig/www/ybed.erl
++++ yaws-1.85/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	2009-10-18 05:56:58 UTC (rev 1118)
+++ yaws/trunk/debian/patches/installapps.diff	2009-10-30 19:36:37 UTC (rev 1119)
@@ -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.82.orig/applications/yapp/Makefile
-+++ yaws-1.82/applications/yapp/Makefile
+--- yaws-1.85.orig/applications/yapp/Makefile
++++ yaws-1.85/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	2009-10-18 05:56:58 UTC (rev 1118)
+++ yaws/trunk/debian/patches/installdocs.diff	2009-10-30 19:36:37 UTC (rev 1119)
@@ -2,9 +2,9 @@
 yaws version number in directory name, see section 12.3 of
 Debian Policy Manual).
 
---- yaws-1.82.orig/doc/Makefile
-+++ yaws-1.82/doc/Makefile
-@@ -31,6 +31,5 @@
+--- yaws-1.85.orig/doc/Makefile
++++ yaws-1.85/doc/Makefile
+@@ -44,6 +44,5 @@
  	rm  -f *.out ../www/yaws.ps ../www/yaws.pdf 2> /dev/null || true
  
  install:

Modified: yaws/trunk/debian/patches/man.diff
===================================================================
--- yaws/trunk/debian/patches/man.diff	2009-10-18 05:56:58 UTC (rev 1118)
+++ yaws/trunk/debian/patches/man.diff	2009-10-30 19:36:37 UTC (rev 1119)
@@ -1,11 +1,11 @@
 Patch fixes erros in yaws manual pages.
 
---- yaws-1.82.orig/man/yaws.conf.5
-+++ yaws-1.82/man/yaws.conf.5
-@@ -194,11 +194,11 @@
+--- yaws-1.85.orig/man/yaws.conf.5
++++ yaws-1.85/man/yaws.conf.5
+@@ -184,11 +184,11 @@
+ .SH SERVER PART
  Yaws can virthost several webservers on the same ip address as well
- as several webservers on different ip addresses. The on limitation here is
- that there can be only one server with ssl enabled per each individual ip address.
+ as several webservers 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,16 +16,16 @@
  The following directives are allowed inside a server definition.
  .TP
  \fBport = Port \fR
-@@ -253,7 +253,7 @@
+@@ -242,7 +242,7 @@
  
- <extra_cgi_vars dir='a path to some scripts'>
+ <extra_cgi_vars dir='/path/to/some/scripts'>
  var = val
 -...
 +\&...
  </extra_cgi_vars>
  .fi
  
-@@ -595,7 +595,7 @@
+@@ -613,7 +613,7 @@
  </server>
  .fi
  
@@ -34,16 +34,16 @@
  And this example shows a similar setup but two webservers on the same ip address
  
  .nf
---- yaws-1.82.orig/man/yaws_api.5
-+++ yaws-1.82/man/yaws_api.5
+--- yaws-1.85.orig/man/yaws_api.5
++++ yaws-1.85/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
  value \fB{streamcontent, MimeType, FirstChunk}\fR to work.
 -YawsPid is the process identifier of the yaws process delivering the original
--.yaws file. That is self() in the yaws code. 
+-.yaws file. That is self() in the yaws code.
 +YawsPid is the process identifier of the yaws process delivering the
-+original .yaws file. That is self() in the yaws code. 
++original .yaws file. That is self() in the yaws code.
  The Pid must typically be passed (somehow) to the producer of the stream.
  
  .TP

Modified: yaws/trunk/debian/patches/mime.diff
===================================================================
--- yaws/trunk/debian/patches/mime.diff	2009-10-18 05:56:58 UTC (rev 1118)
+++ yaws/trunk/debian/patches/mime.diff	2009-10-30 19:36:37 UTC (rev 1119)
@@ -1,8 +1,8 @@
 Patch makes using system wide mime.types instead of possibly outdated
 mime.types, supplied by upstream.
 
---- yaws-1.82.orig/src/mime_type_c.erl
-+++ yaws-1.82/src/mime_type_c.erl
+--- yaws-1.85.orig/src/mime_type_c.erl
++++ yaws-1.85/src/mime_type_c.erl
 @@ -21,7 +21,7 @@
  
  

Modified: yaws/trunk/debian/rules
===================================================================
--- yaws/trunk/debian/rules	2009-10-18 05:56:58 UTC (rev 1118)
+++ yaws/trunk/debian/rules	2009-10-30 19:36:37 UTC (rev 1119)
@@ -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.84
+VSN=1.85
 
 export HOME := $(CURDIR)/debian

More information about the Pkg-erlang-commits mailing list