[Python-modules-commits] r20704 - in packages/pyxdg/trunk/debian (4 files)

[rak at users.alioth.debian.org]

    Date: Friday, March 9, 2012 @ 16:58:48
  Author: rak
Revision: 20704

pyxdg 0.19-4, sets fallback menu to be parsed (Closes: #654978) and bumps standards

Added:
  packages/pyxdg/trunk/debian/patches/set_default_menu.diff
Modified:
  packages/pyxdg/trunk/debian/changelog
  packages/pyxdg/trunk/debian/control
  packages/pyxdg/trunk/debian/patches/series

Modified: packages/pyxdg/trunk/debian/changelog
===================================================================
--- packages/pyxdg/trunk/debian/changelog	2012-03-09 10:46:43 UTC (rev 20703)
+++ packages/pyxdg/trunk/debian/changelog	2012-03-09 16:58:48 UTC (rev 20704)
@@ -1,3 +1,13 @@
+pyxdg (0.19-4) unstable; urgency=low
+
+  * Team upload
+  * Set debian-menu.menu as a fallback menu to be parsed when the default
+    (applications.menu) doesn't exist to avoid ParsingErrors (Closes: #654978)
+    + Added menu-xdg as a Depends
+  * Bump standards version to 3.9.3 (no changes needed)
+
+ -- Ryan Kavanagh <rak at debian.org>  Fri, 09 Mar 2012 07:12:58 -0500
+
 pyxdg (0.19-3) unstable; urgency=low
 
   * Team upload.

Modified: packages/pyxdg/trunk/debian/control
===================================================================
--- packages/pyxdg/trunk/debian/control	2012-03-09 10:46:43 UTC (rev 20703)
+++ packages/pyxdg/trunk/debian/control	2012-03-09 16:58:48 UTC (rev 20704)
@@ -4,14 +4,14 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Piotr Lewandowski <piotr.lewandowski at gmail.com>
 Build-Depends: debhelper (>= 7), python-support
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pyxdg/trunk/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyxdg/trunk/
 Homepage: http://www.freedesktop.org/wiki/Software/pyxdg
 
 Package: python-xdg
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}
+Depends: ${misc:Depends}, ${python:Depends}, menu-xdg
 Description: Python library to access freedesktop.org standards
  PyXDG contains implementations of freedesktop.org standards in Python:
  .

Modified: packages/pyxdg/trunk/debian/patches/series
===================================================================
--- packages/pyxdg/trunk/debian/patches/series	2012-03-09 10:46:43 UTC (rev 20703)
+++ packages/pyxdg/trunk/debian/patches/series	2012-03-09 16:58:48 UTC (rev 20704)
@@ -4,3 +4,4 @@
 fix-BaseDirectory-empty-vars.patch
 fix-583497.patch
 fix-string-exceptions.patch
+set_default_menu.diff

Added: packages/pyxdg/trunk/debian/patches/set_default_menu.diff
===================================================================
--- packages/pyxdg/trunk/debian/patches/set_default_menu.diff	                        (rev 0)
+++ packages/pyxdg/trunk/debian/patches/set_default_menu.diff	2012-03-09 16:58:48 UTC (rev 20704)
@@ -0,0 +1,30 @@
+Description: Set default menu to be parsed
+ Upstream defaults to applications.menu, which isn't provided by Debian. We'll
+ try upstream's default, falling back to debian-menu.menu if it doesn't exist.
+Author: Ryan Kavanagh <rak at debian.org>
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/654978
+Forwarded: no
+Last-Update: 2012-03-09
+Index: pyxdg-0.19/xdg/Menu.py
+===================================================================
+--- pyxdg-0.19.orig/xdg/Menu.py	2009-10-28 13:20:44.000000000 -0400
++++ pyxdg-0.19/xdg/Menu.py	2012-03-09 07:08:18.703636175 -0500
+@@ -499,8 +499,17 @@
+ 
+     # use default if no filename given
+     if not filename: 
++        # Upstream's default, we leave it as default in case someone produces
++        # their own applications.menu and is depending on it.
+         candidate = os.environ.get('XDG_MENU_PREFIX', '') + "applications.menu"
+         filename = __getFileName(candidate)
++        # Since applications.menu isn't provided in Debian, we'll fallback to
++        # debian.menu, typically in /etc/xdg/menus/debian-menu.menu
++        # (Closes: #654978)
++        if not filename:
++            candidate = os.environ.get('XDG_MENU_PREFIX', '') + \
++                                                            "debian-menu.menu"
++            filename = __getFileName(candidate)
+         
+     if not filename:
+         raise ParsingError('File not found', "/etc/xdg/menus/%s" % candidate)