r24580 - in /packages/unstable/meld/debian: changelog patches/python-path.patch patches/sourceview-package.patch

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

Author: rbalint-guest
Date: Thu Jun 24 22:45:56 2010
New Revision: 24580

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

  * New upstream release (Closes: #562989)
    - Updates to VC support, including lots of git fixes (Closes: #584554)
    - Plenty of miscellaneous bug fixes (Closes: #567340)
    - Translation updates (Thanks to Holger Wansing) (Closes: #313985)


Modified:
    packages/unstable/meld/debian/changelog
    packages/unstable/meld/debian/patches/python-path.patch
    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=24580&op=diff
==============================================================================
--- packages/unstable/meld/debian/changelog [utf-8] (original)
+++ packages/unstable/meld/debian/changelog [utf-8] Thu Jun 24 22:45:56 2010
@@ -1,13 +1,12 @@
-meld (1.3.1-2) UNRELEASED; urgency=low
-
-  [ Balint Reczey ]
+meld (1.3.2-1) unstable; urgency=low
+
+  * New upstream release (Closes: #562989)
+    - Updates to VC support, including lots of git fixes (Closes: #584554)
+    - Plenty of miscellaneous bug fixes (Closes: #567340)
+    - Translation updates (Thanks to Holger Wansing) (Closes: #313985)
   * run meld using /usr/bin/python instead of env python (Closes: #551189)
 
-  [ Josselin Mouette ]
-  * vcs-crash.patch: stolen upstream. Fix a crash when using CVS, svn or 
-    git. Closes: #584554.
-
- -- Balint Reczey <balint at balintreczey.hu>  Wed, 26 May 2010 21:35:34 +0200
+ -- Balint Reczey <balint at balintreczey.hu>  Thu, 24 Jun 2010 23:54:27 +0200
 
 meld (1.3.1-1) unstable; urgency=low
 

Modified: packages/unstable/meld/debian/patches/python-path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/patches/python-path.patch?rev=24580&op=diff
==============================================================================
--- packages/unstable/meld/debian/patches/python-path.patch [utf-8] (original)
+++ packages/unstable/meld/debian/patches/python-path.patch [utf-8] Thu Jun 24 22:45:56 2010
@@ -1,7 +1,7 @@
-Index: meld-1.3.1/meld
+Index: a/bin/meld
 ===================================================================
---- meld-1.3.1.orig/meld	2010-05-26 21:32:57.000000000 +0200
-+++ meld-1.3.1/meld	2010-05-26 21:33:06.000000000 +0200
+--- a/bin/meld	2010-05-26 21:32:57.000000000 +0200
++++ b/bin/meld	2010-05-26 21:33:06.000000000 +0200
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#!/usr/bin/python

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=24580&op=diff
==============================================================================
--- packages/unstable/meld/debian/patches/sourceview-package.patch [utf-8] (original)
+++ packages/unstable/meld/debian/patches/sourceview-package.patch [utf-8] Thu Jun 24 22:45:56 2010
@@ -1,7 +1,7 @@
-=== modified file 'meldapp.py'
---- a/meldapp.py
-+++ b/meldapp.py
-@@ -216,7 +216,7 @@
+=== 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):