--- alacarte-0.12.1.orig/debian/control +++ alacarte-0.12.1/debian/control @@ -0,0 +1,42 @@ +Source: alacarte +Section: utils +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Debian GNOME Maintainers , Jordi Mallach +Build-Depends: cdbs (>= 0.4.41), + autotools-dev, + debhelper (>= 5.0.37.1), + python-central (>= 0.5), + python-dev (>= 2.4), + gnome-pkg-tools +Build-Depends-Indep: intltool (>= 0.4.0), + gettext, + libgnome-menu-dev (>= 2.22.2), + python-gtk2 (>= 2.8.0), + python-gobject (>= 2.15.1) +XS-Python-Version: >= 2.4 +Standards-Version: 3.8.1 +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 +Depends: ${python:Depends}, + ${misc:Depends}, + python-gtk2 (>= 2.13.0), + python-glade2 (>= 2.8.0), + python-gmenu (>= 2.22.2), + gnome-menus (>= 2.22.2), + python-gnome2 (>= 2.6), + 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 + and edit new entries and menus. It works with the freedesktop.org + menu specification and should work with any desktop environment + that uses the spec. --- alacarte-0.12.1.orig/debian/rules +++ alacarte-0.12.1/debian/rules @@ -0,0 +1,18 @@ +#!/usr/bin/make -f + +DEB_PYTHON_SYSTEM := pycentral +DEB_INSTALL_MANPAGES_alacarte := debian/alacarte.1 + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +DEB_CONFIGURE_SCRIPT_ENV += PYTHON="/usr/bin/python" + +install/alacarte:: + dh_pycentral + echo 'X-Ubuntu-Gettext-Domain=alacarte' >> debian/alacarte/usr/share/applications/alacarte.desktop + cd po; intltool-update -p --gettext-package=alacarte + --- alacarte-0.12.1.orig/debian/copyright +++ alacarte-0.12.1/debian/copyright @@ -0,0 +1,26 @@ +This package was debianized by Travis Watkins on +Sat, 22 Oct 2005 10:15:01 -0500. + +It was downloaded from +http://dev.realistanew.com/alacarte/releases/0.8/alacarte-0.8.tar.gz + +Copyright © 2006 : Travis Watkins + +License: LGPL + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the full text of the LGPL can be found in +/usr/share/common-licenses/LGPL-2 --- alacarte-0.12.1.orig/debian/control.in +++ alacarte-0.12.1/debian/control.in @@ -0,0 +1,42 @@ +Source: alacarte +Section: utils +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: @GNOME_TEAM@ +Build-Depends: cdbs (>= 0.4.41), + autotools-dev, + debhelper (>= 5.0.37.1), + python-central (>= 0.5), + python-dev (>= 2.4), + gnome-pkg-tools +Build-Depends-Indep: intltool (>= 0.4.0), + gettext, + libgnome-menu-dev (>= 2.22.2), + python-gtk2 (>= 2.8.0), + python-gobject (>= 2.15.1) +XS-Python-Version: >= 2.4 +Standards-Version: 3.8.1 +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 +Depends: ${python:Depends}, + ${misc:Depends}, + python-gtk2 (>= 2.13.0), + python-glade2 (>= 2.8.0), + python-gmenu (>= 2.22.2), + gnome-menus (>= 2.22.2), + python-gnome2 (>= 2.6), + 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 + and edit new entries and menus. It works with the freedesktop.org + menu specification and should work with any desktop environment + that uses the spec. --- alacarte-0.12.1.orig/debian/changelog +++ alacarte-0.12.1/debian/changelog @@ -0,0 +1,461 @@ +alacarte (0.12.1-0ubuntu1) karmic; urgency=low + + * New upstream release: (LP: #375203) + - Generate the ChangeLog from git-log + - Drop libglade dependency (Andreu Correa Casablanca) + * debian/patches/01_properties_button.patch + - update to new version + * debian/patches/02_fix_delete_undo.patch + - name the patch properly + + -- Andreas Moog Tue, 12 May 2009 01:24:41 +0200 + +alacarte (0.11.10-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #371280), remaining changes: + + 01_properties_button.patch: add "properties" and "delete" buttons + + debian/rules: Add gettext domain to desktop file and run intltool-update + during the build. + + -- Iain Lane Mon, 04 May 2009 20:37:37 +0100 + +alacarte (0.11.10-1) unstable; urgency=low + + [ Josselin Mouette ] + * Recommend gnome-panel for gnome-desktop-item-edit. Closes: #515117. + + [ Julien Lavergne ] + * New upstream release. + * debian/control.in: + - Bump build-depends on intltool to >= 0.4.0 + - Bump build-depends on libgnome-menu-dev to >= 2.22.2 + - Bump depends on python-gmenu to >= 2.22.2 and on gnome-menus to >= 2.22.2. + - 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. + * Bump compat version to 5. + * debian/patches/02-fix_delete_undo.patch + - From Ubuntu, make undo work on deleted items. + + [ Jordi Mallach ] + * Bump Standards-Version to 3.8.1, no changes required. + + -- Jordi Mallach Wed, 29 Apr 2009 22:14:54 +0200 + +alacarte (0.11.10-0ubuntu2) karmic; urgency=low + + * debian/patches/01_properties_button.patch + - don't activate properties and delete button on menu-tree, + don't activate properties button on seperator. (LP: #366723) + + -- Andreas Moog Mon, 27 Apr 2009 18:19:22 +0200 + +alacarte (0.11.10-0ubuntu1) jaunty; urgency=low + + * New upstream version + + -- Sebastien Bacher Tue, 17 Mar 2009 15:38:34 +0100 + +alacarte (0.11.9-0ubuntu2) jaunty; urgency=low + + * debian/patches/01_properties_button.patch + - The buttons were incorrectly marked as translatable, fixed + (LP: #287218) + + -- Andreas Moog Mon, 09 Mar 2009 18:14:30 +0100 + +alacarte (0.11.9-0ubuntu1) jaunty; urgency=low + + * New upstream version: + - Remove libgnomeui dependency + * debian/control.in: don't require gnome-python + + -- Sebastien Bacher Thu, 19 Feb 2009 00:36:14 +0100 + +alacarte (0.11.8-0ubuntu1) jaunty; urgency=low + + * New upstream version: + - Work properly when pygobject is not installed in a default directory + + -- Sebastien Bacher Tue, 03 Feb 2009 17:31:14 +0100 + +alacarte (0.11.7-0ubuntu1) jaunty; urgency=low + + * New upstream version: + - Port to GIO + - Require intltool 0.4.0 + - Print better messages when checking for Python libraries + + -- Sebastien Bacher Mon, 19 Jan 2009 17:10:20 +0100 + +alacarte (0.11.6-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - generate alacarte.pot during build + - 01_properties_button.patch: show a properties button + - 02-fix_delete_undo.patch: undo work on deleted items + + -- Michael Vogt Mon, 17 Nov 2008 11:14:27 +0100 + +alacarte (0.11.6-1) unstable; urgency=low + + * New upstream release. + * Standards version is 3.8.0. + + -- Josselin Mouette Thu, 13 Nov 2008 15:32:21 +0100 + +alacarte (0.11.6-0ubuntu2) intrepid; urgency=low + + * Make undo work on deleted items. (LP: #225941) + - Thanks to Travis Watkins. + + -- James Westby Wed, 15 Oct 2008 19:23:57 +0100 + +alacarte (0.11.6-0ubuntu1) intrepid; urgency=low + + * New upstream version: (LP: #273513) + - install/uninstall more theme icons more correctly + - Check for python 2.6 + - Translation updates + * debian/patches/01_properties_button.patch updated to new version + + -- Andreas Moog Tue, 23 Sep 2008 12:23:34 +0200 + +alacarte (0.11.5-1ubuntu2) intrepid; urgency=low + + * added debian/patches/01_properties_button to show a properties-button + (LP: #86473) + + -- Andreas Moog Sat, 06 Sep 2008 17:01:31 +0200 + +alacarte (0.11.5-1ubuntu1) intrepid; urgency=low + + * Sync on Debian + * debian/control.in: + - updated maintainer information + * debian/rules: + - set translations domain and update translations template + + -- Sebastien Bacher Mon, 16 Jun 2008 11:31:12 +0200 + +alacarte (0.11.5-1) unstable; urgency=low + + * Put the package under maintenance of the GNOME team, with Loïc’s + approval. + * Build-depend on gnome-pkg-tools, use uploaders.mk and + gnome-get-source.mk. + * Require python-dev, not python-all-dev. + * Wrap build-depends and depends. + * Remove dependency on python-libxml2, update others. + + -- Josselin Mouette Sat, 14 Jun 2008 15:12:44 +0200 + +alacarte (0.11.3-1) unstable; urgency=low + + * Ack Loic 0.8-6 upload. + * Merge Ubuntu changes from 0.8-0ubuntu3 until 0.11.3-0ubuntu2. + - drop the patches (they were merged upstream). + - switch to python-central to avoid future problems merging. + + -- Gustavo Franco Sun, 15 Apr 2007 16:08:50 -0300 + +alacarte (0.11.3-0ubuntu2) feisty; urgency=low + + * debian/control.in: + - Depend on gnome-panel. (LP: #98620) + - changed Maintainer field. + + -- Daniel Holbach Thu, 29 Mar 2007 17:00:56 +0200 + +alacarte (0.11.3-0ubuntu1) feisty; urgency=low + + * New upstream version: + - Add back support for System menu + + -- Sebastien Bacher Mon, 12 Feb 2007 23:36:42 +0100 + +alacarte (0.11.1.1-0ubuntu4) feisty; urgency=low + + * debian/rules: + - fix the python interpreter to use by specifying the path (Ubuntu: #79545) + + -- Sebastien Bacher Tue, 16 Jan 2007 15:03:47 +0100 + +alacarte (0.11.1.1-0ubuntu3) feisty; urgency=low + + * debian/rules: Convince the build system to use the + unversioned python interpreter name. + + -- Matthias Klose Mon, 15 Jan 2007 00:38:32 +0100 + +alacarte (0.11.1.1-0ubuntu2) feisty; urgency=low + + * Rebuild for python2.5 as the default python version. + + -- Matthias Klose Sun, 14 Jan 2007 16:28:48 +0000 + +alacarte (0.11.1.1-0ubuntu1) feisty; urgency=low + + * New upstream release: + - remove preferences/administration editing + - fix goofy bugs + * debian/patches/01-remove-dialoghandler-import.patch: + - dropped, included in release. + + -- Daniel Holbach Thu, 11 Jan 2007 09:14:08 +0100 + +alacarte (0.11.0-0ubuntu1) feisty; urgency=low + + * New upstream release: + - respond to show/hide immediately + - use gnome-desktop-item-edit for all menu and item editing + - Translations: en_CA, bg, ro, vi, sv, en_GB, et, mk, ar, nb, sl, pt_BR, + th. + * debian/control.in: + - shuffled python build-depends around a bit. + * debian/patches/01-remove-dialoghandler-import.patch: + - dropped DialogHandler import. + * debian/rules: + - dropped dh_python call. + + -- Daniel Holbach Tue, 9 Jan 2007 09:32:53 +0100 + +alacarte (0.10.2-0ubuntu1) feisty; urgency=low + + * New upstream version: + - Mark all strings for translation + - Support for Python 2.5 + - Included hints for bug-buddy in the .desktop file + - Translations are now searched for in the correct place + - Improved the description in the .desktop file + - Minimize/maximize buttons added to main window + + -- Sebastien Bacher Tue, 19 Dec 2006 00:28:36 +0100 + +alacarte (0.10.1-0ubuntu1) edgy; urgency=low + + * New upstream version: + - lots of small fixes + - fix "Browse dialog doesn't escape spaces in command path" + (Ubuntu: #54748) + - fix "replaces \r by carriage return" (Ubuntu: #63168) + + -- Sebastien Bacher Tue, 3 Oct 2006 10:53:28 +0200 + +alacarte (0.10.0-0ubuntu1) edgy; urgency=low + + * New upstream release: + - fix crashed caused by new gnome-menus (Malone: #55350, #56720) + - potentially fix crash on solaris + - make help button and F1 work + * debian/control.in, debian/rules: conform with Python Policy. + + -- Daniel Holbach Mon, 4 Sep 2006 19:12:20 +0200 + +alacarte (0.9.90-0ubuntu1) edgy; urgency=low + + * New upstream version: + - small HIG fixes + - depend on gnome-menus 2.15.4 or newer + Translations + - Esteve Blanch Sanmartí (ca) + - Kostas Papadimas (el) + - Jonathan Ernst (fr) + - Satoru SATOH (ja) + + -- Sebastien Bacher Tue, 25 Jul 2006 09:50:05 +0200 + +alacarte (0.9.2-0ubuntu1) edgy; urgency=low + + * New upstream version: + - various bug fixes + - depend on gnome-menus 2.14.1 or newer (doesn't exist yet!) + * debian/control.in: + - Build-Deoends-Indep on libgnome-menu-dev, python-gobject + - Depends on python-gmenu instead of python-xdg since upstream use that now + - moved @cdbs@ to Build-Depends instead of Build-Depends-Indep + - require gnome-menus 2.15.4.1 + * debian/patches/01_menu_item.patch, + debian/patches/10_fix_gettext_error.patch, + debian/patches/11_fix_new_entry_terminal.patch, + debian/patches/12_fix_new_entry_file_browser.patch, + debian/patches/13_fix_item_moves.patch, + debian/patches/14_fix_icon_selector.patch, + debian/patches/15_fix_disappearing_separators.patch, + debian/patches/16_fix_url.patch: + - fixed with the new version + * debian/rules: + - use gnome.mk instead of python-distutils.mk since upstream changed + the build system + + -- Sebastien Bacher Tue, 11 Jul 2006 22:03:29 +0200 + +alacarte (0.8-0ubuntu13) edgy; urgency=low + + * debian/control.in: + - Depends on python-libxml2 instead of the versionned package + + -- Sebastien Bacher Wed, 5 Jul 2006 15:16:51 +0200 + +alacarte (0.8-0ubuntu12) dapper; urgency=low + + * debian/patches/16_fix_url.patch: + - change fd.o to freedesktop.org, + thanks Travis Watkins + + -- Daniel Holbach Fri, 12 May 2006 21:26:08 +0200 + +alacarte (0.8-0ubuntu11) dapper; urgency=low + + * debian/patches/15_fix_disappearing_separators.patch: + - fix "separators not active in some menus" (Malone: #36323), thanks + Travis Watkins . + + -- Daniel Holbach Fri, 12 May 2006 12:30:30 +0200 + +alacarte (0.8-0ubuntu10) dapper; urgency=low + + * debian/patches/14_fix_icon_selector.patch: + - fix "Icon selection window problems in v0.8 (Ubuntu Dapper)" (Malone: + #6115), thank Travis Watkins + + -- Daniel Holbach Fri, 28 Apr 2006 19:19:05 +0200 + +alacarte (0.8-0ubuntu9) dapper; urgency=low + + * debian/patches/13_fix_item_moves.patch: + - fix "Menu items disappear when moved" (Malone: #41122), + thanks Travis Watkins + + -- Daniel Holbach Mon, 24 Apr 2006 22:10:40 +0200 + +alacarte (0.8-0ubuntu8) dapper; urgency=low + + * debian/patches/12_fix_new_entry_file_browser.patch: + - fix "Alacarte hangs on command browser" (Malone: #36728), + thanks Travis Watkins + + -- Daniel Holbach Fri, 7 Apr 2006 16:45:25 +0200 + +alacarte (0.8-0ubuntu7) dapper; urgency=low + + * debian/patches/11_fix_new_entry_terminal.patch: + - fix "When creating a new entry, "run in terminal" option does not work + properly in Dapper" (Malone: #34212), thanks Travis Watkins + + + -- Daniel Holbach Fri, 7 Apr 2006 12:00:54 +0200 + +alacarte (0.8-0ubuntu6) dapper; urgency=low + + * debian/patches/10_fix_gettext_error.patch: + - fix "'_' undefined when reopening Entry Editor" (Malone: #28445), + thanks Travis Watkins + + -- Daniel Holbach Mon, 20 Mar 2006 20:42:22 +0100 + +alacarte (0.8-0ubuntu5) dapper; urgency=low + + * debian/patches/01_menu_item.patch: + - use "Add, change, remove menu entries" instead of "Simple fd.o Compliant + Menu Editor" for the menu item tooltip + + -- Sebastien Bacher Thu, 16 Mar 2006 12:24:27 +0100 + +alacarte (0.8-0ubuntu4) dapper; urgency=low + + * debian/rules: Build a .pot + + -- Sebastien Bacher Wed, 1 Mar 2006 16:53:55 +0100 + +alacarte (0.8-0ubuntu3) dapper; urgency=low + + * debian/rules: Add gettext translation domain to .desktop file. + + -- Martin Pitt Thu, 23 Feb 2006 17:40:20 +0100 + +alacarte (0.8-6) unstable; urgency=high + + * Add myself to uploaders. + * New patches taken from the Ubuntu 0.8-0ubuntu12 package: + - 01_menu_item: nicer description in the menu item tooltip for Alacarte + itself. + - 10_fix_gettext_error: fixes missing import and "_" definition which + caused "global name '_' is not defined"; Malone: #28445; mentionned in + Debian #358012. + - 11_fix_new_entry_terminal: fixes run in terminal option for new entries; + Malone: #34212. + - 12_fix_new_entry_file_browser: fixes the command browser dialog to be + modal since it's run from a modal dialog; closes: #358012. + - 13_fix_item_moves: fixes saving of menu item when it's moved around; + Malone: #41122. + - 14_fix_icon_selector: fixes entry widget activation upon changes; + Malone: #6115; closes: #382452. + - 15_fix_disappearing_separators: fixes saving of separators; + Malone: #36323. + - 16_fix_url: use "freedesktop.org" instead of "fd.o" in comment in about + dialog. + * Bump up python-support build-dep to 0.3. + * New patch, 17_dont-set-pixmap-dir, avoids setting pixmap subdir if it's + not available; closes: #348593. + + -- Loic Minier Sat, 10 Mar 2007 15:32:58 +0100 + +alacarte (0.8-5) unstable; urgency=medium + + * Add missing python-xdg dependency. (Closes: #384264) + + -- Gustavo Franco Wed, 23 Aug 2006 11:02:43 -0300 + +alacarte (0.8-4) unstable; urgency=low + + * New "Python Policy" release (Closes: #380754) + * debian/control: + - Set Utnubu Team as Maintainer + - Standards-Version bumped up to 3.7.2 + - cdbs and debhelper moved to Build-Depends + + -- Gustavo Franco Mon, 21 Aug 2006 11:28:15 -0300 + +alacarte (0.8-3) unstable; urgency=low + + * debian/control: build-essential removed (thanks Joerg) + * debian/rules: + - patch fixing gnome 2.12 menus path + - alacarte svg icon moved into the right directory + + -- Gustavo Franco Thu, 5 Jan 2006 15:11:27 -0200 + +alacarte (0.8-2) unstable; urgency=low + + * debian/rules: get rid of "auto update control" + + -- Gustavo Franco Mon, 26 Dec 2005 19:26:59 -0200 + +alacarte (0.8-1) unstable; urgency=low + + * First Debian release. (Closes: #344561) + * debian/control + - Depends field cleaned (e.g: python 2.3) + - Maintainer field changed + - Description field better formatted + - Standards-Version field updated to 3.6.2.1 + + -- Gustavo Franco Fri, 23 Dec 2005 16:58:47 -0200 + +alacarte (0.8-0ubuntu2) dapper; urgency=low + + * debian/alacarte.links, debian/rules: + - doesn't install a smeg files variant, that's not required. + + -- Sebastien Bacher Thu, 17 Nov 2005 15:52:19 +0100 + +alacarte (0.8-0ubuntu1) dapper; urgency=low + + * Initial release + + -- Travis Watkins Sat, 22 Oct 2005 10:15:01 -0500 + --- alacarte-0.12.1.orig/debian/compat +++ alacarte-0.12.1/debian/compat @@ -0,0 +1 @@ +5 --- alacarte-0.12.1.orig/debian/watch +++ alacarte-0.12.1/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://ftp.gnome.org/pub/gnome/sources/alacarte/([\d\.]+)/alacarte-([\d\.]+)\.tar\.gz --- alacarte-0.12.1.orig/debian/alacarte.1 +++ alacarte-0.12.1/debian/alacarte.1 @@ -0,0 +1,36 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH ALACARTE 1 "October 22, 2005" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +alacarte \- edit freedesktop.org menus +.SH SYNOPSIS +.B alacarte +.SH DESCRIPTION +This manual page documents briefly the +.B alacarte +commands. +.PP +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBalacarte\fP is a program that for editing freedesktop.org complient menus. +.SH OPTIONS +.SH SEE ALSO +.SH AUTHOR +alacarte was written by Travis Watkins. +.PP +This manual page was written by Travis Watkins . --- alacarte-0.12.1.orig/debian/patches/02_fix_delete_undo.patch +++ alacarte-0.12.1/debian/patches/02_fix_delete_undo.patch @@ -0,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): --- alacarte-0.12.1.orig/debian/patches/01_properties_button.patch +++ alacarte-0.12.1/debian/patches/01_properties_button.patch @@ -0,0 +1,82 @@ +diff -Nurp alacarte-0.12.1/Alacarte/MainWindow.py alacarte-0.12.1.new/Alacarte/MainWindow.py +--- alacarte-0.12.1/Alacarte/MainWindow.py 2009-05-04 15:55:43.000000000 +0200 ++++ alacarte-0.12.1.new/Alacarte/MainWindow.py 2009-05-12 02:07:28.000000000 +0200 +@@ -387,6 +387,8 @@ class MainWindow: + self.tree.get_object('move_up_button').set_sensitive(False) + self.tree.get_object('move_down_button').set_sensitive(False) + self.tree.get_object('new_separator_button').set_sensitive(False) ++ self.tree.get_object('properties_button').set_sensitive(False) ++ self.tree.get_object('delete_button').set_sensitive(False) + + def on_menu_tree_drag_data_get(self, treeview, context, selection, target_id, etime): + menus, iter = treeview.get_selection().get_selected() +@@ -434,14 +436,17 @@ class MainWindow: + item = items[iter][3] + self.tree.get_object('edit_delete').set_sensitive(True) + self.tree.get_object('new_separator_button').set_sensitive(True) ++ self.tree.get_object('delete_button').set_sensitive(True) + if self.editor.canRevert(item): + self.tree.get_object('edit_revert_to_original').set_sensitive(True) + else: + self.tree.get_object('edit_revert_to_original').set_sensitive(False) + if not item.get_type() == gmenu.TYPE_SEPARATOR: + self.tree.get_object('edit_properties').set_sensitive(True) ++ self.tree.get_object('properties_button').set_sensitive(True) + else: + self.tree.get_object('edit_properties').set_sensitive(False) ++ self.tree.get_object('properties_button').set_sensitive(False) + + # If first item... + if items.get_path(iter)[0] == 0: +@@ -609,6 +614,11 @@ class MainWindow: + pass + gobject.timeout_add(10, self.quit) + ++ def on_properties_button_clicked(self, button): ++ self.on_edit_properties_activate(None) ++ def on_delete_button_clicked(self, button): ++ self.on_edit_delete_activate(None) ++ + def on_style_set(self, *args): + self.loadUpdates() + +diff -Nurp alacarte-0.12.1/data/alacarte.ui alacarte-0.12.1.new/data/alacarte.ui +--- alacarte-0.12.1/data/alacarte.ui 2009-05-04 15:55:43.000000000 +0200 ++++ alacarte-0.12.1.new/data/alacarte.ui 2009-05-12 02:07:43.000000000 +0200 +@@ -610,6 +610,36 @@ + + + ++ ++ ++ gtk-properties ++ True ++ True ++ True ++ True ++ ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ gtk-delete ++ True ++ True ++ True ++ True ++ ++ ++ ++ False ++ False ++ 3 ++ ++ + + +