r27617 - in /desktop/experimental/alacarte: ./ debian/changelog debian/control debian/control.in debian/patches/10_settings_menu.patch debian/patches/series debian/rules debian/source/ debian/source/format
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Apr 16 17:12:01 UTC 2011
Author: joss
Date: Sat Apr 16 17:11:55 2011
New Revision: 27617
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27617
Log:
* 10_settings_menu.patch: new patch. Drop settings.menu since it’s not
provided in gnome-menus anymore. Closes: #622900.
* Switch to 3.0 (quilt) source format.
Added:
desktop/experimental/alacarte/
- copied from r27612, desktop/unstable/alacarte/
desktop/experimental/alacarte/debian/patches/10_settings_menu.patch
desktop/experimental/alacarte/debian/source/
desktop/experimental/alacarte/debian/source/format
Modified:
desktop/experimental/alacarte/debian/changelog
desktop/experimental/alacarte/debian/control
desktop/experimental/alacarte/debian/control.in
desktop/experimental/alacarte/debian/patches/series
desktop/experimental/alacarte/debian/rules
Modified: desktop/experimental/alacarte/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/alacarte/debian/changelog?rev=27617&op=diff
==============================================================================
--- desktop/experimental/alacarte/debian/changelog [utf-8] (original)
+++ desktop/experimental/alacarte/debian/changelog [utf-8] Sat Apr 16 17:11:55 2011
@@ -1,3 +1,11 @@
+alacarte (0.13.2-2) experimental; urgency=low
+
+ * 10_settings_menu.patch: new patch. Drop settings.menu since it’s not
+ provided in gnome-menus anymore. Closes: #622900.
+ * Switch to 3.0 (quilt) source format.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 16 Apr 2011 19:08:18 +0200
+
alacarte (0.13.2-1) unstable; urgency=low
[ Josselin Mouette ]
Modified: desktop/experimental/alacarte/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/alacarte/debian/control?rev=27617&op=diff
==============================================================================
--- desktop/experimental/alacarte/debian/control [utf-8] (original)
+++ desktop/experimental/alacarte/debian/control [utf-8] Sat Apr 16 17:11:55 2011
@@ -9,7 +9,6 @@
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, 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/experimental/alacarte/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/alacarte/debian/control.in?rev=27617&op=diff
==============================================================================
--- desktop/experimental/alacarte/debian/control.in [utf-8] (original)
+++ desktop/experimental/alacarte/debian/control.in [utf-8] Sat Apr 16 17:11:55 2011
@@ -4,7 +4,6 @@
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/experimental/alacarte/debian/patches/10_settings_menu.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/alacarte/debian/patches/10_settings_menu.patch?rev=27617&op=file
==============================================================================
--- desktop/experimental/alacarte/debian/patches/10_settings_menu.patch (added)
+++ desktop/experimental/alacarte/debian/patches/10_settings_menu.patch [utf-8] Sat Apr 16 17:11:55 2011
@@ -1,0 +1,118 @@
+Index: alacarte-0.13.2/Alacarte/MainWindow.py
+===================================================================
+--- alacarte-0.13.2.orig/Alacarte/MainWindow.py 2011-04-16 19:05:15.086723615 +0200
++++ alacarte-0.13.2/Alacarte/MainWindow.py 2011-04-16 19:05:19.482745099 +0200
+@@ -72,7 +72,6 @@ class MainWindow:
+ def run(self):
+ self.loadMenus()
+ self.editor.applications.tree.add_monitor(self.menuChanged, None)
+- self.editor.settings.tree.add_monitor(self.menuChanged, None)
+ self.tree.get_object('mainwindow').show_all()
+ gtk.main()
+
+Index: alacarte-0.13.2/Alacarte/MenuEditor.py
+===================================================================
+--- alacarte-0.13.2.orig/Alacarte/MenuEditor.py 2011-04-16 19:05:39.102841022 +0200
++++ alacarte-0.13.2/Alacarte/MenuEditor.py 2011-04-16 19:07:26.783367453 +0200
+@@ -48,22 +48,10 @@ class MenuEditor:
+ self.applications.dom = xml.dom.minidom.parse(self.applications.path)
+ self.__remove_whilespace_nodes(self.applications.dom)
+
+- self.settings = Menu()
+- self.settings.tree = gmenu.lookup_tree('settings.menu', gmenu.FLAGS_SHOW_EMPTY|gmenu.FLAGS_INCLUDE_EXCLUDED|gmenu.FLAGS_INCLUDE_NODISPLAY|gmenu.FLAGS_SHOW_ALL_SEPARATORS)
+- self.settings.visible_tree = gmenu.lookup_tree('settings.menu')
+- self.settings.tree.sort_key = gmenu.SORT_DISPLAY_NAME
+- self.settings.visible_tree.sort_key = gmenu.SORT_DISPLAY_NAME
+- self.settings.path = os.path.join(util.getUserMenuPath(), self.settings.tree.get_menu_file())
+- if not os.path.isfile(self.settings.path):
+- self.settings.dom = xml.dom.minidom.parseString(util.getUserMenuXml(self.settings.tree))
+- else:
+- self.settings.dom = xml.dom.minidom.parse(self.settings.path)
+- self.__remove_whilespace_nodes(self.settings.dom)
+-
+ self.save(True)
+
+ def save(self, from_loading=False):
+- for menu in ('applications', 'settings'):
++ for menu in ('applications',):
+ fd = open(getattr(self, menu).path, 'w')
+ fd.write(re.sub("\n[\s]*([^\n<]*)\n[\s]*</", "\\1</", getattr(self, menu).dom.toprettyxml().replace('<?xml version="1.0" ?>\n', '')))
+ fd.close()
+@@ -85,7 +73,7 @@ class MenuEditor:
+ os.unlink(file_path)
+
+ def revert(self):
+- for name in ('applications', 'settings'):
++ for name in ('applications',):
+ menu = getattr(self, name)
+ self.revertTree(menu.tree.root)
+ path = os.path.join(util.getUserMenuPath(), menu.tree.get_menu_file())
+@@ -126,7 +114,7 @@ class MenuEditor:
+ os.unlink(file_path)
+ redo.append(redo_path)
+ #reload DOM to make changes stick
+- for name in ('applications', 'settings'):
++ for name in ('applications',):
+ menu = getattr(self, name)
+ if not os.path.isfile(menu.path):
+ menu.dom = xml.dom.minidom.parseString(util.getUserMenuXml(menu.tree))
+@@ -150,7 +138,7 @@ class MenuEditor:
+ os.unlink(file_path)
+ undo.append(undo_path)
+ #reload DOM to make changes stick
+- for name in ('applications', 'settings'):
++ for name in ('applications',):
+ menu = getattr(self, name)
+ if not os.path.isfile(menu.path):
+ menu.dom = xml.dom.minidom.parseString(util.getUserMenuXml(menu.tree))
+@@ -162,7 +150,6 @@ class MenuEditor:
+ def getMenus(self, parent=None):
+ if parent == None:
+ yield self.applications.tree.root
+- yield self.settings.tree.root
+ else:
+ for menu in parent.get_contents():
+ if menu.get_type() == gmenu.TYPE_DIRECTORY:
+@@ -429,31 +416,13 @@ class MenuEditor:
+ self.__undo[-1].append(undo_path)
+
+ def __getMenu(self, item):
+- root = item.get_parent()
+- if not root:
+- #already at the top
+- root = item
+- else:
+- while True:
+- if root.get_parent():
+- root = root.get_parent()
+- else:
+- break
+- if root.menu_id == self.applications.tree.root.menu_id:
+- return self.applications
+- return self.settings
++ return self.applications
+
+ def __findMenu(self, menu_id, parent=None):
+ if parent == None:
+- menu = self.__findMenu(menu_id, self.applications.tree.root)
+- if menu != None:
+- return menu
+- else:
+- return self.__findMenu(menu_id, self.settings.tree.root)
++ return self.__findMenu(menu_id, self.applications.tree.root)
+ if menu_id == self.applications.tree.root.menu_id:
+ return self.applications.tree.root
+- if menu_id == self.settings.tree.root.menu_id:
+- return self.settings.tree.root
+ for item in parent.get_contents():
+ if item.get_type() == gmenu.TYPE_DIRECTORY:
+ if item.menu_id == menu_id:
+@@ -468,8 +437,6 @@ class MenuEditor:
+ menu = self.__getMenu(item)
+ if menu == self.applications:
+ root = self.applications.visible_tree.root
+- elif menu == self.settings:
+- root = self.settings.visible_tree.root
+ if item.get_type() == gmenu.TYPE_DIRECTORY:
+ if self.__findMenu(item.menu_id, root) == None:
+ return False
Modified: desktop/experimental/alacarte/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/alacarte/debian/patches/series?rev=27617&op=diff
==============================================================================
--- desktop/experimental/alacarte/debian/patches/series [utf-8] (original)
+++ desktop/experimental/alacarte/debian/patches/series [utf-8] Sat Apr 16 17:11:55 2011
@@ -1,4 +1,5 @@
01-new_item_location.patch
02-fix_delete_undo.patch
03-bind_textdomain_codeset.patch
+10_settings_menu.patch
30-python_private_dir.patch
Modified: desktop/experimental/alacarte/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/alacarte/debian/rules?rev=27617&op=diff
==============================================================================
--- desktop/experimental/alacarte/debian/rules [utf-8] (original)
+++ desktop/experimental/alacarte/debian/rules [utf-8] Sat Apr 16 17:11:55 2011
@@ -3,7 +3,6 @@
DEB_INSTALL_MANPAGES_alacarte := debian/alacarte.1
include /usr/share/cdbs/1/rules/debhelper.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
Added: desktop/experimental/alacarte/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/alacarte/debian/source/format?rev=27617&op=file
==============================================================================
--- desktop/experimental/alacarte/debian/source/format (added)
+++ desktop/experimental/alacarte/debian/source/format [utf-8] Sat Apr 16 17:11:55 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the pkg-gnome-commits
mailing list