diff -u alacarte-0.12.4/debian/control alacarte-0.12.4/debian/control --- alacarte-0.12.4/debian/control +++ alacarte-0.12.4/debian/control @@ -1,8 +1,9 @@ Source: alacarte Section: utils Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: Jordi Mallach , Josselin Mouette +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Andrea Veri , Debian GNOME Maintainers , Jordi Mallach , Josselin Mouette Build-Depends: cdbs (>= 0.4.41), autotools-dev, debhelper (>= 5.0.37.1), diff -u alacarte-0.12.4/debian/rules alacarte-0.12.4/debian/rules --- alacarte-0.12.4/debian/rules +++ alacarte-0.12.4/debian/rules @@ -14,0 +15,2 @@ + echo 'X-Ubuntu-Gettext-Domain=alacarte' >> debian/alacarte/usr/share/applications/alacarte.desktop + cd po; intltool-update -p --gettext-package=alacarte diff -u alacarte-0.12.4/debian/changelog alacarte-0.12.4/debian/changelog --- alacarte-0.12.4/debian/changelog +++ alacarte-0.12.4/debian/changelog @@ -1,3 +1,19 @@ +alacarte (0.12.4-1ubuntu1) lucid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches/03_correct_translations_initialization.patch: + - patch made to correctly initialize the translations + - debian/patches/01_properties_button.patch: + - patch for adding "properties" and "delete" buttons + - debian/rules: + - add gettext domain to desktop file and run intltool-update + during the build. + - debian/preinst: + - updated transition version, since it looks like we updated + this package before Debian. + + -- Andrea Veri Wed, 21 Oct 2009 19:52:00 +0100 + alacarte (0.12.4-1) unstable; urgency=low * New upstream release. @@ -5,6 +21,55 @@ -- Josselin Mouette Sat, 26 Sep 2009 02:30:06 +0200 +alacarte (0.12.4-0ubuntu2) karmic; urgency=low + + * debian/patches/03_correct_translations_initialization.patch: + - git change to correctly initialize the translations + (lp: #435878) + + -- Sebastien Bacher Mon, 05 Oct 2009 14:01:41 +0200 + +alacarte (0.12.4-0ubuntu1) karmic; urgency=low + + * New upstream version + + -- Sebastien Bacher Mon, 21 Sep 2009 13:52:53 +0200 + +alacarte (0.12.3-0ubuntu2) karmic; urgency=low + + * debian/rules: + - correct dh_python duplicate call to fix build issue + + -- Sebastien Bacher Wed, 09 Sep 2009 12:20:05 +0200 + +alacarte (0.12.3-0ubuntu1) karmic; urgency=low + + * New upstream version + * debian/control.in: + - updated gnome-menus requirement + + -- Sebastien Bacher Wed, 09 Sep 2009 11:38:27 +0200 + +alacarte (0.12.2-0ubuntu1) karmic; urgency=low + + * New upstream version: + - Use the display name from X-GNOME-FullName when possible + + -- Sebastien Bacher Tue, 08 Sep 2009 13:20:31 +0200 + +alacarte (0.12.1-1ubuntu1) karmic; urgency=low + + * Sync on Debian + * debian/patches/01_properties_button.patch: + - add "properties" and "delete" buttons + * debian/preinst: + - updated transition version + * debian/rules: + - add gettext domain to desktop file and run intltool-update + during the build. + + -- Sebastien Bacher Tue, 02 Jun 2009 14:09:33 +0200 + alacarte (0.12.1-1) unstable; urgency=low * New upstream release. @@ -326,7 +391,7 @@ - cdbs and debhelper moved to Build-Depends -- Gustavo Franco Mon, 21 Aug 2006 11:28:15 -0300 - + alacarte (0.8-3) unstable; urgency=low * debian/control: build-essential removed (thanks Joerg) diff -u alacarte-0.12.4/debian/control.in alacarte-0.12.4/debian/control.in --- alacarte-0.12.4/debian/control.in +++ alacarte-0.12.4/debian/control.in @@ -1,7 +1,8 @@ Source: alacarte Section: utils Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: cdbs (>= 0.4.41), autotools-dev, diff -u alacarte-0.12.4/debian/preinst alacarte-0.12.4/debian/preinst --- alacarte-0.12.4/debian/preinst +++ alacarte-0.12.4/debian/preinst @@ -1,7 +1,7 @@ #! /bin/sh set -e -if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt 0.12; then +if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt 0.12.1-1; then pycentral pkgremove alacarte fi only in patch2: unchanged: --- alacarte-0.12.4.orig/debian/patches/01_properties_button.patch +++ alacarte-0.12.4/debian/patches/01_properties_button.patch @@ -0,0 +1,82 @@ +diff -Nurp alacarte-0.12.1/Alacarte/MainWindow.py alacarte-0.12.1.new/Alacarte/MainWindow.py +--- alacarte-0.12.1/Alacarte/MainWindow.py 2009-05-04 15:55:43.000000000 +0200 ++++ alacarte-0.12.1.new/Alacarte/MainWindow.py 2009-05-12 02:07:28.000000000 +0200 +@@ -387,6 +387,8 @@ class MainWindow: + self.tree.get_object('move_up_button').set_sensitive(False) + self.tree.get_object('move_down_button').set_sensitive(False) + self.tree.get_object('new_separator_button').set_sensitive(False) ++ self.tree.get_object('properties_button').set_sensitive(False) ++ self.tree.get_object('delete_button').set_sensitive(False) + + def on_menu_tree_drag_data_get(self, treeview, context, selection, target_id, etime): + menus, iter = treeview.get_selection().get_selected() +@@ -434,14 +436,17 @@ class MainWindow: + item = items[iter][3] + self.tree.get_object('edit_delete').set_sensitive(True) + self.tree.get_object('new_separator_button').set_sensitive(True) ++ self.tree.get_object('delete_button').set_sensitive(True) + if self.editor.canRevert(item): + self.tree.get_object('edit_revert_to_original').set_sensitive(True) + else: + self.tree.get_object('edit_revert_to_original').set_sensitive(False) + if not item.get_type() == gmenu.TYPE_SEPARATOR: + self.tree.get_object('edit_properties').set_sensitive(True) ++ self.tree.get_object('properties_button').set_sensitive(True) + else: + self.tree.get_object('edit_properties').set_sensitive(False) ++ self.tree.get_object('properties_button').set_sensitive(False) + + # If first item... + if items.get_path(iter)[0] == 0: +@@ -609,6 +614,11 @@ class MainWindow: + pass + gobject.timeout_add(10, self.quit) + ++ def on_properties_button_clicked(self, button): ++ self.on_edit_properties_activate(None) ++ def on_delete_button_clicked(self, button): ++ self.on_edit_delete_activate(None) ++ + def on_style_set(self, *args): + self.loadUpdates() + +diff -Nurp alacarte-0.12.1/data/alacarte.ui alacarte-0.12.1.new/data/alacarte.ui +--- alacarte-0.12.1/data/alacarte.ui 2009-05-04 15:55:43.000000000 +0200 ++++ alacarte-0.12.1.new/data/alacarte.ui 2009-05-12 02:07:43.000000000 +0200 +@@ -610,6 +610,36 @@ + + + ++ ++ ++ gtk-properties ++ True ++ True ++ True ++ True ++ ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ gtk-delete ++ True ++ True ++ True ++ True ++ ++ ++ ++ False ++ False ++ 3 ++ ++ + + + only in patch2: unchanged: --- alacarte-0.12.4.orig/debian/patches/03_correct_translations_initialization.patch +++ alacarte-0.12.4/debian/patches/03_correct_translations_initialization.patch @@ -0,0 +1,18 @@ +diff --git a/Alacarte/MainWindow.py b/Alacarte/MainWindow.py +index 7b7cd35..e43ea9a 100644 +--- a/Alacarte/MainWindow.py ++++ b/Alacarte/MainWindow.py +@@ -23,8 +23,8 @@ import subprocess + import urllib + try: + from Alacarte import config +- gettext.bindtextdomain(GETTEXT_PACKAGE,config.localedir) +- gettext.textdomain(GETTEXT_PACKAGE) ++ gettext.bindtextdomain(config.GETTEXT_PACKAGE,config.localedir) ++ gettext.textdomain(config.GETTEXT_PACKAGE) + except: + pass + _ = gettext.gettext +-- +cgit v0.8.2 +