r26103 - in /packages/experimental/meld/debian: changelog patches/sourceview-package.patch

[rbalint-guest at users.alioth.debian.org]

Author: rbalint-guest
Date: Thu Dec 30 15:10:58 2010
New Revision: 26103

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26103
Log:
meld (1.5.0-1) experimental; urgency=low

  * New upstream release
    - Use TextBuffer instead of maintaining duplicate copy of text
      (Closes: #602988)
    - Use Subversion's XML status output (Closes: #545359)
    - Use bzr 'short' status for more robust parsing (Closes: #565253)

Modified:
    packages/experimental/meld/debian/changelog
    packages/experimental/meld/debian/patches/sourceview-package.patch

Modified: packages/experimental/meld/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/meld/debian/changelog?rev=26103&op=diff
==============================================================================
--- packages/experimental/meld/debian/changelog [utf-8] (original)
+++ packages/experimental/meld/debian/changelog [utf-8] Thu Dec 30 15:10:58 2010
@@ -1,3 +1,13 @@
+meld (1.5.0-1) experimental; urgency=low
+
+  * New upstream release
+    - Use TextBuffer instead of maintaining duplicate copy of text
+      (Closes: #602988)
+    - Use Subversion's XML status output (Closes: #545359)
+    - Use bzr 'short' status for more robust parsing (Closes: #565253)
+
+ -- Balint Reczey <balint at balintreczey.hu>  Thu, 30 Dec 2010 15:11:35 +0100
+
 meld (1.4.0-1) experimental; urgency=low
 
   * New upstream release

Modified: packages/experimental/meld/debian/patches/sourceview-package.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/meld/debian/patches/sourceview-package.patch?rev=26103&op=diff
==============================================================================
--- packages/experimental/meld/debian/patches/sourceview-package.patch [utf-8] (original)
+++ packages/experimental/meld/debian/patches/sourceview-package.patch [utf-8] Thu Dec 30 15:10:58 2010
@@ -1,12 +1,12 @@
 === modified file 'preferences.py'
 --- a/meld/preferences.py
 +++ b/meld/preferences.py
-@@ -143,7 +143,7 @@
-             self.checkbutton_show_line_numbers.set_sensitive(False)
-             self.checkbutton_use_syntax_highlighting.set_sensitive(False)
-             if gtk.pygtk_version >= (2, 12, 0):
--                no_sourceview_text = _("Only available if you have gnome-python-desktop installed")
-+                no_sourceview_text = _("Only available if you have python-gtksourceview2 installed")
-                 self.checkbutton_spaces_instead_of_tabs.set_tooltip_text(no_sourceview_text)
-                 self.checkbutton_show_line_numbers.set_tooltip_text(no_sourceview_text)
-                 self.checkbutton_use_syntax_highlighting.set_tooltip_text(no_sourceview_text)
+@@ -139,7 +139,7 @@
+             self.checkbutton_use_syntax_highlighting.set_active( self.prefs.use_syntax_highlighting )
+         else:
+             no_sourceview_text = \
+-                _("Only available if you have gnome-python-desktop installed")
++                _("Only available if you have python-gtksourceview2 installed")
+             for w in (self.checkbutton_spaces_instead_of_tabs,
+                       self.checkbutton_show_line_numbers,
+                       self.checkbutton_use_syntax_highlighting,