diff options
author | James Meyer <james.meyer@operamail.com> | 2012-09-23 19:14:54 (GMT) |
---|---|---|
committer | James Meyer <james.meyer@operamail.com> | 2012-09-23 19:14:54 (GMT) |
commit | c96cd6fab2342335a4f64b7eb2c843cd576eb610 (patch) | |
tree | 551793d94c47f1e4d88ed5309d5224435762bf1e /abs/extra/pyxis/python2.patch | |
parent | 048e83695f2b4cb9ddc118e128a7d08f7d48e651 (diff) | |
parent | cafd1e5f46d61c3175d4a3347c65ae79c476c61a (diff) | |
download | linhes_pkgbuild-c96cd6fab2342335a4f64b7eb2c843cd576eb610.zip linhes_pkgbuild-c96cd6fab2342335a4f64b7eb2c843cd576eb610.tar.gz linhes_pkgbuild-c96cd6fab2342335a4f64b7eb2c843cd576eb610.tar.bz2 |
Merge remote-tracking branch 'origin/testing' into testing
# By Cecil (6) and Britney Fransen (2)
# Via Britney Fransen (1) and Cecil (1)
* origin/testing:
LinHES-system: myth_status.py: fix conflicted recordings
mythtv: bump to latest fixes to get python bindings fix
pyxis:Initial inclusion. Needed for pyxis to close #63/4).
python-distribute:Needed for python-beautifulsoup (to close #63/4).
python-beautifulsoup4:Needed for pyxis (to close #63/4).
python-libconcord:Moved to core with rest of python modules.
gdb:Recompile against Python 2.6. Closes 850.
mythappletrailers:Closes 849. Adds Play All, Shuffle and Play Random trailer to the menu.
Conflicts were set to 64 bit versions, except for appletrailers
Conflicts:
abs/core/LinHES-system/PKGBUILD
abs/core/gdb/PKGBUILD
abs/core/gdb/__changelog
abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
abs/core/python_modules/python-distribute/PKGBUILD
abs/core/python_modules/python-distribute/__changelog
abs/extra/mythappletrailers/PKGBUILD
Diffstat (limited to 'abs/extra/pyxis/python2.patch')
-rw-r--r-- | abs/extra/pyxis/python2.patch | 90 |
1 files changed, 90 insertions, 0 deletions
diff --git a/abs/extra/pyxis/python2.patch b/abs/extra/pyxis/python2.patch new file mode 100644 index 0000000..e53cf99 --- /dev/null +++ b/abs/extra/pyxis/python2.patch @@ -0,0 +1,90 @@ +diff --git bin/pyxis bin/pyxis +index 9b447fb..0350278 100755 +--- bin/pyxis ++++ bin/pyxis +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + #Pyxis and Original Sipie: Sirius Command Line Player + #Copyright (C) Corey Ling, Eli Criffield + # +diff --git pyxis/Config.py pyxis/Config.py +index d4d6d29..a36778e 100644 +--- pyxis/Config.py ++++ pyxis/Config.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + #Pyxis and Original Sipie: Sirius Command Line Player + #Copyright (C) Corey Ling, Eli Criffield + # +diff --git pyxis/Debug.py pyxis/Debug.py +index d4af851..bf1bd6e 100644 +--- pyxis/Debug.py ++++ pyxis/Debug.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + #Pyxis + #Copyright (C) Corey Ling + # +diff --git pyxis/Exceptions.py pyxis/Exceptions.py +index a1b5f8d..0270a02 100644 +--- pyxis/Exceptions.py ++++ pyxis/Exceptions.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + #Pyxis and Original Sipie: Sirius Command Line Player + #Copyright (C) Corey Ling, Eli Criffield + # +diff --git pyxis/Interface.py pyxis/Interface.py +index 3c60a7c..1b0c05c 100644 +--- pyxis/Interface.py ++++ pyxis/Interface.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + #Pyxis and Original Sipie: Sirius Command Line Player + #Copyright (C) Corey Ling, Eli Criffield + # +diff --git pyxis/Player.py pyxis/Player.py +index 8e945ba..c467acd 100644 +--- pyxis/Player.py ++++ pyxis/Player.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + #Pyxis and Original Sipie: Sirius Command Line Player + #Copyright (C) Corey Ling, Eli Criffield + # +diff --git pyxis/ProviderCanada.py pyxis/ProviderCanada.py +index 4d84952..9ff2aa6 100644 +--- pyxis/ProviderCanada.py ++++ pyxis/ProviderCanada.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + #Pyxis and Original Sipie: Sirius Command Line Player + #Copyright (C) Corey Ling, Eli Criffield + # +diff --git pyxis/ProviderUSA.py pyxis/ProviderUSA.py +index 7c30eaf..b1fb950 100644 +--- pyxis/ProviderUSA.py ++++ pyxis/ProviderUSA.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + #Pyxis and Original Sipie: Sirius Command Line Player + #Copyright (C) Corey Ling, Eli Criffield + # +diff --git pyxis/Sirius.py pyxis/Sirius.py +index 30a25d6..75f1fb6 100644 +--- pyxis/Sirius.py ++++ pyxis/Sirius.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + #Pyxis and Original Sipie: Sirius Command Line Player + #Copyright (C) Corey Ling, Eli Criffield + # |