r22900 - /packages/unstable/gnome-main-menu/debian/changelog

[jak at users.alioth.debian.org]

Author: jak
Date: Thu Jan 28 17:38:52 2010
New Revision: 22900

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22900
Log:
Reorganize entries for this release.

Modified:
    packages/unstable/gnome-main-menu/debian/changelog

Modified: packages/unstable/gnome-main-menu/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-main-menu/debian/changelog?rev=22900&op=diff
==============================================================================
--- packages/unstable/gnome-main-menu/debian/changelog [utf-8] (original)
+++ packages/unstable/gnome-main-menu/debian/changelog [utf-8] Thu Jan 28 17:38:52 2010
@@ -1,9 +1,10 @@
 gnome-main-menu (0.9.13-3) unstable; urgency=low
 
-  * respect-nautilus-spacial-setting.diff: Do not pass --browser to nautilus.
   * debian/patches: Add DEP-3 headers to all our patches.
-  * applet-category.diff: Add a category to the applet.
   * Update Standards-Version to 3.8.4.
+  * Merge from Ubuntu:
+    - applet-category.diff: Add a category to the applet.
+    - respect-nautilus-spacial-setting.diff: Do not pass --browser to nautilus.
   * Update default-applications.diff:
     - Rename ooo-writer.desktop to openoffice.org-writer.desktop.
     - Call nautilus without the --browser argument.