r18745 - in /desktop/unstable/alacarte/debian: changelog compat control.in patches/ patches/02-fix_delete_undo.patch

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

Author: gilir-guest
Date: Thu Mar  5 20:00:48 2009
New Revision: 18745

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18745
Log:
Add VCS field
Bump compat version to 5.
02-fix_delete_undo.patch : Fix undo on deleted items.

Added:
    desktop/unstable/alacarte/debian/patches/
    desktop/unstable/alacarte/debian/patches/02-fix_delete_undo.patch
Modified:
    desktop/unstable/alacarte/debian/changelog
    desktop/unstable/alacarte/debian/compat
    desktop/unstable/alacarte/debian/control.in

Modified: desktop/unstable/alacarte/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/alacarte/debian/changelog?rev=18745&op=diff
==============================================================================
--- desktop/unstable/alacarte/debian/changelog (original)
+++ desktop/unstable/alacarte/debian/changelog Thu Mar  5 20:00:48 2009
@@ -1,4 +1,4 @@
-alacarte (0.11.9-1) UNRELEASED; urgency=low
+alacarte (0.11.9-1) unstable; urgency=low
 
   [ Josselin Mouette ]
   * Recommend gnome-panel for gnome-desktop-item-edit. Closes: #515117.
@@ -12,10 +12,14 @@
    - Bump depends on python-gtk2 to >= 2.13
    - Add build-depends and depends on python-gobject >= 2.15.1 for GIO 
      bindings.
+   - Add VCS fields.
   * Add debian/watch.
   * debian/copyright : Add copyright notice to make lintian happy.
-
- -- Julien Lavergne <julien.lavergne at gmail.com>  Tue, 17 Feb 2009 21:55:18 +0100
+  * Bump compat version to 5.
+  * debian/patches/02-fix_delete_undo.patch
+   - From Ubuntu, make undo work on deleted items.
+
+ -- Julien Lavergne <julien.lavergne at gmail.com>  Thu, 05 Mar 2009 20:59:08 +0100
 
 alacarte (0.11.6-1) unstable; urgency=low
 

Modified: desktop/unstable/alacarte/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/alacarte/debian/compat?rev=18745&op=diff
==============================================================================
--- desktop/unstable/alacarte/debian/compat (original)
+++ desktop/unstable/alacarte/debian/compat Thu Mar  5 20:00:48 2009
@@ -1,1 +1,1 @@
-4
+5

Modified: desktop/unstable/alacarte/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/alacarte/debian/control.in?rev=18745&op=diff
==============================================================================
--- desktop/unstable/alacarte/debian/control.in (original)
+++ desktop/unstable/alacarte/debian/control.in Thu Mar  5 20:00:48 2009
@@ -16,6 +16,8 @@
                      python-gobject (>= 2.15.1)
 XS-Python-Version: >= 2.4
 Standards-Version: 3.8.0
+Vcs-Svn: svn://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/alacarte/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/alacarte/?op=log
 
 Package: alacarte
 Architecture: all

Added: desktop/unstable/alacarte/debian/patches/02-fix_delete_undo.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/alacarte/debian/patches/02-fix_delete_undo.patch?rev=18745&op=file
==============================================================================
--- desktop/unstable/alacarte/debian/patches/02-fix_delete_undo.patch (added)
+++ desktop/unstable/alacarte/debian/patches/02-fix_delete_undo.patch Thu Mar  5 20:00:48 2009
@@ -1,0 +1,15 @@
+#Ubuntu: https://bugs.launchpad.net/ubuntu/+source/alacarte/+bug/225941
+#Upstream : http://bugzilla.gnome.org/show_bug.cgi?id=573680
+diff -Nur -x '*.orig' -x '*~' alacarte-0.11.6/Alacarte/MenuEditor.py alacarte-0.11.6.new/Alacarte/MenuEditor.py
+--- alacarte-0.11.6/Alacarte/MenuEditor.py	2008-09-22 22:48:37.000000000 +0100
++++ alacarte-0.11.6.new/Alacarte/MenuEditor.py	2008-10-15 19:26:09.000000000 +0100
+@@ -344,8 +344,8 @@
+ 		self.save()
+ 
+ 	def deleteItem(self, item):
+-		self.__writeItem(item, hidden=True)
+ 		self.__addUndo([item,])
++		self.__writeItem(item, hidden=True)
+ 		self.save()
+ 
+ 	def deleteMenu(self, menu):