This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch experimental in repository wxmupen64plus.
commit c50e43cfafe3ffa59ba3a9885e9beb640d8c26cb Author: Sven Eckelmann <[email protected]> Date: Wed Aug 31 00:15:39 2011 +0200 Rebase patches against 0.1+82+5a1d61bc9e40 --- debian/changelog | 8 ++---- debian/patches/install_games.patch | 29 -------------------- debian/patches/install_share_path.patch | 21 --------------- debian/patches/series | 3 --- debian/patches/single_window.patch | 2 +- debian/patches/wscript_configurable_dir.patch | 39 --------------------------- 6 files changed, 3 insertions(+), 99 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3f5fded..bb36c73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,14 +2,10 @@ wxmupen64plus (0.1+82+5a1d61bc9e40-1) UNRELEASED; urgency=low * Initial release (Closes: #637771) * New upstream snapshot from revision 5a1d61bc9e40be7c1b42ae65875743c2ce06556b - * debian/patches: - - Add install_games.patch, Make installpath for wxmupen64plus binary - configurable - - Add wscript_configurable_dir.patch, Add datadir and libdir flags - - Add install_share_path.patch, Install data files to path specified by - datadir * Update Vcs-* fields to new anonscm.debian.org URLs in debian/control * Provide search path to plugins and core in debian/rules * Mark all targets in debian/rules as phony + * debian/patches: + - Add single_window.patch, Enable single window mode on linux -- Sven Eckelmann <[email protected]> Mon, 17 Aug 2009 10:18:49 +0200 diff --git a/debian/patches/install_games.patch b/debian/patches/install_games.patch deleted file mode 100644 index 53cfff1..0000000 --- a/debian/patches/install_games.patch +++ /dev/null @@ -1,29 +0,0 @@ -Description: Make installpath for wxmupen64plus binary configurable -Author: Sven Eckelmann <[email protected]> - ---- -diff --git a/wscript b/wscript -index c5b119d1a433219b84ddf43bd0eb29d86220096b..2727ec37fbb3a837c52f907a3eb82f1acbf98c7a 100644 ---- a/wscript -+++ b/wscript -@@ -32,6 +32,7 @@ def options(opt): - opt.add_option('--wxconfig_args', action='store', help='Additional arguments passed to wx-config', default='', dest='wxconfig_args') - opt.add_option('--datadir', action='store', help='(Optional) the directory where to look for data files', default='', dest='datadir') - opt.add_option('--libdir', action='store', help='(Optional) the directory where to look for plugin files', default='', dest='libdir') -+ opt.add_option('--bindir', action='store', help='(Optional) the directory where to install wxmupen64plus binary', default='', dest='bindir') - - if os.name == 'nt': - opt.add_option('--wxhome', action='store', help='Where your wxWidgets build is installed', default=None, dest='wxhome') -@@ -123,8 +124,10 @@ def build(bld): - build_flags += ['-DDATADIR="' + bld.env['datadir'] + '"'] - if len(bld.env['libdir']) > 0: - build_flags += ['-DLIBDIR="' + bld.env['libdir'] + '"'] -- -- bin_install_path = "${PREFIX}/bin" -+ if len(bld.env['bindir']) > 0: -+ bin_install_path = bld.env['bindir'] -+ else: -+ bin_install_path = "${PREFIX}/bin" - - osal_src = [] - additional_links = [] diff --git a/debian/patches/install_share_path.patch b/debian/patches/install_share_path.patch deleted file mode 100644 index a7b47a8..0000000 --- a/debian/patches/install_share_path.patch +++ /dev/null @@ -1,21 +0,0 @@ -Description: Install data files to path specified by datadir -Author: Sven Eckelmann <[email protected]> - ---- -diff --git a/wscript b/wscript -index 91789c8df20a04e51eb1d62b9fcc2255a93107f0..8592c587de10fe95512ae542e87bcde33c111b9c 100644 ---- a/wscript -+++ b/wscript -@@ -165,7 +165,11 @@ def build(bld): - - # install target - data_dir = bld.path.find_dir('data') -- bld.install_files('${PREFIX}/share/wxmupen64plus/', data_dir.ant_glob('*')) -+ if len(bld.env['datadir']) > 0: -+ share_path = bld.env['datadir'] -+ else: -+ share_path = '${PREFIX}/share/wxmupen64plus/' -+ bld.install_files(share_path, data_dir.ant_glob('*')) - - - # Build the program diff --git a/debian/patches/series b/debian/patches/series index d4485b9..2a50409 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1 @@ -wscript_configurable_dir.patch -install_games.patch single_window.patch -install_share_path.patch diff --git a/debian/patches/single_window.patch b/debian/patches/single_window.patch index a161e76..ff2a279 100644 --- a/debian/patches/single_window.patch +++ b/debian/patches/single_window.patch @@ -19,7 +19,7 @@ index 70f7b051fdb78c182a72fe24b944eee7dfc4efb5..b0ccb7c7163e09f501406ad57ebf5b50 #endif diff --git a/wscript b/wscript -index 2727ec37fbb3a837c52f907a3eb82f1acbf98c7a..91789c8df20a04e51eb1d62b9fcc2255a93107f0 100644 +index 1eaf90596c1c7e2bed5559ab637fb6a53a811306..8592c587de10fe95512ae542e87bcde33c111b9c 100644 --- a/wscript +++ b/wscript @@ -82,6 +82,7 @@ def configure(ctx): diff --git a/debian/patches/wscript_configurable_dir.patch b/debian/patches/wscript_configurable_dir.patch deleted file mode 100644 index 53721c3..0000000 --- a/debian/patches/wscript_configurable_dir.patch +++ /dev/null @@ -1,39 +0,0 @@ -Description: Add datadir and libdir flags -Author: Marianne Gagnon <[email protected]> -Origin: backport, https://bitbucket.org/auria/wxmupen64plus/changeset/a0763d9c6c13/raw/wxmupen64plus-a0763d9c6c13.diff - ---- -diff --git a/wscript b/wscript -index 3f56a7956eaa2f48bb13924d7650cf75dd8d8200..c5b119d1a433219b84ddf43bd0eb29d86220096b 100644 ---- a/wscript -+++ b/wscript -@@ -30,6 +30,8 @@ def options(opt): - opt.add_option('--sdlconfig', action='store', help='Which sdl-config utility to use (optional)', default='sdl-config', dest="sdlconfig") - opt.add_option('--debug', action='store', help='Whether to make a debug build (may be \'true\' or \'false\')', default='false', dest="debugmode") - opt.add_option('--wxconfig_args', action='store', help='Additional arguments passed to wx-config', default='', dest='wxconfig_args') -+ opt.add_option('--datadir', action='store', help='(Optional) the directory where to look for data files', default='', dest='datadir') -+ opt.add_option('--libdir', action='store', help='(Optional) the directory where to look for plugin files', default='', dest='libdir') - - if os.name == 'nt': - opt.add_option('--wxhome', action='store', help='Where your wxWidgets build is installed', default=None, dest='wxhome') -@@ -77,6 +79,8 @@ def configure(ctx): - ctx.env['api_path'] = api_path - ctx.env['is_debug'] = is_debug - ctx.env['wxhome'] = wxhome -+ ctx.env['datadir'] = Options.options.datadir -+ ctx.env['libdir'] = Options.options.libdir - - ctx.find_program('gcc', var='GCC', mandatory=True) - ctx.find_program('g++', var='GPP', mandatory=True) -@@ -115,6 +119,11 @@ def build(bld): - else: - build_flags += ['-O2','-DNEBUG=1'] - -+ if len(bld.env['datadir']) > 0: -+ build_flags += ['-DDATADIR="' + bld.env['datadir'] + '"'] -+ if len(bld.env['libdir']) > 0: -+ build_flags += ['-DLIBDIR="' + bld.env['libdir'] + '"'] -+ - bin_install_path = "${PREFIX}/bin" - - osal_src = [] -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/wxmupen64plus.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
