r12784 - /desktop/unstable/yelp/debian/changelog

[lool at users.alioth.debian.org]

Author: lool
Date: Sun Sep 23 18:14:28 2007
New Revision: 12784

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12784
Log:
Merge changelog entries

Modified:
    desktop/unstable/yelp/debian/changelog

Modified: desktop/unstable/yelp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/yelp/debian/changelog?rev=12784&op=diff
==============================================================================
--- desktop/unstable/yelp/debian/changelog (original)
+++ desktop/unstable/yelp/debian/changelog Sun Sep 23 18:14:28 2007
@@ -1,18 +1,16 @@
 yelp (2.20.0-1) unstable; urgency=low
 
+  [ Loic Minier ]
+  * New patch, 60_desktop-file-no-icon-suffix, drops icon filename suffix from
+    the .desktop file to permit proper theming; thanks Tony Houghton;
+    closes: #431366.
+
+  [ Frederic Peters ]
   * New upstream release:
     + added build-depends on librarian-dev.
     + 60_desktop-file-no-icon-suffix: dropped, merged upstream.
 
- -- Frederic Peters <fpeters at debian.org>  Sun, 23 Sep 2007 18:35:16 +0200
-
-yelp (2.18.1-2) UNRELEASED; urgency=low
-
-  * New patch, 60_desktop-file-no-icon-suffix, drops icon filename suffix from
-    the .desktop file to permit proper theming; thanks Tony Houghton;
-    closes: #431366.
-
- -- Loic Minier <lool at dooz.org>  Fri, 06 Jul 2007 10:47:02 +0200
+ -- Loic Minier <lool at dooz.org>  Sun, 23 Sep 2007 20:14:09 +0200
 
 yelp (2.18.1-1) unstable; urgency=low