r35265 - in /packages/unstable/alacarte/debian: ./ patches/

laney at users.alioth.debian.org laney at users.alioth.debian.org
Mon Jun 4 15:17:07 UTC 2012 

Author: laney
Date: Mon Jun  4 15:17:05 2012
New Revision: 35265

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35265
Log:
* New upstream release
* Drop several patches applied upstream / obsoleted and refresh the rest.
* Switch to python-gi, per upstream.
* Bump BD to libgnome-menu-3-dev, also per upstream.

Removed:
    packages/unstable/alacarte/debian/patches/01-new_item_location.patch
    packages/unstable/alacarte/debian/patches/02-fix_delete_undo.patch
    packages/unstable/alacarte/debian/patches/10_settings_menu.patch
Modified:
    packages/unstable/alacarte/debian/changelog
    packages/unstable/alacarte/debian/control
    packages/unstable/alacarte/debian/control.in
    packages/unstable/alacarte/debian/patches/03-bind_textdomain_codeset.patch
    packages/unstable/alacarte/debian/patches/30-python_private_dir.patch
    packages/unstable/alacarte/debian/patches/series
    packages/unstable/alacarte/debian/watch

Modified: packages/unstable/alacarte/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/alacarte/debian/changelog?rev=35265&op=diff
==============================================================================
--- packages/unstable/alacarte/debian/changelog [utf-8] (original)
+++ packages/unstable/alacarte/debian/changelog [utf-8] Mon Jun  4 15:17:05 2012
@@ -1,13 +1,17 @@
-alacarte (0.13.2-4) UNRELEASED; urgency=low
+alacarte (0.13.4-1) UNRELEASED; urgency=low
 
   [ Josselin Mouette ]
   * Replace python-gobject by python-gobject-2.
   * Update repository URL.
 
   [ Iain Lane ]
+  * New upstream release
   * Switch to dh_python2
-
- -- Josselin Mouette <joss at debian.org>  Thu, 24 Nov 2011 21:20:52 +0100
+  * Drop several patches applied upstream / obsoleted and refresh the rest.
+  * Switch to python-gi, per upstream.
+  * Bump BD to libgnome-menu-3-dev, also per upstream.
+
+ -- Iain Lane <laney at debian.org>  Mon, 04 Jun 2012 15:31:23 +0100
 
 alacarte (0.13.2-3) unstable; urgency=low
 

Modified: packages/unstable/alacarte/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/alacarte/debian/control?rev=35265&op=diff
==============================================================================
--- packages/unstable/alacarte/debian/control [utf-8] (original)
+++ packages/unstable/alacarte/debian/control [utf-8] Mon Jun  4 15:17:05 2012
@@ -16,11 +16,10 @@
                gnome-pkg-tools
 Build-Depends-Indep: intltool (>= 0.40.0),
                      gettext,
-                     libgnome-menu-dev (>= 2.27.92),
-                     python-gtk2 (>= 2.13.0),
-                     python-gobject-2 (>= 2.15.1)
+                     libgnome-menu-3-dev (>= 3.2.0.1),
+                     python-gi-dev
 X-Python-Version: >= 2.4
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/packages/unstable/alacarte
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/alacarte
 
@@ -28,10 +27,10 @@
 Architecture: all
 Depends: ${python:Depends},
          ${misc:Depends},
-         python-gtk2 (>= 2.13.0),
-         python-gmenu (>= 2.27.92),
-         gnome-menus (>= 2.27.92),
-         python-gobject-2 (>= 2.15.1)
+         gir1.2-gtk-3.0,
+         gir1.2-gmenu-3.0,
+         gir1.2-glib-2.0,
+         gir1.2-gdkpixbuf-2.0
 Recommends: gnome-panel
 Description: easy GNOME menu editing tool
  Alacarte is an easy-to-use menu editor for GNOME that can add

Modified: packages/unstable/alacarte/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/alacarte/debian/control.in?rev=35265&op=diff
==============================================================================
--- packages/unstable/alacarte/debian/control.in [utf-8] (original)
+++ packages/unstable/alacarte/debian/control.in [utf-8] Mon Jun  4 15:17:05 2012
@@ -11,11 +11,10 @@
                gnome-pkg-tools
 Build-Depends-Indep: intltool (>= 0.40.0),
                      gettext,
-                     libgnome-menu-dev (>= 2.27.92),
-                     python-gtk2 (>= 2.13.0),
-                     python-gobject-2 (>= 2.15.1)
+                     libgnome-menu-3-dev (>= 3.2.0.1),
+                     python-gi-dev
 X-Python-Version: >= 2.4
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/packages/unstable/alacarte
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/alacarte
 
