Merge lp:~cyphermox/policykit-1-gnome/merge-debian-0.101-2 into lp:~ubuntu-desktop/policykit-1-gnome/ubuntu

[Mathieu Trudel-Lapierre]

Merge with Debian 0.101-2

[Mathieu Trudel-Lapierre (cyphermox)]

Please see the merge bug for debdiffs.

[Martin Pitt (pitti)]

Thanks! I'll merge this and also try to build against GTK 3 for the next oneiric upload.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-21 16:15:30 +0000
+++ debian/changelog	2011-05-05 16:43:38 +0000
@@ -1,3 +1,53 @@
+policykit-1-gnome (0.101-2ubuntu1) UNRELEASED; urgency=low
+
+  * Merge with Debian unstable; remaining changes (LP: #777366):
+    - 04-autorestart.patch: Add gnome session restart support to ensure we
+      always have an authentication agent running. To be forwarded upstream.
+    - 06-authentication-failure-string.patch: Improve error message displayed
+      when authentication fails.
+    - Tell the .desktop file for the authentication agent to auto-restart the
+      agent in case of failure.
+    - Use dh-autoreconf to reconfigure after applying patches, especially for
+      04-autorestart.patch.
+  * debian/patches/05-appindicator.patch: dropped, partly due to upstream
+    dropping status icon support. This also fixes usability bug (LP: #550502).
+  * debian/patches/04-autorestart.patch: refreshed to apply cleanly.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Thu, 05 May 2011 12:22:38 -0400
+
+policykit-1-gnome (0.101-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Michael Biebl <[e-mail]>  Fri, 25 Mar 2011 03:23:38 +0100
+
+policykit-1-gnome (0.101-1) experimental; urgency=low
+
+  * New upstream release.
+  * Update patches
+    - Drop debian/patches/01-fix-autostart.patch, obsolete.
+    - Drop debian/patches/03-po-pt_BR.patch, merged upstream.
+    - Refresh debian/patches/02-select-default-user.patch to apply cleanly.
+  * Switch from cdbs to dh.
+  * Bump debhelper compatibility level to 8.
+  * Install documentation using debian/policykit-1-gnome.docs.
+  * Ship a copy of the old autostart file for the PolicyKit authentication
+    agent. It was removed upstream in preparation for GNOME3 which starts its
+    own authentication agent.
+
+ -- Michael Biebl <[e-mail]>  Fri, 04 Mar 2011 00:19:00 +0100
+
+policykit-1-gnome (0.99-2) unstable; urgency=low
+
+  [ Robert Ancell ]
+  * Drop 03-dialog-focus.patch. PolicyKit does not allow non-root applications
+    to set details (LP: #685655)
+
+  [ Michael Biebl ]
+  * Upload to unstable.
+
+ -- Michael Biebl <[e-mail]>  Thu, 10 Feb 2011 19:51:33 +0100
+
 policykit-1-gnome (0.99-1ubuntu4) natty; urgency=low
 
   * debian/patches/04-autorestart.patch:

=== modified file 'debian/compat'
--- debian/compat	2010-08-19 03:34:40 +0000
+++ debian/compat	2011-05-05 16:43:38 +0000
@@ -1,1 +1,1 @@
-7
+8

=== modified file 'debian/control'
--- debian/control	2010-11-04 22:05:36 +0000
+++ debian/control	2011-05-05 16:43:38 +0000
@@ -4,12 +4,10 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Utopia Maintenance Team <[e-mail]>
 Uploaders: Michael Biebl <[e-mail]>, Martin Pitt <[e-mail]>
-Build-Depends: cdbs,
- debhelper (>= 7),
+Build-Depends: debhelper (>= 8),
  autotools-dev,
  pkg-config,
  dh-autoreconf,
- libappindicator-dev (>= 0.0.13),
  libdbus-glib-1-dev (>= 0.71),
  libgtk2.0-dev (>= 2.17.1),
  libpolkit-agent-1-dev (>= 0.97),

=== modified file 'debian/gbp.conf'
--- debian/gbp.conf	2010-11-04 22:05:36 +0000
+++ debian/gbp.conf	2011-05-05 16:43:38 +0000
@@ -1,2 +1,3 @@
 [DEFAULT]
-debian-branch = experimental
+pristine-tar = True
+debian-branch = master

=== removed file 'debian/patches/01-fix-autostart.patch'
--- debian/patches/01-fix-autostart.patch	2010-08-19 03:34:40 +0000
+++ debian/patches/01-fix-autostart.patch	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-# Description: Start auth agent in XFCE, too.
-# Ubuntu: https://launchpad.net/bugs/417462
-Index: policykit-gnome/src/polkit-gnome-authentication-agent-1.desktop.in.in
-===================================================================
---- policykit-gnome.orig/src/polkit-gnome-authentication-agent-1.desktop.in.in	2010-02-22 22:34:20.000000000 +0100
-+++ policykit-gnome/src/polkit-gnome-authentication-agent-1.desktop.in.in	2010-02-22 22:34:49.000000000 +0100
-@@ -6,4 +6,4 @@
- Type=Application
- Categories=
- NoDisplay=true
--OnlyShowIn=GNOME;
-+OnlyShowIn=GNOME;XFCE;

=== modified file 'debian/patches/02-select-default-user.patch'
--- debian/patches/02-select-default-user.patch	2010-11-04 22:05:36 +0000
+++ debian/patches/02-select-default-user.patch	2011-05-05 16:43:38 +0000
@@ -4,8 +4,8 @@
 
 Index: policykit-1-gnome/src/polkitgnomeauthenticationdialog.c
 ===================================================================
---- policykit-1-gnome.orig/src/polkitgnomeauthenticationdialog.c	2010-09-17 01:30:56.653585722 +0200
-+++ policykit-1-gnome/src/polkitgnomeauthenticationdialog.c	2010-09-17 01:35:49.527336311 +0200
+--- policykit-1-gnome.orig/src/polkitgnomeauthenticationdialog.c	2011-03-04 00:06:46.599981036 +0100
++++ policykit-1-gnome/src/polkitgnomeauthenticationdialog.c	2011-03-04 00:07:11.211981036 +0100
 @@ -138,7 +138,7 @@
  static void
  create_user_combobox (PolkitGnomeAuthenticationDialog *dialog)
@@ -50,7 +50,7 @@
  
    /* Listen when a new user is selected */
    g_signal_connect (GTK_WIDGET (combo),
-@@ -711,16 +719,13 @@
+@@ -719,16 +727,13 @@
    gtk_widget_set_tooltip_markup (label, s);
    g_free (s);
  

=== modified file 'debian/patches/04-autorestart.patch'
--- debian/patches/04-autorestart.patch	2011-02-21 16:14:30 +0000
+++ debian/patches/04-autorestart.patch	2011-05-05 16:43:38 +0000
@@ -3,19 +3,10 @@
 ## Author: Michael Vogt <[e-mail]>
 ## Origin: inspired by the at-spi dbus support code
 ## Bug: http://launchpad.net/bugs/623819
-Index: policykit-1-gnome-0.99/src/polkit-gnome-authentication-agent-1.desktop.in.in
-===================================================================
---- policykit-1-gnome-0.99.orig/src/polkit-gnome-authentication-agent-1.desktop.in.in	2011-02-21 16:10:25.000000000 +0000
-+++ policykit-1-gnome-0.99/src/polkit-gnome-authentication-agent-1.desktop.in.in	2011-02-21 16:10:26.000000000 +0000
-@@ -7,3 +7,4 @@
- Categories=
- NoDisplay=true
- OnlyShowIn=GNOME;XFCE;
-+X-GNOME-AutoRestart=true
-Index: policykit-1-gnome-0.99/src/main.c
-===================================================================
---- policykit-1-gnome-0.99.orig/src/main.c	2011-02-21 16:10:10.000000000 +0000
-+++ policykit-1-gnome-0.99/src/main.c	2011-02-21 16:10:28.000000000 +0000
+Index: policykit-1-gnome-0.101/src/main.c
+===================================================================
+--- policykit-1-gnome-0.101.orig/src/main.c	2011-03-03 13:44:49.000000000 -0500
++++ policykit-1-gnome-0.101/src/main.c	2011-05-05 12:16:40.144734966 -0400
 @@ -27,6 +27,7 @@
  #include <gtk/gtk.h>
  #include <glib/gi18n.h>
@@ -24,11 +15,11 @@
  
  #include "polkitgnomelistener.h"
  
-@@ -198,11 +199,131 @@
-   update_temporary_authorization_icon (authority);
- }
- 
-+// session management support for auto-restart 
+@@ -38,11 +39,131 @@
+ 
+ static GDBusConnection *session_bus_connection = NULL;
+ 
++// session management support for auto-restart
 +#define SM_DBUS_NAME      "org.gnome.SessionManager"
 +#define SM_DBUS_PATH      "/org/gnome/SessionManager"
 +#define SM_DBUS_INTERFACE "org.gnome.SessionManager"
@@ -157,20 +148,20 @@
    PolkitAgentListener *listener;
    GError *error;
  
-@@ -260,6 +381,8 @@
- 
-   update_temporary_authorization_icon (authority);
+@@ -101,6 +222,8 @@
+    */
+   session_bus_connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
  
 +  register_client_to_gnome_session();
 +
    g_main_loop_run (loop);
  
    ret = 0;
-Index: policykit-1-gnome-0.99/src/Makefile.am
+Index: policykit-1-gnome-0.101/src/Makefile.am
 ===================================================================
---- policykit-1-gnome-0.99.orig/src/Makefile.am	2011-02-21 16:10:10.000000000 +0000
-+++ policykit-1-gnome-0.99/src/Makefile.am	2011-02-21 16:10:28.000000000 +0000
-@@ -28,6 +28,7 @@
+--- policykit-1-gnome-0.101.orig/src/Makefile.am	2011-03-03 04:51:11.000000000 -0500
++++ policykit-1-gnome-0.101/src/Makefile.am	2011-05-05 12:14:56.894735008 -0400
+@@ -30,6 +30,7 @@
  	$(AM_CPPFLAGS)
  
  polkit_gnome_authentication_agent_1_CFLAGS = 		\
@@ -178,7 +169,7 @@
  	$(GTK_CFLAGS)					\
  	$(GCONF_CFLAGS)					\
  	$(POLKIT_AGENT_CFLAGS)				\
-@@ -39,6 +40,7 @@
+@@ -41,6 +42,7 @@
  	$(AM_LDFLAGS)
  
  polkit_gnome_authentication_agent_1_LDADD = 		\
@@ -186,11 +177,11 @@
  	$(GTK_LIBS)					\
  	$(GCONF_LIBS)					\
  	$(POLKIT_AGENT_LIBS)				\
-Index: policykit-1-gnome-0.99/configure.ac
+Index: policykit-1-gnome-0.101/configure.ac
 ===================================================================
---- policykit-1-gnome-0.99.orig/configure.ac	2011-02-21 16:10:10.000000000 +0000
-+++ policykit-1-gnome-0.99/configure.ac	2011-02-21 16:10:28.000000000 +0000
-@@ -136,6 +136,10 @@
+--- policykit-1-gnome-0.101.orig/configure.ac	2011-03-03 04:51:11.000000000 -0500
++++ policykit-1-gnome-0.101/configure.ac	2011-05-05 12:14:56.894735008 -0400
+@@ -155,6 +155,10 @@
  AC_SUBST(POLKIT_GOBJECT_CFLAGS)
  AC_SUBST(POLKIT_GOBJECT_LIBS)
  

=== removed file 'debian/patches/05-appindicator.patch'
--- debian/patches/05-appindicator.patch	2011-02-21 16:14:30 +0000
+++ debian/patches/05-appindicator.patch	1970-01-01 00:00:00 +0000
@@ -1,184 +0,0 @@
-Description: Support Application Indicators
-Author: Jan Arne Petersen <[e-mail]>
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=609680
-Bug-Ubuntu: https://launchpad.net/bugs/497881
-
-Index: policykit-1-gnome-0.99/configure.ac
-===================================================================
---- policykit-1-gnome-0.99.orig/configure.ac	2011-02-21 16:10:28.000000000 +0000
-+++ policykit-1-gnome-0.99/configure.ac	2011-02-21 16:10:54.000000000 +0000
-@@ -123,6 +123,7 @@
- GTK_REQUIRED=2.17.1
- POLKIT_AGENT_REQUIRED=0.97
- POLKIT_GOBJECT_REQUIRED=0.97
-+APPINDICATOR_REQUIRED=0.0.13
- 
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
- AC_SUBST(GTK_CFLAGS)
-@@ -146,6 +147,29 @@
- 
- AM_CONDITIONAL(BUILD_EXAMPLES, test "x$enable_examples" = "xyes")
- 
-+# Application indicator
-+AC_ARG_ENABLE([appindicator],
-+	      AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],[Build support for application indicators]),
-+	      [enable_appindicator=$enableval],
-+	      [enable_appindicator="auto"])
-+
-+
-+if test x$enable_appindicator = xauto ; then
-+	PKG_CHECK_EXISTS(appindicator-0.1 >= $APPINDICATOR_REQUIRED,
-+			 [enable_appindicator="yes"],
-+			 [enable_appindicator="no"])
-+fi
-+
-+if test x$enable_appindicator = xyes ; then
-+	PKG_CHECK_MODULES(APPINDICATOR,
-+			  [appindicator-0.1 >= $APPINDICATOR_REQUIRED],
-+			  [AC_DEFINE(HAVE_APPINDICATOR, 1, [Have AppIndicator])])
-+fi
-+
-+AM_CONDITIONAL(HAVE_APPINDICATOR, test x$enable_appindicator = xyes)
-+AC_SUBST(APPINDICATOR_CFLAGS)
-+AC_SUBST(APPINDICATOR_LIBS)
-+
- # GObject introspection
- #
- AC_ARG_ENABLE([introspection],
-@@ -214,6 +238,7 @@
-         cflags:                     ${CFLAGS}
-         cppflags:                   ${CPPFLAGS}
- 	introspection:		    ${enable_introspection}
-+        application indciator:      ${enable_appindicator}
- 
-         Maintainer mode:            ${USE_MAINTAINER_MODE}
-         Building api docs:          ${enable_gtk_doc}
-Index: policykit-1-gnome-0.99/src/Makefile.am
-===================================================================
---- policykit-1-gnome-0.99.orig/src/Makefile.am	2011-02-21 16:10:28.000000000 +0000
-+++ policykit-1-gnome-0.99/src/Makefile.am	2011-02-21 16:10:54.000000000 +0000
-@@ -33,6 +33,7 @@
- 	$(GCONF_CFLAGS)					\
- 	$(POLKIT_AGENT_CFLAGS)				\
- 	$(POLKIT_GOBJECT_CFLAGS)			\
-+	$(APPINDICATOR_CFLAGS)				\
- 	$(WARN_CFLAGS)					\
- 	$(AM_CFLAGS)
- 
-@@ -45,6 +46,7 @@
- 	$(GCONF_LIBS)					\
- 	$(POLKIT_AGENT_LIBS)				\
- 	$(POLKIT_GOBJECT_LIBS)				\
-+	$(APPINDICATOR_LIBS)				\
- 	$(INTLLIBS)
- 
- EXTRA_DIST = polkit-gnome-authentication-agent-1.desktop.in.in
-Index: policykit-1-gnome-0.99/src/main.c
-===================================================================
---- policykit-1-gnome-0.99.orig/src/main.c	2011-02-21 16:10:28.000000000 +0000
-+++ policykit-1-gnome-0.99/src/main.c	2011-02-21 16:10:54.000000000 +0000
-@@ -29,6 +29,10 @@
- #include <polkitagent/polkitagent.h>
- #include <dbus/dbus-glib.h>
- 
-+#ifdef HAVE_APPINDICATOR
-+#include <libappindicator/app-indicator.h>
-+#endif
-+
- #include "polkitgnomelistener.h"
- 
- /* the Authority */
-@@ -40,7 +44,11 @@
- /* the current set of temporary authorizations */
- static GList *current_temporary_authorizations = NULL;
- 
-+#ifdef HAVE_APPINDICATOR
-+static AppIndicator *app_indicator = NULL;
-+#else
- static GtkStatusIcon *status_icon = NULL;
-+#endif
- 
- static void
- revoke_tmp_authz_cb (GObject      *source_object,
-@@ -70,6 +78,14 @@
-                                                     NULL);
- }
- 
-+#ifdef HAVE_APPINDICATOR
-+static void
-+on_menu_item_activate (GtkMenuItem *menu_item,
-+                       gpointer     user_data)
-+{
-+  revoke_tmp_authz ();
-+}
-+#else
- static void
- on_status_icon_activate (GtkStatusIcon *status_icon,
-                          gpointer       user_data)
-@@ -85,6 +101,7 @@
- {
-   revoke_tmp_authz ();
- }
-+#endif
- 
- static void
- update_temporary_authorization_icon_real (void)
-@@ -122,6 +139,30 @@
-   if (current_temporary_authorizations != NULL)
-     {
-       /* show icon */
-+#ifdef HAVE_APPINDICATOR
-+      if (app_indicator == NULL)
-+        {
-+          GtkWidget *item, *menu;
-+
-+          app_indicator = app_indicator_new ("PolicyKit-gnome",
-+                                             "gtk-dialog-authentication",
-+                                             APP_INDICATOR_CATEGORY_SYSTEM_SERVICES);
-+
-+          item = gtk_menu_item_new_with_label (_("Drop all elevated privileges"));
-+          g_signal_connect (item,
-+                            "activate",
-+                            G_CALLBACK (on_menu_item_activate),
-+                            NULL);
-+          menu = gtk_menu_new ();
-+          gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-+          gtk_widget_show_all (menu);
-+
-+          app_indicator_set_menu (app_indicator,
-+                                  GTK_MENU (menu));
-+          app_indicator_set_status (app_indicator,
-+                                    APP_INDICATOR_STATUS_ACTIVE);          
-+        }
-+#else
-       if (status_icon == NULL)
-         {
-           status_icon = gtk_status_icon_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION);
-@@ -136,16 +177,27 @@
-                             G_CALLBACK (on_status_icon_popup_menu),
-                             NULL);
-         }
-+#endif
-     }
-   else
-     {
-       /* hide icon */
-+#ifdef HAVE_APPINDICATOR
-+      if (app_indicator != NULL)
-+        {
-+          app_indicator_set_status (app_indicator,
-+				    APP_INDICATOR_STATUS_PASSIVE);
-+          g_object_unref (app_indicator);
-+          app_indicator = NULL;
-+        }
-+#else
-       if (status_icon != NULL)
-         {
-           gtk_status_icon_set_visible (status_icon, FALSE);
-           g_object_unref (status_icon);
-           status_icon = NULL;
-         }
-+#endif
-     }
- }
- 

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-12-23 06:08:01 +0000
+++ debian/patches/series	2011-05-05 16:43:38 +0000
@@ -1,6 +1,4 @@
 # Debian patches for policykit-1-gnome
