r20223 - in /packages/unstable/meld/debian: changelog control patches/makefile.diff patches/sourceview-package.patch

[ross at users.alioth.debian.org]

Author: ross
Date: Tue Jun  2 09:28:29 2009
New Revision: 20223

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20223
Log:
New upstream meld 1.3

Removed:
    packages/unstable/meld/debian/patches/makefile.diff
Modified:
    packages/unstable/meld/debian/changelog
    packages/unstable/meld/debian/control
    packages/unstable/meld/debian/patches/sourceview-package.patch

Modified: packages/unstable/meld/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/changelog?rev=20223&op=diff
==============================================================================
--- packages/unstable/meld/debian/changelog (original)
+++ packages/unstable/meld/debian/changelog Tue Jun  2 09:28:29 2009
@@ -1,3 +1,17 @@
+meld (1.3.0-1) unstable; urgency=low
+
+  * New upstream release (Closes: #528327)
+    - Copy/paste behaviour fixes (Closes: #523576)
+    - Dotfiles and removals handled in darcs (Closes: #509069)
+    - Can handle Mercurial repos (Closes: #428843)
+    - Up/Down patch used to skip changes (Closes: #511027)
+    - Handle last line when highlighting properly (Closes: #465804)
+  * Update message and depends for new python-gtksourceview2 package
+  * Resync makefile.patch
+  * Remove python-gnome dependency
+
+ -- Ross Burton <ross at debian.org>  Tue, 02 Jun 2009 10:00:20 +0100
+
 meld (1.2.1-1) unstable; urgency=low
 
   * New upstream release (Closes: #513609, #500629, #473091, #456530, #473487)

Modified: packages/unstable/meld/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/control?rev=20223&op=diff
==============================================================================
--- packages/unstable/meld/debian/control (original)
+++ packages/unstable/meld/debian/control Tue Jun  2 09:28:29 2009
@@ -18,9 +18,8 @@
 Depends: ${python:Depends},
          ${misc:Depends},
          python-gtk2 (>= 2.4),
-         python-glade2 (>= 2.4),
-         python-gnome2
-Recommends: python-gnome2-desktop, yelp
+         python-glade2 (>= 2.4)
+Recommends: python-gtksourceview2, yelp
 XB-Python-Version: ${python:Versions}
 Description: graphical tool to diff and merge files
  Meld is a tool which allows the user to see the changes in, and merge between,

Modified: packages/unstable/meld/debian/patches/sourceview-package.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/patches/sourceview-package.patch?rev=20223&op=diff
==============================================================================
--- packages/unstable/meld/debian/patches/sourceview-package.patch (original)
+++ packages/unstable/meld/debian/patches/sourceview-package.patch Tue Jun  2 09:28:29 2009
@@ -1,8 +1,13 @@
---- meldapp.py.orig	2007-09-04 09:51:21.000000000 +0100
-+++ meldapp.py	2007-09-04 09:51:22.000000000 +0100
-@@ -295 +295 @@
--            misc.run_dialog(_("Line numbers are only available if you have gnome-python-desktop installed.") )
-+            misc.run_dialog(_("Line numbers are only available if you have the python-gnome2-desktop package installed.") )
-@@ -299 +299 @@
--            misc.run_dialog(_("Syntax highlighting is only available if you have gnome-python-desktop installed.") )
-+            misc.run_dialog(_("Syntax highlighting is only available if you have python-gnome2-desktop installed.") )
+=== modified file 'meldapp.py'
+--- meldapp.py	2009-06-02 09:05:19 +0000
++++ meldapp.py	2009-06-02 09:07:06 +0000
+@@ -218,7 +218,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)
+