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

[mitya57-guest at users.alioth.debian.org]

    Date: Thursday, March 7, 2013 @ 15:20:10
  Author: mitya57-guest
Revision: 23671

Unify patches naming (use .patch extension, and dashes in file name)

Added:
  packages/pyxdg/trunk/debian/patches/set-default-menu.patch
    (from rev 23670, packages/pyxdg/trunk/debian/patches/set_default_menu.diff)
Modified:
  packages/pyxdg/trunk/debian/changelog
  packages/pyxdg/trunk/debian/patches/series
Deleted:
  packages/pyxdg/trunk/debian/patches/set_default_menu.diff

Modified: packages/pyxdg/trunk/debian/changelog
===================================================================
--- packages/pyxdg/trunk/debian/changelog	2013-03-06 23:34:54 UTC (rev 23670)
+++ packages/pyxdg/trunk/debian/changelog	2013-03-07 15:20:10 UTC (rev 23671)
@@ -1,3 +1,15 @@
+pyxdg (0.25-1ubuntu1) UNRELEASED; urgency=low
+
+  * Team upload.
+
+  [ Thomas Kluyver ]
+  * Don't use nosetests-x.y scripts for tests.
+
+  [ Dmitry Shachnev ]
+  * Unify patches naming (use .patch extension, and dashes in file name).
+
+ -- Dmitry Shachnev <mitya57 at gmail.com>  Thu, 07 Mar 2013 19:17:04 +0400
+
 pyxdg (0.25-1) experimental; urgency=low
 
   [ Thomas Kluyver ]

Modified: packages/pyxdg/trunk/debian/patches/series
===================================================================
--- packages/pyxdg/trunk/debian/patches/series	2013-03-06 23:34:54 UTC (rev 23670)
+++ packages/pyxdg/trunk/debian/patches/series	2013-03-07 15:20:10 UTC (rev 23671)
@@ -1,2 +1,2 @@
 fix-DesktopEntry-docstring.patch
-set_default_menu.diff
+set-default-menu.patch

Copied: packages/pyxdg/trunk/debian/patches/set-default-menu.patch (from rev 23670, packages/pyxdg/trunk/debian/patches/set_default_menu.diff)
===================================================================
--- packages/pyxdg/trunk/debian/patches/set-default-menu.patch	                        (rev 0)
+++ packages/pyxdg/trunk/debian/patches/set-default-menu.patch	2013-03-07 15:20:10 UTC (rev 23671)
@@ -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)

Deleted: packages/pyxdg/trunk/debian/patches/set_default_menu.diff
===================================================================
--- packages/pyxdg/trunk/debian/patches/set_default_menu.diff	2013-03-06 23:34:54 UTC (rev 23670)
+++ packages/pyxdg/trunk/debian/patches/set_default_menu.diff	2013-03-07 15:20:10 UTC (rev 23671)
@@ -1,30 +0,0 @@
-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)