[dolphin-emu] 01/03: Merge branch 'master' into experimental

[James Cowgill]

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

jcowgill-guest pushed a commit to branch experimental
in repository dolphin-emu.

commit 3fc21189b31d882aea5b71f9d7d91eeb03cbd945
Merge: dad711d 2c5b209
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Fri Sep 25 10:35:21 2015 +0100

    Merge branch 'master' into experimental

 debian/changelog | 7 +++++++
 debian/copyright | 1 +
 2 files changed, 8 insertions(+)

diff --cc debian/changelog
index 138fbaf,06bff2b..99d2e21
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,10 +1,34 @@@
 +dolphin-emu (5.0~rc27+dfsg-1) experimental; urgency=medium
 +
 +  * New upstream release candidate.
 +
 +  * debian/control:
 +    - Drop armhf and i386 from architecture list. Add arm64.
 +    - Update build dependencies.
 +  * debian/copyright:
 +    - Update for 5.0.
 +  * debian/dolphin-emu.docs:
 +    - Install Readme.md instead of Readme.txt.
 +  * debian/gc-fonts:
 +    - Remove directory - fonts are now upstream.
 +  * debian/patches:
 +    - Drop patches applied upstream.
 +    - Add patch to allow tests to build against a shared copy of gtest.
 +    - Add patch to remove shebang from desktop file.
 +  * debian/rules:
 +    - Enable running unittests at build time.
 +  * debian/watch:
 +    - Only match released versions of dolphin.
 +
 + -- James Cowgill <james410 at cowgill.org.uk>  Thu, 17 Sep 2015 15:59:13 +0100
 +
+ dolphin-emu (4.0.2+dfsg2-1) unstable; urgency=medium
+ 
+   * Remove non-free Boomy theme (Thanks Sérgio Benjamim, Closes: #799320).
+   * Remove obsolete google code URLs from debian/copyright.
+ 
+  -- James Cowgill <james410 at cowgill.org.uk>  Thu, 17 Sep 2015 21:30:01 +0100
+ 
  dolphin-emu (4.0.2+dfsg-2) unstable; urgency=medium
  
    * Add 10_include_findx11.patch patch to fix FTBFS with CMake 3.2
diff --cc debian/copyright
index 51857a5,053a227..0b4bd5e
--- a/debian/copyright
+++ b/debian/copyright
@@@ -3,16 -3,21 +3,17 @@@ Source: http://dolphin-emu.org
  Upstream-Name: Dolphin Emulator
  Upstream-Contact: http://forums.dolphin-emu.org/
  Files-Excluded:
 - Data/Sys/GC/font_ansi.bin
 - Data/Sys/GC/font_sjis.bin
+  Data/Sys/Themes/Boomy
 - Externals/Bochs_disasm/PowerPCDisasm.*
 - Externals/CLRun/include/CL
 - Externals/GLES3
 - Externals/GLew
   Externals/LZO
   Externals/OpenAL
 - Externals/SDL
 + Externals/Qt
   Externals/SFML
   Externals/SOIL
 + Externals/XAudio2_7
 + Externals/enet
   Externals/gettext
 + Externals/gtest
   Externals/libiconv-1.14
 - Externals/libjpeg
   Externals/libpng
   Externals/libusb
   Externals/miniupnpc

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