[Pkg-erlang-commits] r1474 - in yaws/branches/experimental/debian: . patches

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Thu Oct 18 20:06:49 UTC 2012 

Author: sgolovan
Date: 2012-10-18 20:06:47 +0000 (Thu, 18 Oct 2012)
New Revision: 1474

Added:
   yaws/branches/experimental/debian/patches/mime.diff
Modified:
   yaws/branches/experimental/debian/changelog
   yaws/branches/experimental/debian/patches/docs.diff
   yaws/branches/experimental/debian/patches/gnu.diff
   yaws/branches/experimental/debian/patches/installapps.diff
   yaws/branches/experimental/debian/patches/m32m64.diff
   yaws/branches/experimental/debian/patches/series
   yaws/branches/experimental/debian/rules
Log:
[yaws-experimental]
  * New upstream feature release.
  * Fixed build of mime_types.beam in case when unversioned yaws link is
    removed from the sources tarball.


Modified: yaws/branches/experimental/debian/changelog
===================================================================
--- yaws/branches/experimental/debian/changelog	2012-10-18 06:26:04 UTC (rev 1473)
+++ yaws/branches/experimental/debian/changelog	2012-10-18 20:06:47 UTC (rev 1474)
@@ -1,8 +1,10 @@
-yaws (1.94-2) UNRELEASED; urgency=low
+yaws (1.95-1) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream feature release.
+  * Fixed build of mime_types.beam in case when unversioned yaws link is
+    removed from the sources tarball.
 
- -- Sergei Golovan <sgolovan at debian.org>  Tue, 26 Jun 2012 10:14:25 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 18 Oct 2012 23:58:09 +0400
 
 yaws (1.94-1) unstable; urgency=low
 

Modified: yaws/branches/experimental/debian/patches/docs.diff
===================================================================
--- yaws/branches/experimental/debian/patches/docs.diff	2012-10-18 06:26:04 UTC (rev 1473)
+++ yaws/branches/experimental/debian/patches/docs.diff	2012-10-18 20:06:47 UTC (rev 1474)
@@ -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.93.orig/doc/Makefile
-+++ yaws-1.93/doc/Makefile
+--- yaws-1.95.orig/doc/Makefile
++++ yaws-1.95/doc/Makefile
 @@ -17,9 +17,6 @@
  	@if [ -z "$(PDFLATEX)" ]; then \
  		echo "Need pdflatex"; exit 1; \
@@ -14,8 +14,8 @@
  
  
  
---- yaws-1.93.orig/doc/yaws.tex
-+++ yaws-1.93/doc/yaws.tex
+--- yaws-1.95.orig/doc/yaws.tex
++++ yaws-1.95/doc/yaws.tex
 @@ -34,7 +34,7 @@
  
  \usepackage[T1]{fontenc}

Modified: yaws/branches/experimental/debian/patches/gnu.diff
===================================================================
--- yaws/branches/experimental/debian/patches/gnu.diff	2012-10-18 06:26:04 UTC (rev 1473)
+++ yaws/branches/experimental/debian/patches/gnu.diff	2012-10-18 20:06:47 UTC (rev 1474)
@@ -1,8 +1,8 @@
 Patch by Sergei Golovan allows YWAS to build on hurd-i386 architecture.
 
---- yaws-1.93.orig/configure
-+++ yaws-1.93/configure
-@@ -4222,6 +4222,16 @@
+--- yaws-1.95.orig/configure
++++ yaws-1.95/configure
+@@ -4223,6 +4223,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.93.orig/configure.in
-+++ yaws-1.93/configure.in
-@@ -303,6 +303,13 @@
+--- yaws-1.95.orig/configure.in
++++ yaws-1.95/configure.in
+@@ -304,6 +304,13 @@
             FPIC=-fPIC
             AC_SUBST(FPIC)
             ;;

