[mupen64plus-ui-console] 19/172: Rebase patches against 1.99.4~hg20100403

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-ui-console.

commit 7c8d3035f586b8a4b546a7fc2aab2d6eafa77f3b
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Sun Apr 4 22:27:11 2010 +0200

    Rebase patches against 1.99.4~hg20100403
---
 debian/changelog                           |  2 +-
 debian/patches/default-optimisations.patch | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8a660b0..22528d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,7 @@ mupen64plus-ui-console (1.99.4~hg20100403-1) UNRELEASED; urgency=low
       rice-texturepack-crash.patch, static-binutils-libs.patch,
       system-libbz2.patch, system-liblzma.patch, system-libpng.patch,
       system-zlib.patch, version-string.patch, xdg-basedir.patch, rice_fog.patch
-    - Rebase default-optimisations.patch against 1.99.3
+    - Rebase default-optimisations.patch against 1.99.4~hg20100403
   * Convert to 3.0 (quilt) source format
   * debian/control:
     - Remove unneeded build dependency to quilt
diff --git a/debian/patches/default-optimisations.patch b/debian/patches/default-optimisations.patch
index 767373f..d71bf4f 100644
--- a/debian/patches/default-optimisations.patch
+++ b/debian/patches/default-optimisations.patch
@@ -4,16 +4,14 @@ Author: Sven Eckelmann <sven.eckelmann at gmx.de>
 
 ---
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 0bcae247fd574c5fa4844fcf0863fb0bc6a889f1..5d7ce8f733a99c7a13202030348ea11cb93dfbc9 100644
+index d7ca29c5977509e45c18b9ac2d57ccb10e147a93..85a0ceaa296d28203510aeb8ca3afae78d1b2813 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
-@@ -72,16 +72,16 @@ ifeq ("$(CPU)","NONE")
- endif
+@@ -73,15 +73,15 @@ endif
  
  # base CFLAGS, LIBS, and LDFLAGS
--CFLAGS = -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -I../../src
--LDFLAGS = -ldl -lpthread
-+CFLAGS += -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -I../../src
+ CFLAGS += -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -I../../src
+-LDFLAGS += -ldl -lpthread
 +LDFLAGS += -ldl
  
  # set special flags per-system

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