[mupen64plus-video-rice] 147/191: Switch from SDL 1.2 to SDL 2.0

[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-video-rice.

commit f838a4185151507c5f651da695f4a8763dc3c77f
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Jun 9 23:06:03 2013 +0200

    Switch from SDL 1.2 to SDL 2.0
---
 debian/changelog | 9 +++++++++
 debian/control   | 2 +-
 debian/rules     | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6bfbcef..f757e74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mupen64plus-video-rice (2.0~rc2+1+81c42ae7724a-2) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - Switch from SDL 1.2 to SDL 2.0
+  * debian/control:
+    - Depend on libsdl2-dev instead of libsdl1.2-dev
+
+ -- Sven Eckelmann <sven at narfation.org>  Sun, 09 Jun 2013 23:02:06 +0200
+
 mupen64plus-video-rice (2.0~rc2+1+81c42ae7724a-1) experimental; urgency=low
 
   * New Upstream Snapshot from 81c42ae7724abbcb37d73e247f72956955573e2a
diff --git a/debian/control b/debian/control
index ff5ef7b..e640560 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
  libgl1-mesa-dev | libgl-dev,
  libmupen64plus-dev (>= 1.99.5+207+cbb5cbe2d4fc),
  libpng-dev,
- libsdl1.2-dev | libsdl-dev,
+ libsdl2-dev,
  pkg-config,
 
 Package: mupen64plus-video-rice
diff --git a/debian/rules b/debian/rules
index 79c5535..8ce5f98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ export DEB_CFLAGS_MAINT_APPEND=-flto
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-MAKEOPTIONS = V=1 UNAME='$(DEB_HOST_ARCH_OS)' HOST_CPU='$(DEB_HOST_GNU_CPU)' APIDIR=/usr/include/mupen64plus/ DEBUG=1 PREFIX=/usr/ LIBDIR="/usr/lib/$(DEB_HOST_MULTIARCH)" PIC=1 OPTFLAGS="-DNDEBUG" SHAREDIR="/usr/share/games/mupen64plus/"
+MAKEOPTIONS = V=1 UNAME='$(DEB_HOST_ARCH_OS)' HOST_CPU='$(DEB_HOST_GNU_CPU)' APIDIR=/usr/include/mupen64plus/ DEBUG=1 PREFIX=/usr/ LIBDIR="/usr/lib/$(DEB_HOST_MULTIARCH)" PIC=1 OPTFLAGS="-DNDEBUG" SHAREDIR="/usr/share/games/mupen64plus/" SDL_CONFIG=sdl2-config
 
 DBG_PACKAGE=$(shell dpkg-parsechangelog|grep '^Source: '|sed 's/^Source:\s*//')-dbg
 

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