Modified: yaws/branches/experimental/debian/patches/installapps.diff
===================================================================
--- yaws/branches/experimental/debian/patches/installapps.diff	2012-10-18 06:26:04 UTC (rev 1473)
+++ yaws/branches/experimental/debian/patches/installapps.diff	2012-10-18 20:06:47 UTC (rev 1474)
@@ -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.93.orig/applications/yapp/Makefile
-+++ yaws-1.93/applications/yapp/Makefile
+--- yaws-1.95.orig/applications/yapp/Makefile
++++ yaws-1.95/applications/yapp/Makefile
 @@ -24,8 +24,10 @@
  	rm -rf doc/*.html doc/edoc-info doc/stylesheet.css doc/*.png
  

Modified: yaws/branches/experimental/debian/patches/m32m64.diff
===================================================================
--- yaws/branches/experimental/debian/patches/m32m64.diff	2012-10-18 06:26:04 UTC (rev 1473)
+++ yaws/branches/experimental/debian/patches/m32m64.diff	2012-10-18 20:06:47 UTC (rev 1474)
@@ -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.93.orig/configure
-+++ yaws-1.93/configure
-@@ -4072,15 +4072,15 @@
+--- yaws-1.95.orig/configure
++++ yaws-1.95/configure
+@@ -4072,16 +4072,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
@@ -17,15 +17,16 @@
  $as_echo "$as_me: found 32-bit Erlang" >&6;}
                     case "$host_cpu" in
 -                       i?86) CBIT= ;;
+-                       armv6l) CBIT= ;;
 -                       *) CBIT=-m32 ;;
 +                       x86_64) CBIT=-m32 ;;
 +                       *) CBIT= ;;
                     esac
  fi
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
---- yaws-1.93.orig/configure.in
-+++ yaws-1.93/configure.in
-@@ -231,13 +231,13 @@
+--- yaws-1.95.orig/configure.in
++++ yaws-1.95/configure.in
+@@ -231,14 +231,13 @@
                              end end)])],
  	       [AC_MSG_NOTICE(found 64-bit Erlang)
                     case "$host_cpu" in
@@ -37,6 +38,7 @@
  	       [AC_MSG_NOTICE(found 32-bit Erlang)
                     case "$host_cpu" in
 -                       i?86) CBIT= ;;
+-                       armv6l) CBIT= ;;
 -                       *) CBIT=-m32 ;;
 +                       x86_64) CBIT=-m32 ;;
 +                       *) CBIT= ;;

Added: yaws/branches/experimental/debian/patches/mime.diff
===================================================================
--- yaws/branches/experimental/debian/patches/mime.diff	                        (rev 0)
+++ yaws/branches/experimental/debian/patches/mime.diff	2012-10-18 20:06:47 UTC (rev 1474)
@@ -0,0 +1,14 @@
+Author: Sergei Golovan
+Description: Patch fixes finding yaws.hrl in generated mime_types.erl
+
+--- yaws-1.95.orig/src/mime_type_c.erl
++++ yaws-1.95/src/mime_type_c.erl
+@@ -57,7 +57,7 @@
+                       "-export([default_type/0, default_type/1]).~n"
+                       "-export([t/1, revt/1]).~n"
+                       "-export([t/2, revt/2]).~n~n"
+-                      "-include_lib(\"yaws/include/yaws.hrl\").~n~n", []),
++                      "-include(\"yaws.hrl\").~n~n", []),
+ 
+             %% Generate default_type/0, t/1 and revt/1
+             io:format(Fd,

Modified: yaws/branches/experimental/debian/patches/series
===================================================================
--- yaws/branches/experimental/debian/patches/series	2012-10-18 06:26:04 UTC (rev 1473)
+++ yaws/branches/experimental/debian/patches/series	2012-10-18 20:06:47 UTC (rev 1474)
@@ -2,3 +2,4 @@
 gnu.diff
 docs.diff
 m32m64.diff
+mime.diff

Modified: yaws/branches/experimental/debian/rules
===================================================================
--- yaws/branches/experimental/debian/rules	2012-10-18 06:26:04 UTC (rev 1473)
+++ yaws/branches/experimental/debian/rules	2012-10-18 20:06:47 UTC (rev 1474)
@@ -217,7 +217,7 @@
 
 binary: binary-arch binary-indep
 
-VSN=1.94
+VSN=1.95
 
 get-orig-source:
 	wget -O - http://yaws.hyber.org/download/yaws-$(VSN).tar.gz | tar zx

More information about the Pkg-erlang-commits mailing list