r26477 - in /packages/unstable/meld: ./ debian/changelog debian/patches/fix-chinese-translation.patch debian/patches/series

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

Author: rbalint-guest
Date: Mon Feb  7 12:07:25 2011
New Revision: 26477

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26477
Log:
Merge version released in experimental to unstable

Removed:
    packages/unstable/meld/debian/patches/fix-chinese-translation.patch
Modified:
    packages/unstable/meld/   (props changed)
    packages/unstable/meld/debian/changelog
    packages/unstable/meld/debian/patches/series

Propchange: packages/unstable/meld/
------------------------------------------------------------------------------
    svn:mergeinfo = /packages/experimental/meld:25318

Modified: packages/unstable/meld/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/changelog?rev=26477&op=diff
==============================================================================
--- packages/unstable/meld/debian/changelog [utf-8] (original)
+++ packages/unstable/meld/debian/changelog [utf-8] Mon Feb  7 12:07:25 2011
@@ -1,3 +1,10 @@
+meld (1.4.0-1) experimental; urgency=low
+
+  * New upstream release
+  * Drop fix-chinese-translation.patch as it has been integrated upstream
+
+ -- Balint Reczey <balint at balintreczey.hu>  Tue, 28 Sep 2010 14:29:19 +0200
+
 meld (1.3.2-2) unstable; urgency=low
 
   [ Balint Reczey ]

Modified: packages/unstable/meld/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/patches/series?rev=26477&op=diff
==============================================================================
--- packages/unstable/meld/debian/patches/series [utf-8] (original)
+++ packages/unstable/meld/debian/patches/series [utf-8] Mon Feb  7 12:07:25 2011
@@ -1,3 +1,2 @@
 sourceview-package.patch
 python-path.patch
-fix-chinese-translation.patch