diff -u policykit-gnome-0.8/debian/changelog policykit-gnome-0.8/debian/changelog --- policykit-gnome-0.8/debian/changelog +++ policykit-gnome-0.8/debian/changelog @@ -1,3 +1,17 @@ +policykit-gnome (0.8-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable (LP: #232236), remaining changes: + - Add 03-fix_i18n.patch to set the translation domain. + This is fixed upstream and should be in the next release. + * Increase the Build-Depends on libpolkit* to 0.8, as that + is required to build. + * Add XFCE to the .desktop file as Xubuntu have requested + that it be available to them. Upstream is aware of the issue, but + may wish to keep the current state of the art, as in other places + Xfce users don't want to see it. (LP: #232234) + + -- James Westby Tue, 20 May 2008 16:52:46 +0200 + policykit-gnome (0.8-1) unstable; urgency=low * New upstream release. @@ -8,6 +22,12 @@ -- Michael Biebl Fri, 18 Apr 2008 02:21:22 +0200 +policykit-gnome (0.7-2ubuntu1) hardy; urgency=low + + * Add 03-fix_i18n.patch to set the translation domain. (LP: #199255) + + -- Timo Jyrinki Sun, 06 Apr 2008 21:36:10 +0300 + policykit-gnome (0.7-2) unstable; urgency=low * Upload to unstable. diff -u policykit-gnome-0.8/debian/control policykit-gnome-0.8/debian/control --- policykit-gnome-0.8/debian/control +++ policykit-gnome-0.8/debian/control @@ -1,9 +1,10 @@ Source: policykit-gnome Section: gnome Priority: optional -Maintainer: Utopia Maintenance Team +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Utopia Maintenance Team Uploaders: Michael Biebl -Build-Depends: cdbs, debhelper (>= 5), autotools-dev, pkg-config, libgtk2.0-dev (>= 2.12.0), libgnome2-dev (>= 2.14.0), libgnomeui-dev (>= 2.14.0), libdbus-glib-1-dev (>= 0.71), libpolkit-dbus-dev (>= 0.7), libpolkit-grant-dev (>= 0.7), libsexy-dev (>= 0.1.11), gtk-doc-tools, gnome-doc-utils, libxml-parser-perl +Build-Depends: cdbs, debhelper (>= 5), autotools-dev, pkg-config, libgtk2.0-dev (>= 2.12.0), libgnome2-dev (>= 2.14.0), libgnomeui-dev (>= 2.14.0), libdbus-glib-1-dev (>= 0.71), libpolkit-dbus-dev (>= 0.8), libpolkit-grant-dev (>= 0.8), libsexy-dev (>= 0.1.11), gtk-doc-tools, gnome-doc-utils, libxml-parser-perl Standards-Version: 3.7.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/policykit-gnome Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/policykit-gnome only in patch2: unchanged: --- policykit-gnome-0.8.orig/debian/patches/04-add-xfce.patch +++ policykit-gnome-0.8/debian/patches/04-add-xfce.patch @@ -0,0 +1,10 @@ +diff -Nur -x '*.orig' -x '*~' policykit-gnome-0.8/data/polkit-gnome-authorization.desktop.in policykit-gnome-0.8.new/data/polkit-gnome-authorization.desktop.in +--- policykit-gnome-0.8/data/polkit-gnome-authorization.desktop.in 2008-05-20 16:58:57.000000000 +0200 ++++ policykit-gnome-0.8.new/data/polkit-gnome-authorization.desktop.in 2008-05-20 16:59:10.000000000 +0200 +@@ -7,5 +7,5 @@ + Terminal=false + Type=Application + Categories=GNOME;System;Settings; +-OnlyShowIn=GNOME; ++OnlyShowIn=GNOME;XFCE; + StartupNotify=true only in patch2: unchanged: --- policykit-gnome-0.8.orig/debian/patches/03-fix_i18n.patch +++ policykit-gnome-0.8/debian/patches/03-fix_i18n.patch @@ -0,0 +1,15 @@ +# Description: Actually set the translation domain to have the application appear translated. +# Ubuntu: https://launchpad.net/bugs/199255 +--- policykit-gnome-0.7.orig/tools/polkit-gnome-authorization.c 2007-12-06 05:31:23.000000000 +0200 ++++ policykit-gnome-0.7/tools/polkit-gnome-authorization.c 2008-04-07 10:36:32.000000000 +0300 +@@ -2329,6 +2329,10 @@ + (GBoxedCopyFunc) polkit_policy_file_entry_ref, + (GBoxedFreeFunc) polkit_policy_file_entry_unref); + ++ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); ++ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); ++ textdomain (GETTEXT_PACKAGE); ++ + loop = g_main_loop_new (NULL, FALSE); + + pkgc = polkit_gnome_context_get (NULL);