[wxmupen64plus] 61/71: Merge tag 'upstream/0.3+17+7b283c0ad22f' into experimental
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:23:39 UTC 2015
This is an automated email from the git hooks/post-receive script.
ecsv-guest pushed a commit to branch experimental
in repository wxmupen64plus.
commit 226c0b8493ffa12965c1a33b21dbe738259e11d0
Merge: 2cc7254 79b747e
Author: Sven Eckelmann <sven at narfation.org>
Date: Sun May 20 20:54:56 2012 +0200
Merge tag 'upstream/0.3+17+7b283c0ad22f' into experimental
Upstream version 0.3+17+7b283c0ad22f
.hg_archival.txt | 4 -
.hgignore | 14 -
.hgtags | 3 -
config.cpp | 83 +-
debian/changelog | 8 +-
debian/patches/fix_bindir.patch | 17 -
debian/patches/manpage.patch | 29 -
debian/patches/missing_symbols.patch | 17 -
debian/patches/release_version.patch | 17 -
debian/patches/series | 5 -
debian/patches/version_check.patch | 45 -
debian/rules | 3 +-
debugger/breakpoint.cpp | 291 +++++
debugger/breakpoint.h | 118 ++
debugger/breakpointpanel.cpp | 756 ++++++++++++
debugger/breakpointpanel.h | 78 ++
debugger/colors.cpp | 77 ++
.../osal_preproc.h => debugger/colors.h | 60 +-
debugger/debugconfig.cpp | 152 +++
.../osal_preproc.h => debugger/debugconfig.h | 82 +-
debugger/debugconsole.cpp | 391 ++++++
.../osal_preproc.h => debugger/debugconsole.h | 70 +-
debugger/debuggerframe.cpp | 1147 ++++++++++++++++++
debugger/debuggerframe.h | 154 +++
.../osal_preproc.h => debugger/debugpanel.cpp | 76 +-
.../osal_preproc.h => debugger/debugpanel.h | 70 +-
debugger/disasmpanel.cpp | 599 +++++++++
debugger/disasmpanel.h | 122 ++
debugger/dv_treelist.cpp | 182 +++
debugger/dv_treelist.h | 93 ++
debugger/memorypanel.cpp | 624 ++++++++++
debugger/memorypanel.h | 120 ++
debugger/memorysearch.cpp | 907 ++++++++++++++
debugger/memorysearch.h | 163 +++
debugger/r4300.h | 83 ++
debugger/registerpanel.cpp | 927 ++++++++++++++
debugger/registerpanel.h | 277 +++++
gamespanel.cpp | 46 +-
main.cpp | 26 +-
mupen64plusplus/MupenAPI.c | 181 ++-
mupen64plusplus/MupenAPI.h | 43 +-
mupen64plusplus/osal_preproc.h | 3 +
ownerptr.h | 22 +-
waf | Bin 84135 -> 4079 bytes
waflib/Build.py | 1280 ++++++++++++++++++++
waflib/ConfigSet.py | 328 +++++
waflib/Configure.py | 568 +++++++++
waflib/Context.py | 599 +++++++++
waflib/Errors.py | 70 ++
waflib/Logs.py | 275 +++++
waflib/Node.py | 828 +++++++++++++
waflib/Options.py | 245 ++++
waflib/Runner.py | 354 ++++++
waflib/Scripting.py | 556 +++++++++
waflib/Task.py | 1212 ++++++++++++++++++
waflib/TaskGen.py | 726 +++++++++++
waflib/Tools/__init__.py | 3 +
waflib/Tools/ar.py | 23 +
waflib/Tools/asm.py | 74 ++
waflib/Tools/bison.py | 49 +
waflib/Tools/c.py | 39 +
waflib/Tools/c_aliases.py | 128 ++
waflib/Tools/c_config.py | 1166 ++++++++++++++++++
waflib/Tools/c_osx.py | 182 +++
waflib/Tools/c_preproc.py | 1030 ++++++++++++++++
waflib/Tools/c_tests.py | 173 +++
waflib/Tools/ccroot.py | 536 ++++++++
waflib/Tools/compiler_c.py | 98 ++
waflib/Tools/compiler_cxx.py | 102 ++
waflib/Tools/compiler_d.py | 59 +
waflib/Tools/compiler_fc.py | 68 ++
waflib/Tools/cs.py | 178 +++
waflib/Tools/cxx.py | 40 +
waflib/Tools/d.py | 93 ++
waflib/Tools/d_config.py | 57 +
waflib/Tools/d_scan.py | 209 ++++
waflib/Tools/dbus.py | 70 ++
waflib/Tools/dmd.py | 75 ++
waflib/Tools/errcheck.py | 185 +++
waflib/Tools/fc.py | 205 ++++
waflib/Tools/fc_config.py | 446 +++++++
waflib/Tools/fc_scan.py | 126 ++
waflib/Tools/flex.py | 46 +
waflib/Tools/g95.py | 65 +
waflib/Tools/gas.py | 16 +
waflib/Tools/gcc.py | 153 +++
waflib/Tools/gdc.py | 56 +
waflib/Tools/gfortran.py | 89 ++
waflib/Tools/glib2.py | 379 ++++++
waflib/Tools/gnu_dirs.py | 127 ++
waflib/Tools/gxx.py | 153 +++
waflib/Tools/icc.py | 42 +
waflib/Tools/icpc.py | 41 +
waflib/Tools/ifort.py | 49 +
waflib/Tools/intltool.py | 176 +++
waflib/Tools/irixcc.py | 63 +
waflib/Tools/javaw.py | 414 +++++++
waflib/Tools/kde4.py | 90 ++
waflib/Tools/log | 1007 +++++++++++++++
waflib/Tools/lua.py | 38 +
waflib/Tools/msvc.py | 879 ++++++++++++++
waflib/Tools/nasm.py | 22 +
waflib/Tools/perl.py | 149 +++
waflib/Tools/python.py | 472 ++++++++
waflib/Tools/qt4.py | 557 +++++++++
waflib/Tools/ruby.py | 151 +++
waflib/Tools/suncc.py | 77 ++
waflib/Tools/suncxx.py | 78 ++
waflib/Tools/tex.py | 372 ++++++
waflib/Tools/vala.py | 337 ++++++
waflib/Tools/waf_unit_test.py | 151 +++
waflib/Tools/winres.py | 52 +
waflib/Tools/xlc.py | 69 ++
waflib/Tools/xlcxx.py | 69 ++
waflib/Utils.py | 593 +++++++++
waflib/__init__.py | 3 +
waflib/ansiterm.py | 242 ++++
waflib/extras/__init__.py | 3 +
waflib/extras/compat15.py | 298 +++++
waflib/fixpy2.py | 67 +
wscript | 43 +-
wxmupen64plus.6 | 18 +
122 files changed, 27918 insertions(+), 428 deletions(-)
diff --cc debian/changelog
index 027ad54,0000000..2386e65
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,0 +1,5 @@@
- wxmupen64plus (0.3-1) UNRELEASED; urgency=low
++wxmupen64plus (0.3+17+7b283c0ad22f-1) UNRELEASED; urgency=low
+
+ * Initial release (Closes: #637771)
- * debian/patches:
- - Add version_check.patch, Disable in-tree mupen64plus-core version check
- - Add release_version.patch, Fix release version
- - Add missing_symbols.patch, Fix missing symbols
- - Add fix_bindir.patch, Fix binary installation path
- - Add manpage.patch, Add sample manpage
+
+ -- Sven Eckelmann <sven at narfation.org> Mon, 17 Aug 2009 10:18:49 +0200
diff --cc debian/rules
index 20b4814,0000000..fe9a442
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,38 -1,0 +1,39 @@@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DBG_PACKAGE=$(shell dpkg-parsechangelog|grep '^Source: '|sed 's/^Source:\s*//')-dbg
+
+export DEB_CFLAGS_MAINT_APPEND=-DCOREDIR="\"/usr/lib/$(DEB_HOST_MULTIARCH)/\""
+export DEB_CXXFLAGS_MAINT_APPEND=-DCOREDIR="\"/usr/lib/$(DEB_HOST_MULTIARCH)/\""
+
- MAKEOPTIONS = -v --mupenapi=/usr/include/mupen64plus/ --prefix=/usr --bindir='/usr/games/' --libdir='/usr/lib/$(DEB_HOST_MULTIARCH)/mupen64plus/' --datadir='/usr/share/games/wxmupen64plus/' --destdir=debian/tmp --version_check=false
++MAKEOPTIONS = -v --mupenapi=/usr/include/mupen64plus/ --prefix=/usr --bindir='/usr/games/' --libdir='/usr/lib/$(DEB_HOST_MULTIARCH)/mupen64plus/' --datadir='/usr/share/games/wxmupen64plus/' --destdir=debian/tmp --version_check=false --debugger=true
+
+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
++ find . -name "*.pyc" -delete
+
+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="$(DBG_PACKAGE)"
+
+.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
More information about the Pkg-games-commits
mailing list