[mupen64plus] 146/262: Merge branch 'master' into experimental

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch master
in repository mupen64plus.

commit 82519d50b7fb13a2cdfa03d47a444e0cab0f5b76
Merge: e8df692 709eb7f
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Sat Oct 3 01:53:27 2009 +0200

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/changelog
    	debian/patches/correct_fpr32_mapping.patch
    	debian/patches/series

 debian/changelog                            |  14 +-
 debian/patches/as-needed.patch              |   1 +
 debian/patches/correct_fpr32_mapping.patch  | 403 ++++++++++++++++------------
 debian/patches/debian-archs.patch           |   1 +
 debian/patches/fix_readpng.patch            | 326 ++++++++--------------
 debian/patches/ftbfs-debugger.patch         |   1 +
 debian/patches/ftbfs-dynarec.patch          |   1 +
 debian/patches/ftbfs-glibc210.patch         |  17 +-
 debian/patches/glide64-noasm.patch          |   1 +
 debian/patches/interpreter_x86_fldcw.patch  |   1 +
 debian/patches/jttl_fix_romclosed.patch     |  14 +-
 debian/patches/load-fpr-location.patch      |  55 ----
 debian/patches/noexecstack.patch            |  34 ++-
 debian/patches/rice-screenflickering.patch  |   1 +
 debian/patches/rice-texturepack-crash.patch |   1 +
 debian/patches/rice_nodebug.patch           |   2 +-
 debian/patches/series                       |   1 -
 debian/patches/system-libbz2.patch          |   1 +
 debian/patches/system-libpng.patch          |   1 +
 debian/patches/system-zlib.patch            |   1 +
 20 files changed, 415 insertions(+), 462 deletions(-)

diff --cc debian/changelog
index 492e0a2,95e3ffb..5acfea0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,17 +1,20 @@@
  mupen64plus (1.5+dfsg1-6) UNRELEASED; urgency=low
  
--  * debian/patches:
-     - Add system-liblzma.patch, use liblzma from debian instead of buildin
-       (Closes: #543552)
+     - Add Origin information to patches
+     - Update fix_readpng.patch, Backport actual commit from upstream
+     - Update ftbfs-glibc210.patch, Backport actual commit from upstream
+     - Update noexecstack.patch, Backport actual commit from upstream
+     - Update jttl_fix_romclosed.patch, Backport actual commit from upstream
      - Add correct_fpr32_mapping.patch, Correct emulation of shared 32 bit wide
        and 64 bit wide FPR in MIPS I and MIPS III mode
+     - Remove load-fpr-location.patch which is replaced by
+       correct_fpr32_mapping.patch
++    - Add system-liblzma.patch, use liblzma from debian instead of buildin
++      (Closes: #543552)
 +  * debian/control:
 +    - Depend on liblzma-dev for lzma and xz support
  
-  -- Sven Eckelmann <sven.eckelmann at gmx.de>  Tue, 29 Sep 2009 11:45:31 +0200
+  -- Sven Eckelmann <sven.eckelmann at gmx.de>  Sat, 03 Oct 2009 00:36:41 +0200
  
  mupen64plus (1.5+dfsg1-5) unstable; urgency=low
  
diff --cc debian/patches/series
index cc82755,e7484be..ca64fbc
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -27,6 -27,4 +27,5 @@@ fix_readpng.patc
  jttl_fix_romclosed.patch
  rice_nodebug.patch
  interpreter_x86_fldcw.patch
- load-fpr-location.patch
 +system-liblzma.patch
  correct_fpr32_mapping.patch

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