@@ -23,10 +22,10 @@
 Architecture: all
 Depends: ${python:Depends},
          ${misc:Depends},
-         python-gtk2 (>= 2.13.0),
-         python-gmenu (>= 2.27.92),
-         gnome-menus (>= 2.27.92),
-         python-gobject-2 (>= 2.15.1)
+         gir1.2-gtk-3.0,
+         gir1.2-gmenu-3.0,
+         gir1.2-glib-2.0,
+         gir1.2-gdkpixbuf-2.0
 Recommends: gnome-panel
 Description: easy GNOME menu editing tool
  Alacarte is an easy-to-use menu editor for GNOME that can add

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=35265&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] Mon Jun  4 15:17:05 2012
@@ -1,22 +1,22 @@
 Debian #552528
 
-Index: alacarte-0.13.1/Alacarte/MainWindow.py
+Index: alacarte-0.13.4/Alacarte/MainWindow.py
 ===================================================================
---- alacarte-0.13.1.orig/Alacarte/MainWindow.py	2010-04-03 13:03:35.000000000 +0200
-+++ alacarte-0.13.1/Alacarte/MainWindow.py	2010-04-03 13:08:50.767468334 +0200
-@@ -18,13 +18,14 @@
+--- 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 @@
  
- import gtk, gmenu, gobject, gio
+ from gi.repository import Gtk, GObject, Gio, GdkPixbuf, Gdk, GMenu, GLib
  import cgi, os
 -import gettext
 +import gettext, locale
  import subprocess
  import urllib
- try:
- 	from Alacarte import config
- 	gettext.bindtextdomain(config.GETTEXT_PACKAGE,config.localedir)
- 	gettext.textdomain(config.GETTEXT_PACKAGE)
-+	locale.bind_textdomain_codeset(config.GETTEXT_PACKAGE,'UTF-8')
- except:
- 	pass
+ 
+ from Alacarte import config
+ gettext.bindtextdomain(config.GETTEXT_PACKAGE, config.localedir)
+ gettext.textdomain(config.GETTEXT_PACKAGE)
++locale.bind_textdomain_codeset(config.GETTEXT_PACKAGE,'UTF-8')
+ 
  _ = gettext.gettext
+ from Alacarte.MenuEditor import MenuEditor

Modified: packages/unstable/alacarte/debian/patches/30-python_private_dir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/alacarte/debian/patches/30-python_private_dir.patch?rev=35265&op=diff
==============================================================================
--- packages/unstable/alacarte/debian/patches/30-python_private_dir.patch [utf-8] (original)
+++ packages/unstable/alacarte/debian/patches/30-python_private_dir.patch [utf-8] Mon Jun  4 15:17:05 2012
@@ -1,7 +1,7 @@
-Index: alacarte-0.12.4/alacarte.in
+Index: alacarte-0.13.4/alacarte.in
 ===================================================================
---- alacarte-0.12.4.orig/alacarte.in	2010-02-27 14:08:06.801032929 +0100
-+++ alacarte-0.12.4/alacarte.in	2010-02-27 14:14:56.900530062 +0100
+--- alacarte-0.13.4.orig/alacarte.in	2012-06-04 16:04:40.606538031 +0100
++++ alacarte-0.13.4/alacarte.in	2012-06-04 16:04:48.594537680 +0100
 @@ -19,6 +19,7 @@
  #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  

Modified: packages/unstable/alacarte/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/alacarte/debian/patches/series?rev=35265&op=diff
==============================================================================
--- packages/unstable/alacarte/debian/patches/series [utf-8] (original)
+++ packages/unstable/alacarte/debian/patches/series [utf-8] Mon Jun  4 15:17:05 2012
@@ -1,5 +1,2 @@
-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: packages/unstable/alacarte/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/alacarte/debian/watch?rev=35265&op=diff
==============================================================================
--- packages/unstable/alacarte/debian/watch [utf-8] (original)
+++ packages/unstable/alacarte/debian/watch [utf-8] Mon Jun  4 15:17:05 2012
@@ -1,2 +1,2 @@
 version=3
-http://ftp.gnome.org/pub/gnome/sources/alacarte/([\d\.]+)/alacarte-([\d\.]+)\.tar\.bz2
+http://ftp.gnome.org/pub/gnome/sources/alacarte/([\d\.]+)/alacarte-([\d\.]+)\.tar\.xz

More information about the pkg-gnome-commits mailing list