[playonlinux] 139/230: Refresh patches/x-terminal-emulator.diff; add TRANSLATORS to dh_installdocs

[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 bba0d5b662eee5a5dafac63107148f776c290c93
Author: Bertrand Marc <beberking at gmail.com>
Date:   Wed Nov 23 22:14:58 2011 +0000

    Refresh patches/x-terminal-emulator.diff; add TRANSLATORS to dh_installdocs
---
 debian/changelog                        |  8 ++++++++
 debian/patches/x-terminal-emulator.diff | 11 -----------
 debian/rules                            |  2 +-
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6dc97c7..338ef69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+playonlinux (4.0.14-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add the new TRANSLATORS file to debian/playonlinux.docs.
+  * Refresh patches/x-terminal-emulator.diff.
+
+ -- Bertrand Marc <beberking at gmail.com>  Wed, 23 Nov 2011 15:13:20 +0100
+
 playonlinux (4.0.12-1) unstable; urgency=low
 
   * New upstream release (Closes: #639558).
diff --git a/debian/patches/x-terminal-emulator.diff b/debian/patches/x-terminal-emulator.diff
index 1161937..bc55540 100644
--- a/debian/patches/x-terminal-emulator.diff
+++ b/debian/patches/x-terminal-emulator.diff
@@ -24,17 +24,6 @@
  
  ### Desktop
  [ "$(which xdg-user-dir)" ] && export DESKTOP="$(xdg-user-dir DESKTOP)" || export DESKTOP="$HOME/Desktop"
---- a/python/options.py
-+++ b/python/options.py
-@@ -113,7 +113,7 @@
- 		if(os.path.exists(Variables.playonlinux_rep+"/configurations/options/terminal")):
- 			default_terminal = open(Variables.playonlinux_rep+"/configurations/options/terminal","r").read()
- 		else:
--			default_terminal = "xterm"
-+			default_terminal = "Default"
- 		self.Term = wx.ComboBox(self.panelGeneral, -1, value=default_terminal, choices=os.listdir(Variables.playonlinux_env+"/bash/terminals"), pos=(20,120),style=wx.CB_READONLY)
- 		self.buttonTestT = wx.Button(self.panelGeneral, 111, _("Test"), pos=(230,120), size=(80,27))
- 
 --- a/bash/expert/PolShell
 +++ b/bash/expert/PolShell
 @@ -24,4 +24,4 @@
diff --git a/debian/rules b/debian/rules
index b48a7f5..30438c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ binary-indep: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs CHANGELOG
-	dh_installdocs
+	dh_installdocs TRANSLATORS
 	dh_install
 	dh_installmenu
 	dh_python2

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