[Python-modules-commits] [pygame] 03/03: Updates to debian/ for new upstream version.
Dominik George
natureshadow-guest at moszumanska.debian.org
Thu Jan 26 00:37:35 UTC 2017
This is an automated email from the git hooks/post-receive script.
natureshadow-guest pushed a commit to branch master
in repository pygame.
commit 951c7622eea8995b61331d90a699376fab6a48fb
Author: Dominik George <nik at naturalnet.de>
Date: Thu Jan 26 01:35:56 2017 +0100
Updates to debian/ for new upstream version.
---
debian/changelog | 6 +
debian/compat | 2 +-
debian/control | 9 +-
...-dependencies-pygame-no-longer-has-movie-.patch | 293 ---------------------
...the-subprocess-test_runner-by-module-name.patch | 37 ---
debian/patches/0005-python3.5-support.patch | 43 ---
debian/patches/MMX.diff | 4 +-
debian/patches/series | 3 -
.../setup_ignore_portmidi_on_non_linux.diff | 4 +-
debian/rules | 30 ---
10 files changed, 13 insertions(+), 418 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7a49047..9fe41c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pygame (1.9.3-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Dominik George <nik at naturalnet.de> Thu, 26 Jan 2017 01:27:31 +0100
+
pygame (1.9.2~pre~r3449-2) experimental; urgency=medium
* Ignore test failures temporarily (pre-release).
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 5b027d9..a09c4d9 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,10 @@ Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.
Uploaders:
Ed Boraas <ed at debian.org>,
A Mennucc1 <mennucc1 at debian.org>,
- Vincent Cheng <vcheng at debian.org>
+ Vincent Cheng <vcheng at debian.org>,
+ Dominik George <nik at naturalnet.de>
Build-Depends:
- debhelper (>= 9),
+ debhelper (>= 10),
dh-python,
fluid-soundfont-gm,
fontconfig,
@@ -28,11 +29,9 @@ Build-Depends:
sharutils
Build-Conflicts: python3.2-dev (<< 3.2.3-7)
Standards-Version: 3.9.8
-X-Python-Version: >= 2.3
-X-Python3-Version: >= 3.2
Homepage: http://www.pygame.org/
Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/pygame.git
-Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/pygame.git
+Vcs-Browser: https://anonscm.debian.org/git/python-modules/packages/pygame.git
Package: python-pygame
Architecture: any
diff --git a/debian/patches/0003-Drop-ffmpeg-dependencies-pygame-no-longer-has-movie-.patch b/debian/patches/0003-Drop-ffmpeg-dependencies-pygame-no-longer-has-movie-.patch
deleted file mode 100644
index a8153d6..0000000
--- a/debian/patches/0003-Drop-ffmpeg-dependencies-pygame-no-longer-has-movie-.patch
+++ /dev/null
@@ -1,293 +0,0 @@
-From 9393c5cbd104755447358418e318db256b09d325 Mon Sep 17 00:00:00 2001
-From: Stefano Rivera <stefanor at debian.org>
-Date: Sat, 5 Mar 2016 17:19:40 -0500
-Subject: Drop ffmpeg dependencies, pygame no longer has movie support
-
-Forwarded: https://bitbucket.org/pygame/pygame/pull-requests/53/pull-out-ffmpeg-and-smpeg-dependencies/diff
----
- .travis.yml | 2 +-
- Setup.in | 1 -
- bdist_mpkg_support.py | 1 -
- config_darwin.py | 4 ----
- config_msys.py | 3 +--
- config_unix.py | 39 +--------------------------------------
- config_win.py | 10 ++--------
- configtest/test-smpeg-config | 7 -------
- configtest/test_config_msys.py | 6 ------
- configtest/test_config_win.py | 4 +---
- configtest/test_dll.py | 1 -
- dll.py | 3 +--
- 12 files changed, 7 insertions(+), 74 deletions(-)
- delete mode 100644 configtest/test-smpeg-config
-
-diff --git a/.travis.yml b/.travis.yml
-index 82b73b1..6162591 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -24,7 +24,7 @@ script:
- # Here we install the ubuntu dependencies with apt-get.
- before_install:
- - sudo apt-get update
-- - sudo apt-get install python-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev libsdl1.2-dev libsmpeg-dev python-numpy libportmidi-dev ffmpeg libswscale-dev libavformat-dev libavcodec-dev libjpeg-dev libtiff4-dev libx11-6 libX11-dev xfonts-base xfonts-100dpi xfonts-75dpi xfonts-cyrillic
-+ - sudo apt-get install python-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev libsdl1.2-dev python-numpy libportmidi-dev libjpeg-dev libtiff4-dev libx11-6 libX11-dev xfonts-base xfonts-100dpi xfonts-75dpi xfonts-cyrillic
-
- # Here we can notify the pygame irc chat.
-
-diff --git a/Setup.in b/Setup.in
-index 8a72fd4..735b890 100644
---- a/Setup.in
-+++ b/Setup.in
-@@ -11,7 +11,6 @@ SDL = -I/usr/include/SDL -D_REENTRANT -lSDL
- FONT = -lSDL_ttf
- IMAGE = -lSDL_image
- MIXER = -lSDL_mixer
--SMPEG = -lsmpeg
- PNG = -lpng
- JPEG = -ljpeg
- SCRAP = -lX11
-diff --git a/bdist_mpkg_support.py b/bdist_mpkg_support.py
-index c10c5ab..1b394c6 100644
---- a/bdist_mpkg_support.py
-+++ b/bdist_mpkg_support.py
-@@ -11,7 +11,6 @@ except NameError:
- def unicode(s):
- return str(s)
-
--#FRAMEWORKS = ['SDL', 'SDL_ttf', 'SDL_image', 'SDL_mixer', 'smpeg']
- FRAMEWORKS = ['SDL', 'SDL_ttf', 'SDL_image', 'SDL_mixer']
-
- CUSTOM_SCHEMES = dict(
-diff --git a/config_darwin.py b/config_darwin.py
-index 58c0f39..1a20c41 100644
---- a/config_darwin.py
-+++ b/config_darwin.py
-@@ -107,8 +107,6 @@ DEPS = [
- FrameworkDependency('IMAGE', 'SDL_image.h', 'libSDL_image', 'SDL_image')],
- [Dependency('MIXER', ['SDL_mixer.h', 'SDL/SDL_mixer.h'], 'libSDL_mixer', ['SDL_mixer']),
- FrameworkDependency('MIXER', 'SDL_mixer.h', 'libSDL_mixer', 'SDL_mixer')],
-- [DependencyProg('SMPEG', 'SMPEG_CONFIG', 'smpeg-config', '0.4.3', ['smpeg']),
-- FrameworkDependency('SMPEG', 'smpeg.h', 'libsmpeg', 'smpeg')],
- FrameworkDependency('PORTTIME', 'CoreMidi.h', 'CoreMidi', 'CoreMIDI'),
- FrameworkDependency('QUICKTIME', 'QuickTime.h', 'QuickTime', 'QuickTime'),
- Dependency('PNG', 'png.h', 'libpng', ['png']),
-@@ -116,8 +114,6 @@ DEPS = [
- Dependency('PORTMIDI', 'portmidi.h', 'libportmidi', ['portmidi']),
- DependencyProg('FREETYPE', 'FREETYPE_CONFIG', '/usr/X11R6/bin/freetype-config', '2.0',
- ['freetype'], '--ftversion'),
-- Dependency('AVFORMAT', '','',[]),
-- Dependency('SWSCALE', '','',[]),
- # Scrap is included in sdlmain_osx, there is nothing to look at.
- # Dependency('SCRAP', '','',[]),
- ]
-diff --git a/config_msys.py b/config_msys.py
-index c56dfd6..6a23fb3 100644
---- a/config_msys.py
-+++ b/config_msys.py
-@@ -19,7 +19,7 @@ localbase = os.environ.get('LOCALBASE', '')
-
- #these get prefixes with '/usr/local' and /mingw or the $LOCALBASE
- origincdirs = ['/include', '/include/SDL', '/include/SDL11',
-- '/include/smpeg', '/include/libpng12', ]
-+ '/include/libpng12', ]
- origlibdirs = ['/lib']
-
-
-@@ -230,7 +230,6 @@ def main():
- Dependency('FONT', 'SDL_ttf.h', 'libSDL_ttf.dll.a'),
- Dependency('IMAGE', 'SDL_image.h', 'libSDL_image.dll.a'),
- Dependency('MIXER', 'SDL_mixer.h', 'libSDL_mixer.dll.a'),
-- DependencyProg('SMPEG', 'SMPEG_CONFIG', 'smpeg-config', '0.4.3', m),
- Dependency('PNG', 'png.h', 'libpng.dll.a'),
- Dependency('JPEG', 'jpeglib.h', 'libjpeg.dll.a'),
- Dependency('PORTMIDI', 'portmidi.h', 'libportmidi.dll.a'),
-diff --git a/config_unix.py b/config_unix.py
-index 1b2be6a..6004810 100644
---- a/config_unix.py
-+++ b/config_unix.py
-@@ -15,8 +15,7 @@ configcommand = configcommand + ' --version --cflags --libs'
- localbase = os.environ.get('LOCALBASE', '')
-
- #these get prefixes with '/usr' and '/usr/local' or the $LOCALBASE
--origincdirs = ['/include', '/include/SDL', '/include/SDL',
-- '/include/smpeg']
-+origincdirs = ['/include', '/include/SDL', '/include/SDL']
- origlibdirs = ['/lib','/lib64','/X11R6/lib']
- if 'ORIGLIBDIRS' in os.environ and os.environ['ORIGLIBDIRS'] != "":
- origlibdirs = os.environ['ORIGLIBDIRS'].split(":")
-@@ -110,40 +109,7 @@ class Dependency:
- else:
- print (self.name + ' '[len(self.name):] + ': not found')
-
--
--class FFMPEGDependency(Dependency):
-- def __init__(self, name, checkhead, checklib, libs, dirs):
-- self.dirs=dirs
-- Dependency.__init__(self, name, checkhead, checklib, libs)
-- self.cflags=""
--
-- def configure(self, incdirs, libdirs):
-- incname = self.checkhead
-- libnames = self.checklib, self.name.lower()
--
-- dirs=self.dirs[:]
-- self.dirs = ["/usr"+d for d in dirs]
-- self.dirs += ["/usr/local"+d for d in dirs]
-- loc_incdirs = incdirs[:]+self.dirs
-- if incname:
-- for dir in loc_incdirs:
-- path = os.path.join(dir, incname)
-- if os.path.isfile(path):
-- self.inc_dir = dir
-
-- for dir in libdirs:
-- for name in libnames:
-- path = os.path.join(dir, name)
-- if filter(os.path.isfile, glob(path+'*')):
-- self.lib_dir = dir
--
-- if (incname and self.lib_dir and self.inc_dir) or (not incname and self.lib_dir):
-- print (self.name + ' '[len(self.name):] + ': found')
-- self.found = 1
-- else:
-- print (self.name + ' '[len(self.name):] + ': not found')
--
--
- class DependencyPython:
- def __init__(self, name, module, header):
- self.name = name
-@@ -183,14 +149,11 @@ def main():
- Dependency('FONT', 'SDL_ttf.h', 'libSDL_ttf.so', ['SDL_ttf']),
- Dependency('IMAGE', 'SDL_image.h', 'libSDL_image.so', ['SDL_image']),
- Dependency('MIXER', 'SDL_mixer.h', 'libSDL_mixer.so', ['SDL_mixer']),
-- DependencyProg('SMPEG', 'SMPEG_CONFIG', 'smpeg-config', '0.4.3', ['smpeg']),
- Dependency('PNG', 'png.h', 'libpng', ['png']),
- Dependency('JPEG', 'jpeglib.h', 'libjpeg', ['jpeg']),
- Dependency('SCRAP', '', 'libX11', ['X11']),
- Dependency('PORTMIDI', 'portmidi.h', 'libportmidi.so', ['portmidi']),
- Dependency('PORTTIME', 'porttime.h', 'libporttime.so', ['porttime']),
-- FFMPEGDependency('AVFORMAT', 'libavformat/avformat.h', 'libavformat.a', ['avformat'], ['/include', '/include/ffmpeg']),
-- FFMPEGDependency('SWSCALE', 'libswscale/swscale.h', 'libswscale.a', ['swscale'], ['/include', '/include/ffmpeg']),
- DependencyProg('FREETYPE', 'FREETYPE_CONFIG', 'freetype-config', '2.0', ['freetype'], '--ftversion'),
- #Dependency('GFX', 'SDL_gfxPrimitives.h', 'libSDL_gfx.so', ['SDL_gfx']),
- ]
-diff --git a/config_win.py b/config_win.py
-index 9b8296e..804a636 100644
---- a/config_win.py
-+++ b/config_win.py
-@@ -215,17 +215,11 @@ DEPS.add('FONT', 'SDL_ttf', ['SDL_ttf-[2-9].*'], r'(lib){0,1}SDL_ttf\.dll$', ['S
- DEPS.add('IMAGE', 'SDL_image', ['SDL_image-[1-9].*'], r'(lib){0,1}SDL_image\.dll$',
- ['SDL', 'jpeg', 'png', 'tiff'], 0),
- DEPS.add('MIXER', 'SDL_mixer', ['SDL_mixer-[1-9].*'], r'(lib){0,1}SDL_mixer\.dll$',
-- ['SDL', 'vorbisfile', 'smpeg'])
--DEPS.add('SMPEG', 'smpeg', ['smpeg-[0-9].*', 'smpeg'], r'smpeg\.dll$', ['SDL'])
-+ ['SDL', 'vorbisfile'])
- DEPS.add('PNG', 'png', ['libpng-[1-9].*'], r'(png|libpng13)\.dll$', ['z'])
- DEPS.add('JPEG', 'jpeg', ['jpeg-[6-9]*'], r'(lib){0,1}jpeg\.dll$')
- DEPS.add('PORTMIDI', 'portmidi', ['portmidi'], r'portmidi\.dll$')
--#DEPS.add('FFMPEG', 'libavformat/avformat.h', 'libavformat.a', ['avformat', 'swscale', 'SDL_mixer'], r'avformat-52\.dll')
--dep = Dependency('FFMPEG', [r'avformat\.dll', r'swscale\.dll', r'SDL_mixer-[1-9].*'], ['avformat', 'swscale', 'SDL_mixer'], required=0)
--DEPS.dependencies.append(dep)
--DEPS.dlls.append(DependencyDLL(r'avformat\.dll', link=dep, libs=['avformat']))
--DEPS.dlls.append(DependencyDLL(r'swscale\.dll', link=dep, libs=['swscale']))
--DEPS.dlls.append(DependencyDLL(r'(lib){0,1}SDL_mixer\.dll$', link=dep, libs=['SDL', 'vorbisfile', 'smpeg']))
-+DEPS.dlls.append(DependencyDLL(r'(lib){0,1}SDL_mixer\.dll$', link=dep, libs=['SDL', 'vorbisfile']))
- #DEPS.add('PORTTIME', 'porttime', ['porttime'], r'porttime\.dll$')
- DEPS.add_dll(r'(lib){0,1}tiff\.dll$', 'tiff', ['tiff-[3-9].*'], ['jpeg', 'z'])
- DEPS.add_dll(r'(z|zlib1)\.dll$', 'z', ['zlib-[1-9].*'])
-diff --git a/configtest/test-smpeg-config b/configtest/test-smpeg-config
-deleted file mode 100644
-index e33ba47..0000000
---- a/configtest/test-smpeg-config
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#!/bin/sh
--ARGS="$@"
--if [ "$ARGS" = '--version --cflags --libs' ]; then
-- echo '0.4.5'
-- echo '-I./smpeg/include -DSMPEG_MACRO=1 -Wl,smpeg_xlinker'
-- echo '-L./smpeg/lib -lsmpeg'
--fi
-diff --git a/configtest/test_config_msys.py b/configtest/test_config_msys.py
-index 4f4bbc1..2c761d5 100644
---- a/configtest/test_config_msys.py
-+++ b/configtest/test_config_msys.py
-@@ -26,7 +26,6 @@ import unittest
- cwd = os.getcwd()
- m = msys.Msys(require_mingw=False)
- os.environ['SDL_CONFIG'] = m.windows_to_msys(os.path.join(cwd, 'test-sdl-config'))
--os.environ['SMPEG_CONFIG'] = m.windows_to_msys(os.path.join(cwd, 'test-smpeg-config'))
- dependencies = dict([(dep.name, dep) for dep in config_msys.main()])
- del m
-
-@@ -68,10 +67,6 @@ class RunConfigTestCase(unittest.TestCase):
- 'FONT': Dependency('FONT', 'include/sdl', 'lib'),
- 'IMAGE': Dependency('IMAGE', 'include/sdl', 'lib'),
- 'MIXER': Dependency('MIXER', 'include', 'lib'), # A deviant include dir
-- 'SMPEG': Dependency('SMPEG', 'include', 'lib',
-- cflags='-I./smpeg/include -DSMPEG_MACRO=1 '
-- '-Xlinker -Wl,smpeg_xlinker '
-- '-L./smpeg/lib -lsmpeg '), # uses test-smpeg-config script
- 'PNG': Dependency('PNG', 'include/libpng12', 'lib'),
- 'JPEG': Dependency('JPEG', 'include/sdl', 'lib'), # A deviant include dir
- 'SCRAP': Dependency(cflags='-luser32 -lgdi32'),
-@@ -79,7 +74,6 @@ class RunConfigTestCase(unittest.TestCase):
- 'COPYLIB_SDL_ttf': DependencyDLL('FONT', lib_dir_rel='bin/sdl_ttf.dll'), # Where DLLs likely are
- 'COPYLIB_SDL_image': DependencyDLL('IMAGE', lib_dir_rel='bin/sdl_image.dll'),
- 'COPYLIB_SDL_mixer': DependencyDLL('MIXER', lib_dir_rel='lib/sdl_mixer.dll'), # Where the search starts
-- 'COPYLIB_smpeg': DependencyDLL('SMPEG', lib_dir_rel='bin/smpeg.dll'),
- 'COPYLIB_tiff': DependencyDLL('TIFF', lib_dir_rel='bin/libtiff.dll'),
- 'COPYLIB_png12': DependencyDLL('PNG', lib_dir_rel='bin/libpng12-0.dll'),
- 'COPYLIB_jpeg': DependencyDLL('JPEG', lib_dir_rel='bin/jpeg.dll'),
-diff --git a/configtest/test_config_win.py b/configtest/test_config_win.py
-index 9b4c276..c663b1f 100644
---- a/configtest/test_config_win.py
-+++ b/configtest/test_config_win.py
-@@ -50,7 +50,6 @@ class RunConfigTestCase(unittest.TestCase):
- 'FONT': Dependency('SDL_ttf', 'sdl_ttf-2.0.9', 'sdl_ttf-2.0.9/release'),
- 'IMAGE': Dependency('SDL_image', 'sdl_image-1.2.6', 'sdl_image-1.2.6/visualc/release'),
- 'MIXER': Dependency('SDL_mixer','sdl_mixer-1.2', 'sdl_mixer-1.2/release'),
-- 'SMPEG': Dependency('smpeg', 'smpeg', 'smpeg/release'),
- 'PNG': Dependency('png', 'libpng-1.2.32', 'libpng-1.2.32/lib'),
- 'JPEG': Dependency('jpeg', 'jpeg-6b', 'jpeg-6b/release'),
- 'SCRAP': Dependency(cflags=' -luser32 -lgdi32'),
-@@ -59,9 +58,8 @@ class RunConfigTestCase(unittest.TestCase):
- lib_dir_rel='sdl_ttf-2.0.9/release/sdl_ttf.dll'),
- 'COPYLIB_SDL_image': Dependency(libs=['SDL', 'png', 'jpeg', 'tiff'],
- lib_dir_rel='sdl_image-1.2.6/visualc/release/sdl_image.dll'),
-- 'COPYLIB_SDL_mixer': Dependency(libs=['SDL', 'vorbisfile', 'smpeg'],
-+ 'COPYLIB_SDL_mixer': Dependency(libs=['SDL', 'vorbisfile'],
- lib_dir_rel='sdl_mixer-1.2/release/sdl_mixer.dll'),
-- 'COPYLIB_smpeg': Dependency(libs=['SDL'], lib_dir_rel='smpeg/release/smpeg.dll'),
- 'COPYLIB_tiff': Dependency(libs=['jpeg', 'z'], lib_dir_rel='tiff-3.8.2/release/libtiff.dll'),
- 'COPYLIB_png': Dependency(libs=['z'], lib_dir_rel='libpng-1.2.32/lib/libpng13.dll'),
- 'COPYLIB_jpeg': Dependency(lib_dir_rel='jpeg-6b/release/jpeg.dll'),
-diff --git a/configtest/test_dll.py b/configtest/test_dll.py
-index 4b03aab..afe6470 100644
---- a/configtest/test_dll.py
-+++ b/configtest/test_dll.py
-@@ -17,7 +17,6 @@ class MatchTestCase(unittest.TestCase):
- ('MIXER', ['SDL_mixer.dll', 'sdl_MIXER.DLL', 'libsdl_mixer.dll'], ['sdl_mixer.dll.a']),
- ('IMAGE', ['SDL_image.dll', 'sdl_IMAGE.DLL', 'libsdl_image.dll'], ['sdl_image.dll.a']),
- ('FONT', ['SDL_ttf.dll', 'sdl_TTF.DLL', 'libsdl_ttf.dll'], ['sdl_ttf.dll.a']),
-- ('SMPEG', ['smpeg.dll', 'SMPEG.DLL', 'libsmpeg.dll'], ['smpeg.dll.a']),
- ('TIFF', ['tiff.dll', 'TIFF.DLL', 'libtiff.dll'], ['tiff.dll.a']),
- ('JPEG', ['jpeg.dll', 'JPEG.DLL', 'libjpeg.dll'], ['jpeg.dll.a']),
- ('PNG', ['libpng13.dll', 'LIBPNG13.DLL', 'libpng12.dll', 'png12.dll', 'png13.dll', 'libpng12-0.dll'],
-diff --git a/dll.py b/dll.py
-index 5c3c6e2..f076641 100644
---- a/dll.py
-+++ b/dll.py
-@@ -17,12 +17,11 @@ import re
- # name, root, File regex, Dependency list of names
- libraries = [
- ('MIXER', 'SDL_mixer', r'SDL_mixer\.dll$',
-- ['SDL', 'VORBISFILE', 'SMPEG']),
-+ ['SDL', 'VORBISFILE']),
- ('VORBISFILE', 'vorbisfile', r'libvorbisfile-3\.dll$',
- ['VORBIS']),
- ('VORBIS', 'vorbis', r'libvorbis-0\.dll$', ['OGG']),
- ('OGG', 'ogg', r'libogg-0\.dll$', []),
-- ('SMPEG', 'smpeg', r'smpeg\.dll$', ['SDL']),
- ('IMAGE', 'SDL_image', r'SDL_image\.dll$',
- ['SDL', 'JPEG', 'PNG', 'TIFF']),
- ('TIFF', 'tiff', r'libtiff-3\.dll$', ['JPEG', 'Z']),
diff --git a/debian/patches/0004-Run-the-subprocess-test_runner-by-module-name.patch b/debian/patches/0004-Run-the-subprocess-test_runner-by-module-name.patch
deleted file mode 100644
index eccad71..0000000
--- a/debian/patches/0004-Run-the-subprocess-test_runner-by-module-name.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0594e5dd1a4a0e0be074778e6c1a728235889815 Mon Sep 17 00:00:00 2001
-From: Stefano Rivera <stefanor at debian.org>
-Date: Sat, 5 Mar 2016 21:23:27 -0500
-Subject: Run the subprocess test_runner by module name
-
-This avoids an obscure failure, where numpy fails to import, because it
-imports our embedded unittest, that doesn't have SkipTest. The embedded
-unittest is imported because test_utils is on sys.path, from running a
-python file in that directory.
-
-Forwarded: https://bitbucket.org/pygame/pygame/pull-requests/55/run-the-subprocess-test_runner-by-module/diff
----
- test/test_utils/run_tests.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/test/test_utils/run_tests.py b/test/test_utils/run_tests.py
-index 1674e4f..3e345d1 100644
---- a/test/test_utils/run_tests.py
-+++ b/test/test_utils/run_tests.py
-@@ -131,7 +131,6 @@ def run(*args, **kwds):
- option_exclude += ('python3_ignore',)
-
- main_dir, test_subdir, fake_test_subdir = prepare_test_env()
-- test_runner_py = os.path.join(test_subdir, "test_utils", "test_runner.py")
- cur_working_dir = os.path.abspath(os.getcwd())
-
- ###########################################################################
-@@ -249,7 +248,8 @@ def run(*args, **kwds):
- def sub_test(module):
- print ('loading %s' % module)
-
-- cmd = [option_python, test_runner_py, module ] + pass_on_args
-+ cmd = [option_python, '-m', 'test.test_utils.test_runner',
-+ module] + pass_on_args
-
- return (module,
- (cmd, test_env, working_dir),
diff --git a/debian/patches/0005-python3.5-support.patch b/debian/patches/0005-python3.5-support.patch
deleted file mode 100644
index a8c4694..0000000
--- a/debian/patches/0005-python3.5-support.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 16af24021f1f86531ac2d6edfd90f4a7f4ed060d Mon Sep 17 00:00:00 2001
-From: Stefano Rivera <stefanor at debian.org>
-Date: Sat, 5 Mar 2016 22:17:19 -0500
-Subject: python3.5 support
-
-subprocess.mswindows was removed in python 3.5. The platform module
-is the canonical source for this kind of information.
-
-Forwarded: https://bitbucket.org/pygame/pygame/pull-requests/54/allow-running-tests-on-python-35/diff
----
- test/test_utils/async_sub.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/test/test_utils/async_sub.py b/test/test_utils/async_sub.py
-index c66ab89..e43d4b9 100644
---- a/test/test_utils/async_sub.py
-+++ b/test/test_utils/async_sub.py
-@@ -8,6 +8,7 @@ Modification of http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/440554
- #################################### IMPORTS ###################################
-
- import os
-+import platform
- import subprocess
- import errno
- import time
-@@ -23,7 +24,7 @@ if sys.version_info >= (3,):
- else:
- null_byte = '\x00'
-
--if subprocess.mswindows:
-+if platform.system() == 'Windows':
- if sys.version_info >= (3,):
- # Test date should be in ascii.
- def encode(s):
-@@ -134,7 +135,7 @@ class Popen(subprocess.Popen):
- getattr(self, which).close()
- setattr(self, which, None)
-
-- if subprocess.mswindows:
-+ if platform.system() == 'Windows':
- def kill(self):
- # Recipes
- #http://me.in-berlin.de/doc/python/faq/windows.html#how-do-i-emulate-os-kill-in-windows
diff --git a/debian/patches/MMX.diff b/debian/patches/MMX.diff
index 7d53789..bc90fab 100644
--- a/debian/patches/MMX.diff
+++ b/debian/patches/MMX.diff
@@ -12,11 +12,9 @@ Patch-Name: MMX.diff
Setup.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/Setup.in b/Setup.in
-index 93711ce..8a72fd4 100644
--- a/Setup.in
+++ b/Setup.in
-@@ -64,7 +64,7 @@ joystick src/joystick.c $(SDL) $(DEBUG)
+@@ -61,7 +61,7 @@ joystick src/joystick.c $(SDL) $(DEBUG)
draw src/draw.c $(SDL) $(DEBUG)
image src/image.c $(SDL) $(DEBUG)
overlay src/overlay.c $(SDL) $(DEBUG)
diff --git a/debian/patches/series b/debian/patches/series
index 89b6c76..2b833d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
MMX.diff
setup_ignore_portmidi_on_non_linux.diff
-0003-Drop-ffmpeg-dependencies-pygame-no-longer-has-movie-.patch
-0004-Run-the-subprocess-test_runner-by-module-name.patch
-0005-python3.5-support.patch
diff --git a/debian/patches/setup_ignore_portmidi_on_non_linux.diff b/debian/patches/setup_ignore_portmidi_on_non_linux.diff
index cbc74f2..5b56c60 100644
--- a/debian/patches/setup_ignore_portmidi_on_non_linux.diff
+++ b/debian/patches/setup_ignore_portmidi_on_non_linux.diff
@@ -11,11 +11,9 @@ Patch-Name: setup_ignore_portmidi_on_non_linux.diff
config_unix.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
-diff --git a/config_unix.py b/config_unix.py
-index 55802b3..1b2be6a 100644
--- a/config_unix.py
+++ b/config_unix.py
-@@ -219,7 +219,11 @@ def main():
+@@ -208,7 +208,11 @@ def main():
for d in DEPS[1:]:
if not d.found:
diff --git a/debian/rules b/debian/rules
index 14054ac..92f391c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,9 +18,6 @@ export DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | \
sed -rne 's,^Version: ([^+]+).*,\1,p')
-HG_REPO ?= https://bitbucket.org/pygame/pygame
-HG_SNAPSHOT_REV=3449
-
# We include all the documentation except:
# util (which is for building the docs from the source)
# fullinstall.txt (which is installation instructions)
@@ -47,30 +44,3 @@ override_dh_installdocs:
override_dh_installchangelogs:
dh_installchangelogs -a WHATSNEW
-
-get-orig-source:
- # Remove existing pygame directory and tarball, if existing
- rm -rf pygame-$(DEB_UPSTREAM_VERSION)
- rm -f pygame_$(DEB_UPSTREAM_VERSION)+dfsg.orig.tar.gz
- # Fetch latest upstream tarball
- uscan --noconf --force-download --download-current-version \
- --destdir=.
- # Unpack and remove tarball
- tar -xzf pygame-$(DEB_UPSTREAM_VERSION).tar.gz
- rm -f pygame-$(DEB_UPSTREAM_VERSION).tar.gz
- # Remove embedded freesansbold.ttf copy; it comes without the FontForge
- # source file (.sfd), so it's technically a GPL violation
- rm -f pygame-$(DEB_UPSTREAM_VERSION)/lib/freesansbold.ttf
- # Repack tarball
- tar -czf pygame_$(DEB_UPSTREAM_VERSION)+dfsg.orig.tar.gz pygame-\
- $(DEB_UPSTREAM_VERSION)/
-
-get-orig-source-hg:
- @echo "You can build this from a local repo by supplying the HG_REPO variable"
- # Requires mercurial
- hg clone -r$(HG_SNAPSHOT_REV) $(HG_REPO)
- # Remove unwanted cruft
- rm -rf pygame/.hg pygame/.hgtags pygame/.hgignore pygame/obj
- # Repack tarball
- tar -cJf pygame_1.9.2~pre~r$(HG_SNAPSHOT_REV).orig.tar.xz pygame
- rm -rf pygame
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pygame.git
More information about the Python-modules-commits
mailing list