[fenix] 121/127: Get quilt to accept patch by fixing up line endings

[Peter Pentchev]

This is an automated email from the git hooks/post-receive script.

roam-guest pushed a commit to branch master
in repository fenix.

commit 5fb0c19fac69ec98e26bcf387cf1d4c020d38229
Author: Vincent Cheng <vcheng at debian.org>
Date:   Mon Mar 31 07:42:18 2014 +0000

    Get quilt to accept patch by fixing up line endings
---
 debian/patches/fix_ftbfs_libpng1.5.patch | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/debian/patches/fix_ftbfs_libpng1.5.patch b/debian/patches/fix_ftbfs_libpng1.5.patch
index 1c8ddab..cb9d75d 100644
--- a/debian/patches/fix_ftbfs_libpng1.5.patch
+++ b/debian/patches/fix_ftbfs_libpng1.5.patch
@@ -93,21 +93,21 @@
 @@ -33,6 +33,7 @@
  #define _(String) String
  #endif
- 
+ 
 +#include <zlib.h>
- #include <png.h>
- 
- #define MAXPATH  1024
+ #include <png.h>
+ 
+ #define MAXPATH  1024
 @@ -187,8 +188,11 @@ MAP * png_load (const char * filename)
- 	if (!info_ptr || !end_info) fatal_error (_("Error loading PNG file")) ;
- 
- 	/* Rutina de error */
--
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+ 	if (!info_ptr || !end_info) fatal_error (_("Error loading PNG file")) ;
+ 
+ 	/* Rutina de error */
+-
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
 +	if (setjmp(png_jmpbuf(png_ptr)))
 +#else
- 	if (setjmp (png_ptr->jmpbuf))
+ 	if (setjmp (png_ptr->jmpbuf))
 +#endif
- 	{
- 		png_destroy_read_struct (&png_ptr, &info_ptr, &end_info) ;
- 		fclose (png) ;
+ 	{
+ 		png_destroy_read_struct (&png_ptr, &info_ptr, &end_info) ;
+ 		fclose (png) ;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/fenix.git