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

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Wed Mar 20 09:17:04 UTC 2013 

Author: sgolovan
Date: 2013-03-20 09:17:04 +0000 (Wed, 20 Mar 2013)
New Revision: 1492

Removed:
   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 release.
  * Removed patch which fixed building mime_types.beam because it's no longer
    necessary.


Modified: yaws/branches/experimental/debian/changelog
===================================================================
--- yaws/branches/experimental/debian/changelog	2013-03-01 06:05:20 UTC (rev 1491)
+++ yaws/branches/experimental/debian/changelog	2013-03-20 09:17:04 UTC (rev 1492)
@@ -1,8 +1,10 @@
-yaws (1.95-2) UNRELEASED; urgency=low
+yaws (1.96-1) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Removed patch which fixed building mime_types.beam because it's no longer
+    necessary.
 
- -- Sergei Golovan <sgolovan at debian.org>  Fri, 19 Oct 2012 00:11:33 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 20 Mar 2013 13:02:55 +0400
 
 yaws (1.95-1) experimental; urgency=low
 

Modified: yaws/branches/experimental/debian/patches/docs.diff
===================================================================
--- yaws/branches/experimental/debian/patches/docs.diff	2013-03-01 06:05:20 UTC (rev 1491)
+++ yaws/branches/experimental/debian/patches/docs.diff	2013-03-20 09:17:04 UTC (rev 1492)
@@ -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.95.orig/doc/Makefile
-+++ yaws-1.95/doc/Makefile
+--- yaws-1.96.orig/doc/Makefile
++++ yaws-1.96/doc/Makefile
 @@ -17,9 +17,6 @@
  	@if [ -z "$(PDFLATEX)" ]; then \
  		echo "Need pdflatex"; exit 1; \
@@ -14,8 +14,8 @@
  
  
  
---- yaws-1.95.orig/doc/yaws.tex
-+++ yaws-1.95/doc/yaws.tex
+--- yaws-1.96.orig/doc/yaws.tex
++++ yaws-1.96/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	2013-03-01 06:05:20 UTC (rev 1491)
+++ yaws/branches/experimental/debian/patches/gnu.diff	2013-03-20 09:17:04 UTC (rev 1492)
@@ -1,8 +1,8 @@
 Patch by Sergei Golovan allows YWAS to build on hurd-i386 architecture.
 
---- yaws-1.95.orig/configure
-+++ yaws-1.95/configure
-@@ -4223,6 +4223,16 @@
+--- yaws-1.96.orig/configure
++++ yaws-1.96/configure
+@@ -4240,6 +4240,16 @@
             FPIC=-fPIC
  
             ;;
@@ -19,8 +19,8 @@
           *cygwin*)
             # Extract the first word of "werl", so it can be a program name with args.
  set dummy werl; ac_word=$2
---- yaws-1.95.orig/configure.in
-+++ yaws-1.95/configure.in
+--- yaws-1.96.orig/configure.in
++++ yaws-1.96/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	2013-03-01 06:05:20 UTC (rev 1491)
+++ yaws/branches/experimental/debian/patches/installapps.diff	2013-03-20 09:17:04 UTC (rev 1492)
@@ -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.95.orig/applications/yapp/Makefile
-+++ yaws-1.95/applications/yapp/Makefile
+--- yaws-1.96.orig/applications/yapp/Makefile
++++ yaws-1.96/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	2013-03-01 06:05:20 UTC (rev 1491)
+++ yaws/branches/experimental/debian/patches/m32m64.diff	2013-03-20 09:17:04 UTC (rev 1492)
@@ -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.95.orig/configure
-+++ yaws-1.95/configure
-@@ -4072,16 +4072,15 @@
+--- yaws-1.96.orig/configure
++++ yaws-1.96/configure
+@@ -4089,16 +4089,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
@@ -24,8 +24,8 @@
                     esac
  fi
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
---- yaws-1.95.orig/configure.in
-+++ yaws-1.95/configure.in
+--- yaws-1.96.orig/configure.in
++++ yaws-1.96/configure.in
 @@ -231,14 +231,13 @@
                              end end)])],
  	       [AC_MSG_NOTICE(found 64-bit Erlang)

Deleted: yaws/branches/experimental/debian/patches/mime.diff
===================================================================
--- yaws/branches/experimental/debian/patches/mime.diff	2013-03-01 06:05:20 UTC (rev 1491)
+++ yaws/branches/experimental/debian/patches/mime.diff	2013-03-20 09:17:04 UTC (rev 1492)
@@ -1,14 +0,0 @@
-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	2013-03-01 06:05:20 UTC (rev 1491)
+++ yaws/branches/experimental/debian/patches/series	2013-03-20 09:17:04 UTC (rev 1492)
@@ -2,4 +2,3 @@
 gnu.diff
 docs.diff
 m32m64.diff
-mime.diff

Modified: yaws/branches/experimental/debian/rules
===================================================================
--- yaws/branches/experimental/debian/rules	2013-03-01 06:05:20 UTC (rev 1491)
+++ yaws/branches/experimental/debian/rules	2013-03-20 09:17:04 UTC (rev 1492)
@@ -217,7 +217,7 @@
 
 binary: binary-arch binary-indep
 
-VSN=1.95
+VSN=1.96
 
 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