r30366 - in /desktop/unstable/alacarte/debian: control patches/02-fix_delete_undo.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Fri Oct 14 07:14:45 2011
New Revision: 30366

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30366
Log:
Refresh debian/patches/02-fix_delete_undo.patch

Modified:
    desktop/unstable/alacarte/debian/control
    desktop/unstable/alacarte/debian/patches/02-fix_delete_undo.patch

Modified: desktop/unstable/alacarte/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/alacarte/debian/control?rev=30366&op=diff
==============================================================================
--- desktop/unstable/alacarte/debian/control [utf-8] (original)
+++ desktop/unstable/alacarte/debian/control [utf-8] Fri Oct 14 07:14:45 2011
@@ -33,9 +33,6 @@
          gnome-menus (>= 2.27.92),
          python-gobject (>= 2.15.1)
 Recommends: gnome-panel
-Replaces: smeg
-Provides: smeg
-Conflicts: smeg (<< 0.8-0ubuntu1)
 XB-Python-Version: ${python:Versions}
 Description: easy GNOME menu editing tool
  Alacarte is an easy-to-use menu editor for GNOME that can add

Modified: 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=30366&op=diff
==============================================================================
--- desktop/unstable/alacarte/debian/patches/02-fix_delete_undo.patch [utf-8] (original)
+++ desktop/unstable/alacarte/debian/patches/02-fix_delete_undo.patch [utf-8] Fri Oct 14 07:14:45 2011
@@ -1,9 +1,10 @@
 #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 @@
+Index: alacarte-0.13.2/Alacarte/MenuEditor.py
+===================================================================
+--- alacarte-0.13.2.orig/Alacarte/MenuEditor.py	2011-10-14 09:14:02.296682168 +0200
++++ alacarte-0.13.2/Alacarte/MenuEditor.py	2011-10-14 09:14:03.468667435 +0200
+@@ -347,8 +347,8 @@
  		self.save()
  
  	def deleteItem(self, item):