[wxmupen64plus] 30/71: Merge commit 'upstream/0.2'

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch experimental
in repository wxmupen64plus.

commit 3b3dc7a1245d5893e1e7c5e870e140d28631380c
Merge: 3b14a7c 56321d9
Author: Sven Eckelmann <sven at narfation.org>
Date:   Tue Oct 25 10:07:29 2011 +0200

    Merge commit 'upstream/0.2'

 Mupen additional config info.txt                |   8 +
 config.cpp                                      |   7 +
 debian/changelog                                |   8 +-
 debian/patches/series                           |   1 -
 debian/patches/single_window.patch              |  32 --
 debian/rules                                    |   2 +-
 gamespanel.cpp                                  |  29 +-
 gamespanel.h                                    |   3 +-
 main.cpp                                        |  82 +++--
 main.h                                          |   2 +
 mupen64plusplus/MupenAPI.c                      |  90 +++++-
 mupen64plusplus/{MupenAPI.c => MupenAPI.c.orig} |  92 +++++-
 mupen64plusplus/MupenAPI.h                      |   4 +
 mupen64plusplus/MupenAPIpp.cpp                  |  33 ++
 mupen64plusplus/MupenAPIpp.h                    |  23 +-
 mupen64plusplus/osal_dynamiclib_win32.c         | 148 ++++-----
 mupen64plusplus/osal_files_win32.c              | 210 ++++++-------
 parameterpanel.cpp                              | 210 ++++++++++---
 parameterpanel.h                                |  10 +
 sdlhelper.cpp                                   | 292 ++++++++++++++++++
 sdlhelper.h                                     |   5 +
 sdlkeypicker.cpp                                | 393 ++++++------------------
 sdlkeypicker.h                                  |  12 +-
 wscript                                         |   2 +-
 wxMupen64Plus.project                           | 131 --------
 wxMupen64PlusWin.project                        | 127 --------
 wxmupen.iss                                     | 160 +++++-----
 wxmupen64plus.rc                                |   2 +-
 wxvidext.cpp                                    | 219 ++++++-------
 29 files changed, 1282 insertions(+), 1055 deletions(-)

diff --cc debian/changelog
index 1ee0a86,0000000..937e3f4
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,0 +1,5 @@@
- wxmupen64plus (0.1+82+5a1d61bc9e40-1) UNRELEASED; urgency=low
++wxmupen64plus (0.2-1) UNRELEASED; urgency=low
 +
 +  * Initial release (Closes: #637771)
-   * debian/patches:
-     - Add single_window.patch, Enable single window mode on linux
-   * Remove hardening-includes which are now integrated in dpkg-
-     buildflags
-   * Use debian packaging manual URL as format identifier in
-     debian/copyright
 +
 + -- Sven Eckelmann <sven at narfation.org>  Mon, 17 Aug 2009 10:18:49 +0200
diff --cc debian/rules
index c354209,0000000..7326062
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,44 -1,0 +1,44 @@@
 +#!/usr/bin/make -f
 +# -*- makefile -*-
 +
++export DEB_BUILD_MAINT_OPTIONS=hardening=+pie
 +export CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
 +export CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
 +export CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
 +export LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 +
 +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 +
 +CFLAGS += -DCOREDIR="\"/usr/lib/$(DEB_HOST_MULTIARCH)/\""
 +CXXFLAGS += -DCOREDIR="\"/usr/lib/$(DEB_HOST_MULTIARCH)/\""
- LDFLAGS += -ldl -lGL
 +
 +LDFLAGS += -Wl,--as-needed
 +
 +DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 +MAKEOPTIONS = --mupenapi=/usr/include/mupen64plus/ --prefix=/usr --bindir='/usr/games/' --libdir='/usr/lib/$(DEB_HOST_MULTIARCH)/mupen64plus/' --datadir='/usr/share/wxmupen64plus/' --destdir=debian/tmp
 +
 +binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep:
 +	dh $@ --parallel --list-missing
 +
 +get-orig-source:
 +	$(CURDIR)/debian/get-orig-source.sh
 +
 +override_dh_auto_clean:
 +	/usr/bin/python waf distclean
 +	rm -rf build
 +
 +override_dh_auto_build:
 +	/usr/bin/python waf build $(MAKEOPTIONS)
 +
 +override_dh_auto_configure:
 +	/usr/bin/python  waf configure $(MAKEOPTIONS)
 +
 +override_dh_auto_install:
 +	/usr/bin/python waf install $(MAKEOPTIONS)
 +
 +override_dh_strip:
 +	dh_strip -a --dbg-package=wxmupen64plus-dbg
 +
 +.PHONY: binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep \
 +	get-orig-source override_dh_auto_clean override_dh_auto_build override_dh_auto_configure override_dh_auto_install override_dh_strip

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