r23145 - in /desktop/unstable/alacarte/debian: changelog control control.in patches/01-new_item_location.patch patches/series rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Feb 27 12:16:36 UTC 2010
Author: joss
Date: Sat Feb 27 12:16:12 2010
New Revision: 23145
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23145
Log:
* Switch to quilt to manage patches.
* 01-new_item_location.patch: new patch. Pass menu reference directly
instead of using the text ID, for which there can be duplicates.
Closes: #461318.
Added:
desktop/unstable/alacarte/debian/patches/01-new_item_location.patch
desktop/unstable/alacarte/debian/patches/series
Modified:
desktop/unstable/alacarte/debian/changelog
desktop/unstable/alacarte/debian/control
desktop/unstable/alacarte/debian/control.in
desktop/unstable/alacarte/debian/rules
Modified: desktop/unstable/alacarte/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/alacarte/debian/changelog?rev=23145&op=diff
==============================================================================
--- desktop/unstable/alacarte/debian/changelog [utf-8] (original)
+++ desktop/unstable/alacarte/debian/changelog [utf-8] Sat Feb 27 12:16:12 2010
@@ -3,6 +3,10 @@
* 03-bind_textdomain_codeset.patch: patch from Matt Kraai. Set the
character set to UTF-8 since this is what GTK+ expects.
Closes: #552528.
+ * Switch to quilt to manage patches.
+ * 01-new_item_location.patch: new patch. Pass menu reference directly
+ instead of using the text ID, for which there can be duplicates.
+ Closes: #461318.
-- Josselin Mouette <joss at debian.org> Wed, 11 Nov 2009 16:53:52 +0100
Modified: desktop/unstable/alacarte/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/alacarte/debian/control?rev=23145&op=diff
==============================================================================
--- desktop/unstable/alacarte/debian/control [utf-8] (original)
+++ desktop/unstable/alacarte/debian/control [utf-8] Sat Feb 27 12:16:12 2010
@@ -1,9 +1,15 @@
+# This file is autogenerated. DO NOT EDIT!
+#
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
Source: alacarte
Section: utils
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: Jordi Mallach <jordi at debian.org>, Josselin Mouette <joss at debian.org>
Build-Depends: cdbs (>= 0.4.41),
+ quilt,
autotools-dev,
debhelper (>= 5.0.37.1),
python-support (>= 0.7),
Modified: desktop/unstable/alacarte/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/alacarte/debian/control.in?rev=23145&op=diff
==============================================================================
--- desktop/unstable/alacarte/debian/control.in [utf-8] (original)
+++ desktop/unstable/alacarte/debian/control.in [utf-8] Sat Feb 27 12:16:12 2010
@@ -4,6 +4,7 @@
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: cdbs (>= 0.4.41),
+ quilt,
autotools-dev,
debhelper (>= 5.0.37.1),
python-support (>= 0.7),
Added: desktop/unstable/alacarte/debian/patches/01-new_item_location.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/alacarte/debian/patches/01-new_item_location.patch?rev=23145&op=file
==============================================================================
--- desktop/unstable/alacarte/debian/patches/01-new_item_location.patch (added)
+++ desktop/unstable/alacarte/debian/patches/01-new_item_location.patch [utf-8] Sat Feb 27 12:16:12 2010
@@ -1,0 +1,43 @@
+Index: alacarte-0.12.4/Alacarte/MainWindow.py
+===================================================================
+--- alacarte-0.12.4.orig/Alacarte/MainWindow.py 2010-02-27 13:06:34.545032537 +0100
++++ alacarte-0.12.4/Alacarte/MainWindow.py 2010-02-27 13:07:03.740529287 +0100
+@@ -260,10 +260,10 @@ class MainWindow:
+
+ #this is a little timeout callback to insert new items after
+ #gnome-desktop-item-edit has finished running
+- def waitForNewItemProcess(self, process, parent_id, file_path):
++ def waitForNewItemProcess(self, process, parent, file_path):
+ if process.poll() != None:
+ if os.path.isfile(file_path):
+- self.editor.insertExternalItem(os.path.split(file_path)[1], parent_id)
++ self.editor.insertExternalItem(os.path.split(file_path)[1], parent)
+ return False
+ return True
+
+@@ -309,7 +309,7 @@ class MainWindow:
+ parent = menus[iter][2]
+ file_path = os.path.join(util.getUserItemPath(), util.getUniqueFileId('alacarte-made', '.desktop'))
+ process = subprocess.Popen(['gnome-desktop-item-edit', file_path], env=os.environ)
+- gobject.timeout_add(100, self.waitForNewItemProcess, process, parent.menu_id, file_path)
++ gobject.timeout_add(100, self.waitForNewItemProcess, process, parent, file_path)
+
+ def on_new_separator_button_clicked(self, button):
+ item_tree = self.tree.get_object('item_tree')
+Index: alacarte-0.12.4/Alacarte/MenuEditor.py
+===================================================================
+--- alacarte-0.12.4.orig/Alacarte/MenuEditor.py 2010-02-27 13:05:35.384532177 +0100
++++ alacarte-0.12.4/Alacarte/MenuEditor.py 2010-02-27 13:06:17.044530443 +0100
+@@ -222,10 +222,9 @@ class MenuEditor:
+
+ def createItem(self, parent, icon, name, comment, command, use_term, before=None, after=None):
+ file_id = self.__writeItem(None, icon, name, comment, command, use_term)
+- self.insertExternalItem(file_id, parent.menu_id, before, after)
++ self.insertExternalItem(file_id, parent, before, after)
+
+- def insertExternalItem(self, file_id, parent_id, before=None, after=None):
+- parent = self.__findMenu(parent_id)
++ def insertExternalItem(self, file_id, parent, before=None, after=None):
+ dom = self.__getMenu(parent).dom
+ self.__addItem(parent, file_id, dom)
+ self.__positionItem(parent, ('Item', file_id), before, after)
Added: desktop/unstable/alacarte/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/alacarte/debian/patches/series?rev=23145&op=file
==============================================================================
--- desktop/unstable/alacarte/debian/patches/series (added)
+++ desktop/unstable/alacarte/debian/patches/series [utf-8] Sat Feb 27 12:16:12 2010
@@ -1,0 +1,3 @@
+01-new_item_location.patch
+02-fix_delete_undo.patch
+03-bind_textdomain_codeset.patch
Modified: desktop/unstable/alacarte/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/alacarte/debian/rules?rev=23145&op=diff
==============================================================================
--- desktop/unstable/alacarte/debian/rules [utf-8] (original)
+++ desktop/unstable/alacarte/debian/rules [utf-8] Sat Feb 27 12:16:12 2010
@@ -3,7 +3,7 @@
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/rules/patchsys-quilt.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
More information about the pkg-gnome-commits
mailing list