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

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Tue Aug 9 19:38:07 UTC 2011


Author: sgolovan
Date: 2011-08-09 19:38:07 +0000 (Tue, 09 Aug 2011)
New Revision: 1342

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/m32m64.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	2011-06-13 12:40:39 UTC (rev 1341)
+++ yaws/trunk/debian/changelog	2011-08-09 19:38:07 UTC (rev 1342)
@@ -1,8 +1,8 @@
-yaws (1.90-3) UNRELEASED; urgency=low
+yaws (1.91-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
 
- -- Sergei Golovan <sgolovan at debian.org>  Mon, 13 Jun 2011 16:40:35 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Tue, 09 Aug 2011 23:26:01 +0400
 
 yaws (1.90-2) unstable; urgency=low
 

Modified: yaws/trunk/debian/patches/clean.diff
===================================================================
--- yaws/trunk/debian/patches/clean.diff	2011-06-13 12:40:39 UTC (rev 1341)
+++ yaws/trunk/debian/patches/clean.diff	2011-08-09 19:38:07 UTC (rev 1342)
@@ -1,7 +1,7 @@
 Patch fixes cleaning up after build process.
 
---- yaws-1.90.orig/Makefile
-+++ yaws-1.90/Makefile
+--- yaws-1.91.orig/Makefile
++++ yaws-1.91/Makefile
 @@ -45,6 +45,7 @@
  
  conf_clean:
@@ -10,8 +10,8 @@
  
  local_install: all
  	(cd scripts && $(MAKE) local_install)
---- yaws-1.90.orig/doc/Makefile
-+++ yaws-1.90/doc/Makefile
+--- yaws-1.91.orig/doc/Makefile
++++ yaws-1.91/doc/Makefile
 @@ -41,6 +41,7 @@
  
  clean:
@@ -20,8 +20,8 @@
  
  install:
  	-install -d $(DESTDIR)$(PREFIX)/share/doc/yaws
---- yaws-1.90.orig/applications/wiki/scripts/Makefile
-+++ yaws-1.90/applications/wiki/scripts/Makefile
+--- yaws-1.91.orig/applications/wiki/scripts/Makefile
++++ yaws-1.91/applications/wiki/scripts/Makefile
 @@ -27,7 +27,7 @@
  	chmod +x $@
  
@@ -31,8 +31,8 @@
  
  
  install:
---- yaws-1.90.orig/applications/yapp/Makefile
-+++ yaws-1.90/applications/yapp/Makefile
+--- yaws-1.91.orig/applications/yapp/Makefile
++++ yaws-1.91/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	2011-06-13 12:40:39 UTC (rev 1341)
+++ yaws/trunk/debian/patches/ctl.diff	2011-08-09 19:38:07 UTC (rev 1342)
@@ -1,8 +1,8 @@
 Patch adds processing the case when ctlfile is parsable but its
 content is invalid.
 
---- yaws-1.90.orig/src/yaws_ctl.erl
-+++ yaws-1.90/src/yaws_ctl.erl
+--- yaws-1.91.orig/src/yaws_ctl.erl
++++ yaws-1.91/src/yaws_ctl.erl
 @@ -397,6 +397,8 @@
                  Err ->
                      Err

Modified: yaws/trunk/debian/patches/docs.diff
===================================================================
--- yaws/trunk/debian/patches/docs.diff	2011-06-13 12:40:39 UTC (rev 1341)
+++ yaws/trunk/debian/patches/docs.diff	2011-08-09 19:38:07 UTC (rev 1342)
@@ -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.90.orig/doc/Makefile
-+++ yaws-1.90/doc/Makefile
+--- yaws-1.91.orig/doc/Makefile
++++ yaws-1.91/doc/Makefile
 @@ -17,9 +17,6 @@
  	@if [ -z "$(PDFLATEX)" ]; then \
  		echo "Need pdflatex"; exit 1; \
@@ -14,8 +14,8 @@
  
  
  
---- yaws-1.90.orig/doc/yaws.tex
-+++ yaws-1.90/doc/yaws.tex
+--- yaws-1.91.orig/doc/yaws.tex
++++ yaws-1.91/doc/yaws.tex
 @@ -34,7 +34,7 @@
  
  \usepackage[T1]{fontenc}

Modified: yaws/trunk/debian/patches/gnu.diff
===================================================================
--- yaws/trunk/debian/patches/gnu.diff	2011-06-13 12:40:39 UTC (rev 1341)
+++ yaws/trunk/debian/patches/gnu.diff	2011-08-09 19:38:07 UTC (rev 1342)
@@ -1,8 +1,8 @@
 Patch by Sergei Golovan allows YWAS to build on hurd-i386 architecture.
 
---- yaws-1.90.orig/configure
-+++ yaws-1.90/configure
-@@ -4144,6 +4144,16 @@
+--- yaws-1.91.orig/configure
++++ yaws-1.91/configure
+@@ -4212,6 +4212,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.90.orig/configure.in
-+++ yaws-1.90/configure.in
-@@ -276,6 +276,13 @@
+--- yaws-1.91.orig/configure.in
++++ yaws-1.91/configure.in
+@@ -299,6 +299,13 @@
             FPIC=-fPIC
             AC_SUBST(FPIC)
             ;;

Modified: yaws/trunk/debian/patches/install.diff
===================================================================
--- yaws/trunk/debian/patches/install.diff	2011-06-13 12:40:39 UTC (rev 1341)
+++ yaws/trunk/debian/patches/install.diff	2011-08-09 19:38:07 UTC (rev 1342)
@@ -1,8 +1,8 @@
 Patch fixes logdir and etcdir. Also yaws paths in the examples are
 corrected.
 
---- yaws-1.90.orig/scripts/Makefile
-+++ yaws-1.90/scripts/Makefile
+--- yaws-1.91.orig/scripts/Makefile
++++ yaws-1.91/scripts/Makefile
 @@ -13,7 +13,7 @@
  	VARDIR='$(VARDIR)' ./local-install true
  
@@ -12,8 +12,8 @@
  	VARDIR='$(VARDIR)' PORT=80 DOCROOT='$(VARDIR)/yaws/www' \
  	CERTDIR='$(ETCDIR)/yaws' SSLPORT=443 ./gen-yaws-conf > $@
  
---- yaws-1.90.orig/scripts/Install
-+++ yaws-1.90/scripts/Install
+--- yaws-1.91.orig/scripts/Install
++++ yaws-1.91/scripts/Install
 @@ -19,7 +19,7 @@
  v=${vardir}
  

Modified: yaws/trunk/debian/patches/installapps.diff
===================================================================
--- yaws/trunk/debian/patches/installapps.diff	2011-06-13 12:40:39 UTC (rev 1341)
+++ yaws/trunk/debian/patches/installapps.diff	2011-08-09 19:38:07 UTC (rev 1342)
@@ -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.90.orig/applications/yapp/Makefile
-+++ yaws-1.90/applications/yapp/Makefile
+--- yaws-1.91.orig/applications/yapp/Makefile
++++ yaws-1.91/applications/yapp/Makefile
 @@ -24,8 +24,10 @@
  	rm -rf doc/*.html doc/edoc-info doc/stylesheet.css doc/*.png
  

Modified: yaws/trunk/debian/patches/m32m64.diff
===================================================================
--- yaws/trunk/debian/patches/m32m64.diff	2011-06-13 12:40:39 UTC (rev 1341)
+++ yaws/trunk/debian/patches/m32m64.diff	2011-08-09 19:38:07 UTC (rev 1342)
@@ -1,9 +1,9 @@
 Patch by Sergei Golovan removes -m32 or -m64 gcc command line options
 (which lead to FTBFS) for all non-x86* architectures.
 
---- yaws-1.90.orig/configure
-+++ yaws-1.90/configure
-@@ -3998,15 +3998,15 @@
+--- yaws-1.91.orig/configure
++++ yaws-1.91/configure
+@@ -4062,15 +4062,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
@@ -23,10 +23,10 @@
                     esac
  fi
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
---- yaws-1.90.orig/configure.in
-+++ yaws-1.90/configure.in
-@@ -208,13 +208,13 @@
-                                8 -> 0; 4 -> 1 end)])],
+--- yaws-1.91.orig/configure.in
++++ yaws-1.91/configure.in
+@@ -227,13 +227,13 @@
+                             end end)])],
  	       [AC_MSG_NOTICE(found 64-bit Erlang)
                     case "$host_cpu" in
 -                       x86_64) CBIT= ;;

Modified: yaws/trunk/debian/patches/man.diff
===================================================================
--- yaws/trunk/debian/patches/man.diff	2011-06-13 12:40:39 UTC (rev 1341)
+++ yaws/trunk/debian/patches/man.diff	2011-08-09 19:38:07 UTC (rev 1342)
@@ -1,7 +1,7 @@
 Patch fixes erros in yaws manual pages.
 
---- yaws-1.90.orig/man/yaws.conf.5
-+++ yaws-1.90/man/yaws.conf.5
+--- yaws-1.91.orig/man/yaws.conf.5
++++ yaws-1.91/man/yaws.conf.5
 @@ -261,11 +261,11 @@
  .SH SERVER PART
  Yaws can virthost several web servers on the same IP address as well
@@ -52,8 +52,8 @@
  And this example shows a similar setup but two web servers on the same
  IP address.
  
---- yaws-1.90.orig/man/yaws_api.5
-+++ yaws-1.90/man/yaws_api.5
+--- yaws-1.91.orig/man/yaws_api.5
++++ yaws-1.91/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	2011-06-13 12:40:39 UTC (rev 1341)
+++ yaws/trunk/debian/patches/mime.diff	2011-08-09 19:38:07 UTC (rev 1342)
@@ -1,8 +1,8 @@
 Patch makes using system wide mime.types instead of possibly outdated
 mime.types, supplied by upstream.
 
---- yaws-1.90.orig/src/mime_type_c.erl
-+++ yaws-1.90/src/mime_type_c.erl
+--- yaws-1.91.orig/src/mime_type_c.erl
++++ yaws-1.91/src/mime_type_c.erl
 @@ -21,7 +21,7 @@
  
  

Modified: yaws/trunk/debian/rules
===================================================================
--- yaws/trunk/debian/rules	2011-06-13 12:40:39 UTC (rev 1341)
+++ yaws/trunk/debian/rules	2011-08-09 19:38:07 UTC (rev 1342)
@@ -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.90
+VSN=1.91
 
 export HOME := $(CURDIR)/debian
 




More information about the Pkg-erlang-commits mailing list