[playonlinux] 167/230: Debian patches were included upstream, we just need to set DEBIAN_PACKAGE to TRUE.

[Bertrand Marc]

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

bmarc pushed a commit to branch master
in repository playonlinux.

commit 75cb2abcb8b20e3abdf5ba5b9058d707715a5499
Author: Bertrand Marc <beberking at gmail.com>
Date:   Wed May 8 09:05:35 2013 +0000

    Debian patches were included upstream, we just need to set DEBIAN_PACKAGE to TRUE.
---
 debian/patches/remove_binary_plugin.diff | 12 ++++++------
 debian/patches/series                    |  5 +----
 debian/patches/set_debian_env.diff       | 11 +++++++++++
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/debian/patches/remove_binary_plugin.diff b/debian/patches/remove_binary_plugin.diff
index 4bd44d6..c49f6da 100644
--- a/debian/patches/remove_binary_plugin.diff
+++ b/debian/patches/remove_binary_plugin.diff
@@ -1,12 +1,12 @@
 --- a/plugins/plugins.lst
 +++ b/plugins/plugins.lst
-@@ -25,9 +25,6 @@
- #Offline PlayOnLinux
- offlineplayonlinux;OfflinePlayOnLinux_0.6.pol;Offline PlayOnLinux;disable;0.6;5;1;0
+@@ -21,9 +21,6 @@
  
--#Capture
+ ## in fact empty line is also ignored because it's more easy to read =)
+ 
+-##Capture
 -capture;Capture_2.4.3.pol;Capture;enable;2.4.3;11;1;0
 -
- #Transgaming Cedega
- cedega;TransgamingCedega_0.3.pol;Transgaming Cedega;disable;0.3;1;1;0
+ ##Screencap
+ screencap;ScreenCap_0.0.4.pol;ScreenCap;enable;0.0.4;1;1;1
  
diff --git a/debian/patches/series b/debian/patches/series
index 7adde80..555f3e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
-locale.diff
-x-terminal-emulator.diff
-mscorefonts.diff
-disable_update_alert.diff
+set_debian_env.diff
 remove_binary_plugin.diff
diff --git a/debian/patches/set_debian_env.diff b/debian/patches/set_debian_env.diff
new file mode 100644
index 0000000..b964232
--- /dev/null
+++ b/debian/patches/set_debian_env.diff
@@ -0,0 +1,11 @@
+--- a/python/lib/Variables.py
++++ b/python/lib/Variables.py
+@@ -25,7 +25,7 @@
+ # Debian packagers should switch this to TRUE
+ # It will disable update alerts, bug reports, statistics
+ # It will set the good locale directory, and it will use the good msttcorefonts
+-os.environ["DEBIAN_PACKAGE"] = "FALSE"
++os.environ["DEBIAN_PACKAGE"] = "TRUE"
+ 
+ # Variables PlayOnMac
+ if (os.environ["POL_OS"] == "Mac"):

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