-01-fix-autostart.patch
 02-select-default-user.patch
 04-autorestart.patch
-05-appindicator.patch
 06-authentication-failure-string.patch

=== added file 'debian/policykit-1-gnome.docs'
--- debian/policykit-1-gnome.docs	1970-01-01 00:00:00 +0000
+++ debian/policykit-1-gnome.docs	2011-05-05 16:43:38 +0000
@@ -0,0 +1,4 @@
+AUTHORS
+NEWS
+README
+TODO

=== modified file 'debian/policykit-1-gnome.install'
--- debian/policykit-1-gnome.install	2010-08-19 03:34:40 +0000
+++ debian/policykit-1-gnome.install	2011-05-05 16:43:38 +0000
@@ -1,3 +1,3 @@
 usr/lib/policykit-1-gnome/
-etc/xdg/autostart/
 usr/share/locale/
+debian/polkit-gnome-authentication-agent-1.desktop etc/xdg/autostart/

=== added file 'debian/polkit-gnome-authentication-agent-1.desktop'
--- debian/polkit-gnome-authentication-agent-1.desktop	1970-01-01 00:00:00 +0000
+++ debian/polkit-gnome-authentication-agent-1.desktop	2011-05-05 16:43:38 +0000
@@ -0,0 +1,88 @@
+[Desktop Entry]
+Name=PolicyKit Authentication Agent
+Name[ar]=مدير الاستيثاق PolicyKit
+Name[be]=PolicyKit - аґент аўтэнтыфікацыі
+Name[bn_IN]=PolicyKit অনুমোদনের এজেন্ট
+Name[ca]=Agent d'autenticació del PolicyKit
+Name[cs]=Ověřovací agent PolicyKit
+Name[da]=Godkendelsesprogrammet PolicyKit
+Name[de]=Legitimationsdienst von PolicyKit
+Name[el]=Πράκτορας πιστοποίησης PolicyKit
+Name[en_GB]=PolicyKit Authentication Agent
+Name[es]=Agente de autenticación de PolicyKit
+Name[eu]=PolicyKit autentifikatzeko agentea
+Name[fi]=PolicytKit-tunnistautumisohjelma
+Name[fr]=Agent d'authentification de PolicyKit
+Name[gl]=Axente de autenticación PolicyKit
+Name[gu]=PolicyKit સત્તાધિકરણ એજન્ટ
+Name[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि
+Name[hu]=PolicyKit hitelesítési ügynök
+Name[it]=Agente di autenticazione per PolicyKit
+Name[ja]=PolicyKit 認証エージェント
+Name[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ
+Name[lt]=PolicyKit tapatybės nustatymo agentas
+Name[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന്‍ ഏജന്റ്
+Name[mr]=PolicyKit ऑथेंटीकेशन एजेंट
+Name[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ
+Name[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ
+Name[pl]=Agent uwierzytelniania PolicyKit
+Name[pt]=Agente de Autenticação PolicyKit
+Name[pt_BR]=Agente de autenticação PolicyKit
+Name[ro]=Agent de autentificare PolicyKit
+Name[sk]=Agent PolicyKit na overovanie totožnosti
+Name[sl]=PolicyKit program overjanja
+Name[sv]=Autentiseringsagent för PolicyKit
+Name[ta]=PolicyKit அங்கீகார முகவர்
+Name[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి
+Name[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit
+Name[uk]=Агент автентифікації PolicyKit
+Name[zh_CN]=PolicyKit 认证代理
+Name[zh_HK]=PolicyKit 驗證代理程式
+Name[zh_TW]=PolicyKit 驗證代理程式
+Comment=PolicyKit Authentication Agent
+Comment[ar]=مدير الاستيثاق PolicyKit
+Comment[be]=PolicyKit - аґент аўтэнтыфікацыі
+Comment[bn_IN]=PolicyKit অনুমোদনের এজেন্ট
+Comment[ca]=Agent d'autenticació del PolicyKit
+Comment[cs]=Ověřovací agent PolicyKit
+Comment[da]=Godkendelsesprogrammet PolicyKit
+Comment[de]=Legitimationsdienst von PolicyKit
+Comment[el]=Πράκτορας πιστοποίησης PolicyKit
+Comment[en_GB]=PolicyKit Authentication Agent
+Comment[es]=Agente de autenticación de PolicyKit
+Comment[eu]=PolicyKit autentifikatzeko agentea
+Comment[fi]=PolicytKit-tunnistautumisohjelma
+Comment[fr]=Agent d'authentification de PolicyKit
+Comment[gl]=Axente de autenticación PolicyKit
+Comment[gu]=PolicyKit સત્તાધિકરણ એજન્ટ
+Comment[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि
+Comment[hu]=PolicyKit hitelesítési ügynök
+Comment[it]=Agente di autenticazione per PolicyKit
+Comment[ja]=PolicyKit 認証エージェント
+Comment[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ
+Comment[lt]=PolicyKit tapatybės nustatymo agentas
+Comment[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന്‍ ഏജന്റ്
+Comment[mr]=PolicyKit ऑथेंटीकेशन एजेंट
+Comment[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ
+Comment[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ
+Comment[pl]=Agent uwierzytelniania PolicyKit
+Comment[pt]=Agente de Autenticação PolicyKit
+Comment[pt_BR]=Agente de autenticação PolicyKit
+Comment[ro]=Agent de autentificare PolicyKit
+Comment[sk]=Agent PolicyKit na overovanie totožnosti
+Comment[sl]=PolicyKit program overjanja
+Comment[sv]=Autentiseringsagent för PolicyKit
+Comment[ta]=PolicyKit அங்கீகார முகவர்
+Comment[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి
+Comment[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit
+Comment[uk]=Агент автентифікації PolicyKit
+Comment[zh_CN]=PolicyKit 认证代理
+Comment[zh_HK]=PolicyKit 驗證代理程式
+Comment[zh_TW]=PolicyKit 驗證代理程式
+Exec=/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
+Terminal=false
+Type=Application
+Categories=
+NoDisplay=true
+OnlyShowIn=GNOME;XFCE;
+X-GNOME-AutoRestart=true

=== modified file 'debian/rules'
--- debian/rules	2010-11-04 22:05:36 +0000
+++ debian/rules	2011-05-05 16:43:38 +0000
@@ -1,12 +1,14 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
-
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed
-
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-examples \
-                             --enable-gtk-doc \
-                             --disable-introspection
+%:
+	dh $@ --with autoreconf
+
+export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs -Wl,--as-needed
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--disable-examples \
+		--enable-gtk-doc \
+		--disable-introspection
+
+override_dh_auto_test: