[mupen64plus-core] 214/310: 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-core.

commit 6133118fa85961b6d264f6922597991b1abf60c4
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Jun 9 22:51:32 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 a434d39..f196e48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mupen64plus-core (2.0~rc3+3+5d46baa3dd76-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 22:51:15 +0200
+
 mupen64plus-core (2.0~rc3+3+5d46baa3dd76-1) experimental; urgency=low
 
   * New Upstream Snapshot from 5d46baa3dd7660365183e16596b288f824903007
diff --git a/debian/control b/debian/control
index 5f94f42..5f71c39 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
  libgl1-mesa-dev | libgl-dev,
  libglu1-mesa-dev | libglu-dev,
  libpng-dev,
- libsdl1.2-dev | libsdl-dev,
+ libsdl2-dev,
  pkg-config,
  zlib1g-dev | libz-dev,
 
diff --git a/debian/rules b/debian/rules
index aea4bdc..376e36e 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 DEBUGGER=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 DEBUGGER=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
 
 binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep:

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