r23508 - in /desktop/unstable/alacarte/debian: changelog patches/03-bind_textdomain_codeset.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Apr  3 11:09:21 2010
New Revision: 23508

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23508
Log:
03-bind_textdomain_codeset.patch: updated to apply again.

Modified:
    desktop/unstable/alacarte/debian/changelog
    desktop/unstable/alacarte/debian/patches/03-bind_textdomain_codeset.patch

Modified: desktop/unstable/alacarte/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/alacarte/debian/changelog?rev=23508&op=diff
==============================================================================
--- desktop/unstable/alacarte/debian/changelog [utf-8] (original)
+++ desktop/unstable/alacarte/debian/changelog [utf-8] Sat Apr  3 11:09:21 2010
@@ -2,6 +2,7 @@
 
   * Stop recommending gnome-panel. Closes: #574003.
   * New upstream release.
+  * 03-bind_textdomain_codeset.patch: updated to apply again.
 
  -- Josselin Mouette <joss at debian.org>  Sat, 03 Apr 2010 12:56:08 +0200
 

Modified: desktop/unstable/alacarte/debian/patches/03-bind_textdomain_codeset.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/alacarte/debian/patches/03-bind_textdomain_codeset.patch?rev=23508&op=diff
==============================================================================
--- desktop/unstable/alacarte/debian/patches/03-bind_textdomain_codeset.patch [utf-8] (original)
+++ desktop/unstable/alacarte/debian/patches/03-bind_textdomain_codeset.patch [utf-8] Sat Apr  3 11:09:21 2010
@@ -1,8 +1,9 @@
 Debian #552528
 
-diff -Nur -x '*.orig' -x '*~' alacarte-0.12.4/Alacarte/MainWindow.py alacarte-0.12.4.new/Alacarte/MainWindow.py
---- alacarte-0.12.4/Alacarte/MainWindow.py	2009-09-08 07:24:13.000000000 -0700
-+++ alacarte-0.12.4.new/Alacarte/MainWindow.py	2009-11-10 04:58:47.000000000 -0800
+Index: alacarte-0.13.1/Alacarte/MainWindow.py
+===================================================================
+--- alacarte-0.13.1.orig/Alacarte/MainWindow.py	2010-04-03 13:03:35.000000000 +0200
++++ alacarte-0.13.1/Alacarte/MainWindow.py	2010-04-03 13:08:50.767468334 +0200
 @@ -18,13 +18,14 @@
  
  import gtk, gmenu, gobject, gio
@@ -13,10 +14,8 @@
  import urllib
  try:
  	from Alacarte import config
--	gettext.bindtextdomain(GETTEXT_PACKAGE,config.localedir)
--	gettext.textdomain(GETTEXT_PACKAGE)
-+	gettext.bindtextdomain(config.GETTEXT_PACKAGE,config.localedir)
-+	gettext.textdomain(config.GETTEXT_PACKAGE)
+ 	gettext.bindtextdomain(config.GETTEXT_PACKAGE,config.localedir)
+ 	gettext.textdomain(config.GETTEXT_PACKAGE)
 +	locale.bind_textdomain_codeset(config.GETTEXT_PACKAGE,'UTF-8')
  except:
  	pass