[mupen64plus-core] 28/310: Merge mupen64plus 1.5+dfsg1-10

[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-core.

commit fae2583504ac2c331e6a2d2b4a5d3ea1cd208099
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Wed May 12 17:50:39 2010 +0200

    Merge mupen64plus 1.5+dfsg1-10
---
 debian/changelog | 37 +++++++++++++++++++++++++++++++++++--
 debian/control   |  1 +
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1210eb9..1e1a01e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,9 +15,10 @@ mupen64plus-core (1.99.4~hg20100511-1) UNRELEASED; urgency=low
       rice_nodebug.patch, rice-screenflickering.patch,
       rice-texturepack-crash.patch, system-libbz2.patch, system-liblzma.patch,
       system-libpng.patch, system-zlib.patch, version-string.patch,
-      xdg-basedir.patch, static-binutils-libs.patch, rice_fog.patch
+      xdg-basedir.patch, static-binutils-libs.patch, rice_fog.patch,
+      ftbfs-gvariant-type-conflicts.patch, dont-install-unneeded.patch
     - Rebase default-optimisations.patch and dejavu-font.patch against
-      1.99.4~hg20100403
+      1.99.4~hg20100511
   * Convert to 3.0 (quilt) source format
   * debian/control:
     - Remove unneeded build dependency to quilt
@@ -26,6 +27,38 @@ mupen64plus-core (1.99.4~hg20100511-1) UNRELEASED; urgency=low
 
  -- Sven Eckelmann <sven.eckelmann at gmx.de>  Mon, 15 Feb 2010 14:44:27 +0100
 
+mupen64plus (1.5+dfsg1-10) unstable; urgency=low
+
+  [ Sven Eckelmann ]
+  * debian/patches:
+    - Add rsp_ucode2_reset.patch, Reset status of specific ucode2 hacks after
+      starting again
+    - Add rsp_hle_bigendian.patch, Fix wrong high level emulation of rsp on big
+      endian systems
+    - Add rice-crash-vendorstring.patch, Don't crash on long OpenGL vendor
+      string (Closes: #580480, LP: #575968)
+
+  [ Piotr Ożarowski ]
+  * DMUA flag set to yes
+
+ -- Sven Eckelmann <sven.eckelmann at gmx.de>  Thu, 06 May 2010 11:34:46 +0200
+
+mupen64plus (1.5+dfsg1-9) unstable; urgency=low
+
+  * debian/patches:
+    - Add ftbfs-gvariant-type-conflicts.path, Fix FTBFS due to glib's gvariant.h
+      type definitions (Closes: #577329)
+    - Add dont-install-unneeded.patch, Don't install files which aren't used by
+      us
+  * debian/rules:
+    - Enable parallel builds using dh's --parallel
+    - Inform about missing installed files using dh's --list-missing
+    - Share options between dh_auto_build and dh_auto_install
+  * debian/control:
+    - Depend on debhelper 7.4.10 for --parallel and --list-missing
+
+ -- Sven Eckelmann <sven.eckelmann at gmx.de>  Sun, 11 Apr 2010 12:23:04 +0200
+
 mupen64plus (1.5+dfsg1-8) unstable; urgency=low
 
   * debian/patches:
diff --git a/debian/control b/debian/control
index 13a37f1..0e1f22f 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Vcs-Git: git://git.debian.org/git/collab-maint/mupen64plus-core.git
 Build-Depends: debhelper (>= 7.4.10), libfreetype6-dev, libsdl1.2-dev,
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
  libpng12-dev | libpng-dev, zlib1g-dev | libz-dev, binutils-dev
+DM-Upload-Allowed: yes
 
 Package: mupen64plus
 Architecture: all

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