r35497 - in /packages/unstable/alacarte/debian: changelog control patches/03-bind_textdomain_codeset.patch patches/40-xdg-menu-prefix patches/50-git_editable_top_level_menus patches/series

Fri Jun 29 10:48:25 UTC 2012

Author: laney
Date: Fri Jun 29 10:48:25 2012
New Revision: 35497

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35497
Log:
New upstream release

Removed:
    packages/unstable/alacarte/debian/patches/50-git_editable_top_level_menus
Modified:
    packages/unstable/alacarte/debian/changelog
    packages/unstable/alacarte/debian/control
    packages/unstable/alacarte/debian/patches/03-bind_textdomain_codeset.patch
    packages/unstable/alacarte/debian/patches/40-xdg-menu-prefix
    packages/unstable/alacarte/debian/patches/series

Modified: packages/unstable/alacarte/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/alacarte/debian/changelog?rev=35497&op=diff
==============================================================================

--- packages/unstable/alacarte/debian/changelog [utf-8] (original)
+++ packages/unstable/alacarte/debian/changelog [utf-8] Fri Jun 29 10:48:25 2012
@@ -1,8 +1,12 @@
-alacarte (0.13.4-3) UNRELEASED; urgency=low
-
-  * Depend on python-gi 
-
- -- Iain Lane <laney at debian.org>  Tue, 05 Jun 2012 23:50:56 +0100
+alacarte (3.5.3-1) UNRELEASED; urgency=low
+
+  * New upstream release
+    + Don't fail when loading a non-existant icon
+    + Fix spurious crashes and asserts by removing the visible_tree stuff
+    + Fix separator support
+  * Refresh patches to apply cleanly 
+
+ -- Iain Lane <laney at debian.org>  Fri, 29 Jun 2012 11:43:50 +0100
 
 alacarte (0.13.4-2) unstable; urgency=low
 

Modified: packages/unstable/alacarte/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/alacarte/debian/control?rev=35497&op=diff
==============================================================================
--- packages/unstable/alacarte/debian/control [utf-8] (original)
+++ packages/unstable/alacarte/debian/control [utf-8] Fri Jun 29 10:48:25 2012
@@ -7,7 +7,7 @@
 Section: utils
 Priority: optional
 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>, Michael Biebl <biebl at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: cdbs (>= 0.4.90~),
                autotools-dev,
                debhelper (>= 8),

Modified: packages/unstable/alacarte/debian/patches/03-bind_textdomain_codeset.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/alacarte/debian/patches/03-bind_textdomain_codeset.patch?rev=35497&op=diff
==============================================================================
--- packages/unstable/alacarte/debian/patches/03-bind_textdomain_codeset.patch [utf-8] (original)
+++ packages/unstable/alacarte/debian/patches/03-bind_textdomain_codeset.patch [utf-8] Fri Jun 29 10:48:25 2012
@@ -1,17 +1,16 @@
 Debian #552528
 
-Index: alacarte-0.13.4/Alacarte/MainWindow.py
+Index: alacarte-3.5.3/Alacarte/MainWindow.py
 ===================================================================
---- alacarte-0.13.4.orig/Alacarte/MainWindow.py	2012-06-01 15:46:13.000000000 +0100
-+++ alacarte-0.13.4/Alacarte/MainWindow.py	2012-06-04 16:04:38.206538136 +0100
-@@ -19,13 +19,14 @@
- 
+--- alacarte-3.5.3.orig/Alacarte/MainWindow.py	2012-06-25 11:59:25.879475759 +1200
++++ alacarte-3.5.3/Alacarte/MainWindow.py	2012-06-25 11:59:31.287475573 +1200
+@@ -20,12 +20,13 @@
  from gi.repository import Gtk, GObject, Gio, GdkPixbuf, Gdk, GMenu, GLib
- import cgi, os
+ import cgi
+ import os
 -import gettext
 +import gettext, locale
  import subprocess
- import urllib
  
  from Alacarte import config
  gettext.bindtextdomain(config.GETTEXT_PACKAGE, config.localedir)

Modified: packages/unstable/alacarte/debian/patches/40-xdg-menu-prefix
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/alacarte/debian/patches/40-xdg-menu-prefix?rev=35497&op=diff
==============================================================================
--- packages/unstable/alacarte/debian/patches/40-xdg-menu-prefix [utf-8] (original)
+++ packages/unstable/alacarte/debian/patches/40-xdg-menu-prefix [utf-8] Fri Jun 29 10:48:25 2012
@@ -4,17 +4,16 @@
 Forwarded: not-needed
 Bug-Debian: http://bugs.debian.org/676137
 
-Index: alacarte-0.13.4/Alacarte/MenuEditor.py
+Index: b/Alacarte/MenuEditor.py
 ===================================================================
---- alacarte-0.13.4.orig/Alacarte/MenuEditor.py	2012-06-01 07:32:20.000000000 +0100
-+++ alacarte-0.13.4/Alacarte/MenuEditor.py	2012-06-05 19:14:20.650236041 +0100
-@@ -48,7 +48,8 @@
+--- a/Alacarte/MenuEditor.py
++++ b/Alacarte/MenuEditor.py
+@@ -24,6 +24,8 @@
  
  class MenuEditor(object):
-     def __init__(self):
--        self.applications = Menu('applications.menu')
+     def __init__(self, name='applications.menu'):
 +        menu_prefix = os.getenv('XDG_MENU_PREFIX') or 'gnome-'
-+        self.applications = Menu(menu_prefix + 'applications.menu')
-         self.applications.tree.connect('changed', self.menuChanged)
++        name = menu_prefix + name
+         self.name = name
  
-     def menuChanged(self, *a):
+         self.tree = GMenu.Tree.new(name, GMenu.TreeFlags.SHOW_EMPTY|GMenu.TreeFlags.INCLUDE_EXCLUDED|GMenu.TreeFlags.INCLUDE_NODISPLAY|GMenu.TreeFlags.SHOW_ALL_SEPARATORS|GMenu.TreeFlags.SORT_DISPLAY_NAME)

Modified: packages/unstable/alacarte/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/alacarte/debian/patches/series?rev=35497&op=diff
==============================================================================
--- packages/unstable/alacarte/debian/patches/series [utf-8] (original)
+++ packages/unstable/alacarte/debian/patches/series [utf-8] Fri Jun 29 10:48:25 2012
@@ -1,4 +1,3 @@
 03-bind_textdomain_codeset.patch
 30-python_private_dir.patch
 40-xdg-menu-prefix
-50-git_editable_top_level_menus


