r17320 - in /packages/unstable/update-notifier/debian: ./ gdm-signal/ patches/

joss at users.alioth.debian.org joss at users.alioth.debian.org
Wed Oct 22 12:08:25 UTC 2008 

Author: joss
Date: Wed Oct 22 12:08:24 2008
New Revision: 17320

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17320
Log:
* Add version mangling to watch file.
* Require debhelper 5.0.51 for dh_icons.
* Make update-notifier-common depend on python for the scripts.
* update-notifier.1:
  + Fix whatis entry.
  + Fix a typo.
* Add set -e to preinst, postinst, postrm.
* postrm:
  + Don’t use -a in the test.
  + Remove the stamp directory after purge.
* Fix spelling of Xfce.
* rules:
  + Remove unused arch-build target.
  + Don’t ignore errors in make distclean.
  + Move dh_icons to the appropriate place.
  + Correctly split binary-arch and binary-indep targets.
  + Remove the config.{sub,guess} dance, it’s handled by cdbs.
* Add -g to CFLAGS for gdm-signal.
* gdm-logout-action.[ch]: updated from gnome-panel, so that they are 
  adapted to the new GDM protocol.
* autodown.c: remove references to hibernate.
* Install gdm-signal with the 755 permissions (lol).
* 002_i18n_update.diff: update fr.po.

Modified:
    packages/unstable/update-notifier/debian/changelog
    packages/unstable/update-notifier/debian/control
    packages/unstable/update-notifier/debian/control.in
    packages/unstable/update-notifier/debian/gdm-signal/Makefile
    packages/unstable/update-notifier/debian/gdm-signal/autodown.c
    packages/unstable/update-notifier/debian/gdm-signal/gdm-logout-action.c
    packages/unstable/update-notifier/debian/gdm-signal/gdm-logout-action.h
    packages/unstable/update-notifier/debian/patches/002_i18n_update.diff
    packages/unstable/update-notifier/debian/postinst
    packages/unstable/update-notifier/debian/postrm
    packages/unstable/update-notifier/debian/preinst
    packages/unstable/update-notifier/debian/rules
    packages/unstable/update-notifier/debian/update-notifier.1
    packages/unstable/update-notifier/debian/watch

Modified: packages/unstable/update-notifier/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-notifier/debian/changelog?rev=17320&op=diff
==============================================================================
--- packages/unstable/update-notifier/debian/changelog (original)
+++ packages/unstable/update-notifier/debian/changelog Wed Oct 22 12:08:24 2008
@@ -9,7 +9,32 @@
   * debian/patches/04_fix_gksu_usage.diff
     - remove unnecessary patch line for src/update-notifier.c.orig.rej
 
- -- Josselin Mouette <joss at debian.org>  Tue, 21 Oct 2008 13:47:01 +0200
+  [ Josselin Mouette ]
+  * Add version mangling to watch file.
+  * Require debhelper 5.0.51 for dh_icons.
+  * Make update-notifier-common depend on python for the scripts.
+  * update-notifier.1:
+    + Fix whatis entry.
+    + Fix a typo.
+  * Add set -e to preinst, postinst, postrm.
+  * postrm:
+    + Don’t use -a in the test.
+    + Remove the stamp directory after purge.
+  * Fix spelling of Xfce.
+  * rules:
+    + Remove unused arch-build target.
+    + Don’t ignore errors in make distclean.
+    + Move dh_icons to the appropriate place.
+    + Correctly split binary-arch and binary-indep targets.
+    + Remove the config.{sub,guess} dance, it’s handled by cdbs.
+  * Add -g to CFLAGS for gdm-signal.
+  * gdm-logout-action.[ch]: updated from gnome-panel, so that they are 
+    adapted to the new GDM protocol.
+  * autodown.c: remove references to hibernate.
+  * Install gdm-signal with the 755 permissions (lol).
+  * 002_i18n_update.diff: update fr.po.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 22 Oct 2008 13:59:28 +0200
 
 update-notifier (0.70.7.debian-4) unstable; urgency=low
 

Modified: packages/unstable/update-notifier/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-notifier/debian/control?rev=17320&op=diff
==============================================================================
--- packages/unstable/update-notifier/debian/control (original)
+++ packages/unstable/update-notifier/debian/control Wed Oct 22 12:08:24 2008
@@ -4,7 +4,7 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Alan Baghumain <alan at technotux.org>, Emilio Pozuelo Monfort <pochu at ubuntu.com>, Gustavo Noronha Silva <kov at debian.org>, Josselin Mouette <joss at debian.org>
 Build-Depends: cdbs,
-               debhelper (>= 4.1.0),
+               debhelper (>= 5.0.51~),
                gnome-pkg-tools (>= 0.12.3),
                libgtk2.0-dev (>= 2.10.0),
                libgnomeui-dev,
@@ -23,7 +23,6 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         ${python:Depends},
          dbus-1-utils,
          python,
          python-apt (>= 0.6.12),
@@ -49,13 +48,13 @@
  .
  This package works with any Desktop system that implements the
  FreeDesktop notification area specification, like GNOME, KDE and
- XFCE.
+ Xfce.
 
 Package: update-notifier-common
 Replaces: update-notifier (<= 0.59.5.debian-1),
           update-manager (<< 0.68.debian-6)
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, python
 Description: Files shared between update-notifier and adept
  Apt setup files and reboot notification scripts shared between
  update-notifier and adept-notifier.

Modified: packages/unstable/update-notifier/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-notifier/debian/control.in?rev=17320&op=diff
==============================================================================
--- packages/unstable/update-notifier/debian/control.in (original)
+++ packages/unstable/update-notifier/debian/control.in Wed Oct 22 12:08:24 2008
@@ -4,7 +4,7 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Alan Baghumain <alan at technotux.org>, @GNOME_TEAM@
 Build-Depends: cdbs,
-               debhelper (>= 4.1.0),
+               debhelper (>= 5.0.51~),
                gnome-pkg-tools (>= 0.12.3),
                libgtk2.0-dev (>= 2.10.0),
                libgnomeui-dev,
@@ -23,7 +23,6 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         ${python:Depends},
          dbus-1-utils,
          python,
          python-apt (>= 0.6.12),
@@ -49,13 +48,13 @@
  .
  This package works with any Desktop system that implements the
  FreeDesktop notification area specification, like GNOME, KDE and
- XFCE.
+ Xfce.
 
 Package: update-notifier-common
 Replaces: update-notifier (<= 0.59.5.debian-1),
           update-manager (<< 0.68.debian-6)
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, python
 Description: Files shared between update-notifier and adept
  Apt setup files and reboot notification scripts shared between
  update-notifier and adept-notifier.

Modified: packages/unstable/update-notifier/debian/gdm-signal/Makefile
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-notifier/debian/gdm-signal/Makefile?rev=17320&op=diff
==============================================================================
--- packages/unstable/update-notifier/debian/gdm-signal/Makefile (original)
+++ packages/unstable/update-notifier/debian/gdm-signal/Makefile Wed Oct 22 12:08:24 2008
@@ -1,6 +1,6 @@
 default: gdm-signal
 
-CFLAGS = -O2 `pkg-config --cflags glib-2.0` `pkg-config --cflags gtk+-2.0`
+CFLAGS = -g -O2 `pkg-config --cflags glib-2.0` `pkg-config --cflags gtk+-2.0`
 LDFLAGS = `pkg-config --libs glib-2.0` `pkg-config --libs gtk+-2.0`
 
 gdm-signal: autodown.o gdm-logout-action.o gdm-logout-action.h

Modified: packages/unstable/update-notifier/debian/gdm-signal/autodown.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-notifier/debian/gdm-signal/autodown.c?rev=17320&op=diff
==============================================================================
--- packages/unstable/update-notifier/debian/gdm-signal/autodown.c (original)
+++ packages/unstable/update-notifier/debian/gdm-signal/autodown.c Wed Oct 22 12:08:24 2008
@@ -23,20 +23,10 @@
 #include <gtk/gtk.h>
 #include "gdm-logout-action.h"
 
-static int do_hibernate = FALSE;
 static int do_suspend = FALSE;
 static int do_halt = FALSE;
 static int do_reboot = FALSE;
 GOptionEntry entries[] = {
-  {
-    "hibernate",
-    'z',
-    0,
-    G_OPTION_ARG_NONE,
-    &do_hibernate,
-    "Hibernate the machine",
-    NULL
-  },
   {
     "halt",
     'h',
@@ -70,7 +60,7 @@
 
 int main(int argc, char **argv)
 {
-  gboolean halt_supported, suspend_supported, hibernate_supported, reboot_supported;
+  gboolean halt_supported, suspend_supported, reboot_supported;
 
   GdmLogoutAction suspend_action;
   GError *error=NULL;
@@ -86,14 +76,11 @@
 
   halt_supported   = gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
   suspend_supported = gdm_supports_logout_action (GDM_LOGOUT_ACTION_SUSPEND);
-  hibernate_supported = gdm_supports_logout_action (GDM_LOGOUT_ACTION_HIBERNATE);
   reboot_supported = gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT);
   if (halt_supported && do_halt)
     suspend_action = GDM_LOGOUT_ACTION_SHUTDOWN;
   else if (suspend_supported && do_suspend) 
     suspend_action = GDM_LOGOUT_ACTION_SUSPEND;
-  else if (hibernate_supported && do_hibernate) 
-    suspend_action = GDM_LOGOUT_ACTION_HIBERNATE;
   else if (reboot_supported && do_reboot)
     suspend_action = GDM_LOGOUT_ACTION_REBOOT;
 

Modified: packages/unstable/update-notifier/debian/gdm-signal/gdm-logout-action.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-notifier/debian/gdm-signal/gdm-logout-action.c?rev=17320&op=diff
==============================================================================
--- packages/unstable/update-notifier/debian/gdm-signal/gdm-logout-action.c (original)
+++ packages/unstable/update-notifier/debian/gdm-signal/gdm-logout-action.c Wed Oct 22 12:08:24 2008
@@ -41,21 +41,19 @@
 
 #define GDM_PROTOCOL_UPDATE_INTERVAL 1 /* seconds */
 
-#define GDM_PROTOCOL_SOCKET_PATH "/tmp/.gdm_socket"
-
-#define GDM_PROTOCOL_MSG_CLOSE        "CLOSE"
-#define GDM_PROTOCOL_MSG_VERSION      "VERSION"
-#define GDM_PROTOCOL_MSG_AUTHENTICATE "AUTH_LOCAL"
-#define GDM_PROTOCOL_MSG_QUERY_ACTION "QUERY_LOGOUT_ACTION"
-#define GDM_PROTOCOL_MSG_SET_ACTION   "SET_LOGOUT_ACTION"
-#define GDM_PROTOCOL_MSG_SET_SUSPEND    "SET_SUSPEND"
-#define GDM_PROTOCOL_MSG_SET_HIBERNATE "SET_HIBERNATE"
+#define GDM_PROTOCOL_SOCKET_PATH "/var/run/gdm_socket"
+
+#define GDM_PROTOCOL_MSG_CLOSE         "CLOSE"
+#define GDM_PROTOCOL_MSG_VERSION       "VERSION"
+#define GDM_PROTOCOL_MSG_AUTHENTICATE  "AUTH_LOCAL"
+#define GDM_PROTOCOL_MSG_QUERY_ACTION  "QUERY_LOGOUT_ACTION"
+#define GDM_PROTOCOL_MSG_SET_ACTION    "SET_SAFE_LOGOUT_ACTION"
+#define GDM_PROTOCOL_MSG_FLEXI_XSERVER "FLEXI_XSERVER"
 
 #define GDM_ACTION_STR_NONE     "NONE"
 #define GDM_ACTION_STR_SHUTDOWN "HALT"
 #define GDM_ACTION_STR_REBOOT   "REBOOT"
 #define GDM_ACTION_STR_SUSPEND  "SUSPEND"
-#define GDM_ACTION_STR_HIBERNATE "HIBERNATE"
 
 typedef struct {
         int fd;
@@ -69,6 +67,7 @@
 
 static GdmProtocolData gdm_protocol_data = {
         0,
+        NULL,
         GDM_LOGOUT_ACTION_NONE,
         GDM_LOGOUT_ACTION_NONE,
         0
@@ -240,9 +239,13 @@
 		gdm_shutdown_protocol_connection (data);
                 return FALSE;
         }
-
-        strcpy (addr.sun_path, GDM_PROTOCOL_SOCKET_PATH);
-        addr.sun_family = AF_UNIX;
+	
+	if (g_file_test (GDM_PROTOCOL_SOCKET_PATH, G_FILE_TEST_EXISTS))
+	  strcpy (addr.sun_path, GDM_PROTOCOL_SOCKET_PATH);
+	else
+	  strcpy (addr.sun_path, "/tmp/.gdm_socket");
+        
+	addr.sun_family = AF_UNIX;
 
         if (connect (data->fd, (struct sockaddr *) &addr, sizeof (addr)) < 0) {
                 g_warning ("Failed to establish a connection with GDM: %s",
@@ -260,6 +263,7 @@
 
                 return FALSE;
         }
+	g_free (response);
 
         if (!gdm_authenticate_connection (data)) {
                 g_warning ("Failed to authenticate with GDM");
@@ -307,8 +311,6 @@
                         action = GDM_LOGOUT_ACTION_REBOOT;
                 else if (!strcmp (str, GDM_ACTION_STR_SUSPEND))
                         action = GDM_LOGOUT_ACTION_SUSPEND;
-                else if (!strcmp (str, GDM_ACTION_STR_HIBERNATE))
-                        action = GDM_LOGOUT_ACTION_HIBERNATE;
 
                 data->available_actions |= action;
                 if (selected)
@@ -378,17 +380,8 @@
                 action_str = GDM_ACTION_STR_REBOOT;
                 break;
         case GDM_LOGOUT_ACTION_SUSPEND:
-		response = gdm_send_protocol_msg (&gdm_protocol_data, GDM_PROTOCOL_MSG_SET_SUSPEND);
-		g_free (response);
-		gdm_protocol_data.last_update = 0;
-		gdm_shutdown_protocol_connection (&gdm_protocol_data);
-		return;
-        case GDM_LOGOUT_ACTION_HIBERNATE:
-		response = gdm_send_protocol_msg (&gdm_protocol_data, GDM_PROTOCOL_MSG_SET_HIBERNATE);
-		g_free (response);
-		gdm_protocol_data.last_update = 0;
-		gdm_shutdown_protocol_connection (&gdm_protocol_data);
-		return;
+                action_str = GDM_ACTION_STR_SUSPEND;
+                break;
         }
 
         msg = g_strdup_printf (GDM_PROTOCOL_MSG_SET_ACTION " %s", action_str);
@@ -402,3 +395,21 @@
 
         gdm_shutdown_protocol_connection (&gdm_protocol_data);
 }
+
+void
+gdm_new_login (void)
+{
+        char *response;
+
+        if (!gdm_init_protocol_connection (&gdm_protocol_data))
+                return;
+
+        response = gdm_send_protocol_msg (&gdm_protocol_data,
+					  GDM_PROTOCOL_MSG_FLEXI_XSERVER);
+
+        g_free (response);
+
+	gdm_protocol_data.last_update = 0;
+
+        gdm_shutdown_protocol_connection (&gdm_protocol_data);
+}

Modified: packages/unstable/update-notifier/debian/gdm-signal/gdm-logout-action.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-notifier/debian/gdm-signal/gdm-logout-action.h?rev=17320&op=diff
==============================================================================
--- packages/unstable/update-notifier/debian/gdm-signal/gdm-logout-action.h (original)
+++ packages/unstable/update-notifier/debian/gdm-signal/gdm-logout-action.h Wed Oct 22 12:08:24 2008
@@ -38,14 +38,14 @@
         GDM_LOGOUT_ACTION_NONE     = 0,
         GDM_LOGOUT_ACTION_SHUTDOWN = 1 << 0,
         GDM_LOGOUT_ACTION_REBOOT   = 1 << 1,
-        GDM_LOGOUT_ACTION_SUSPEND  = 1 << 2,
-        GDM_LOGOUT_ACTION_HIBERNATE  = 1 << 3
+        GDM_LOGOUT_ACTION_SUSPEND  = 1 << 2
 } GdmLogoutAction;
 
 gboolean gdm_supports_logout_action (GdmLogoutAction action);
 
 void            gdm_set_logout_action (GdmLogoutAction action);
 GdmLogoutAction gdm_get_logout_action (void);
+void            gdm_new_login         (void);
 
 G_END_DECLS
 

Modified: packages/unstable/update-notifier/debian/patches/002_i18n_update.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-notifier/debian/patches/002_i18n_update.diff?rev=17320&op=diff
==============================================================================
--- packages/unstable/update-notifier/debian/patches/002_i18n_update.diff (original)
+++ packages/unstable/update-notifier/debian/patches/002_i18n_update.diff Wed Oct 22 12:08:24 2008
@@ -1855,3 +1855,409 @@
 -#~ "アップデートを完å
¨ã«ã™ã‚‹ãŸã‚ã€å†èµ·å‹•ã—てください。そうすると、新しいサービ"
 -#~ "スが有効になります。可能な限り早急に再起動してください。"
 +msgstr "これを無効にすると、apport クラッシュレポートの延期の通知をしません。"
+--- po/fr.po.orig	2008-01-08 17:40:26.000000000 +0100
++++ po/fr.po	2008-10-22 13:58:00.652302528 +0200
+@@ -9,9 +9,9 @@
+ msgstr ""
+ "Project-Id-Version: Update-notifier 0.38.7\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2008-01-08 17:40+0100\n"
+-"PO-Revision-Date: 2005-03-09 23:26+0100\n"
+-"Last-Translator: Vincent Carriere <carriere_vincent at yahoo.fr>\n"
++"POT-Creation-Date: 2008-10-22 13:45+0200\n"
++"PO-Revision-Date: 2008-10-22 13:57+0200\n"
++"Last-Translator: Josselin Mouette <joss at debian.org>\n"
+ "Language-Team: French <gnomefr at traduc.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -29,16 +29,15 @@
+ msgstr ""
+ 
+ #: ../src/crash.c:68
+-#, fuzzy
+ msgid ""
+ "An application has crashed on your system (now or in the past). Click on the "
+ "notification icon to display details. "
+-msgstr "Cliquez sur cette icône pour afficher les mises à jour."
++msgstr ""
+ 
+ #. Create and show the notification
+ #: ../src/avahi.c:15
+ msgid "Network service discovery disabled"
+-msgstr ""
++msgstr "Découverte de services réseau désactivée"
+ 
+ #: ../src/avahi.c:16
+ msgid ""
+@@ -46,10 +45,13 @@
+ "incompatible with the Avahi network service discovery. The service has been "
+ "disabled."
+ msgstr ""
++"Votre réseau a un domaine se terminant en .local, ce qui n’est pas conseillé "
++"et est incompatible avec la découverte de services réseau par Avahi. Ce service a "
++"été désactivé."
+ 
+ #: ../src/hal.c:50
+ msgid "Software packages volume detected"
+-msgstr ""
++msgstr "Volume de paquets logiciels détecté"
+ 
+ #: ../src/hal.c:51
+ msgid ""
+@@ -58,70 +60,85 @@
+ "\n"
+ "Would you like to open it with the package manager?"
+ msgstr ""
++"<span weight=\"bold\" size=\"larger\">Un volume contenant des paquets "
++"logiciels a été détecté.</span>\n"
++"\n"
++"Voulez-vous l’ouvrir avec le gestionnaire de paquets ?"
+ 
+-#: ../src/hal.c:59 ../src/hal.c:72 ../src/hal.c:88 ../src/hal.c:106
+-#: ../src/update.c:29
+-#, fuzzy
++#: ../src/hal.c:59 ../src/hal.c:73 ../src/hal.c:89 ../src/hal.c:107
++#: ../src/update.c:28
+ msgid "Start package manager"
+-msgstr "Gestionnaire de paquets"
++msgstr "Démarrer le gestionnaire de paquets"
+ 
+-#: ../src/hal.c:64
++#: ../src/hal.c:65
+ msgid "Upgrade volume detected"
+-msgstr ""
++msgstr "Volume de mise à jour détecté"
+ 
+-#: ../src/hal.c:65
++#: ../src/hal.c:66
+ msgid ""
+ "<span weight=\"bold\" size=\"larger\">A distribution volume with software "
+ "packages has been detected.</span>\n"
+ "\n"
+ "Would you like to try to upgrade from it automatically? "
+ msgstr ""
++"<span weight=\"bold\" size=\"larger\">Un volume de distribution contenant "
++"des paquets logiciels a été détecté.</span>\n"
++"\n"
++"Voulez-vous tenter de mettre le système à jour automatiquement ?"
+ 
+-#: ../src/hal.c:74
++#: ../src/hal.c:75
+ msgid "Run upgrade"
+-msgstr ""
++msgstr "Lancer la mise à jour"
+ 
+-#: ../src/hal.c:80
++#: ../src/hal.c:81
+ msgid "Addon volume detected"
+-msgstr ""
++msgstr "Volume d’applications supplémentaires détecté"
+ 
+-#: ../src/hal.c:81
++#: ../src/hal.c:82
+ msgid ""
+ "<span weight=\"bold\" size=\"larger\">An addon volume with software "
+ "applications has been detected.</span>\n"
+ "\n"
+ "Would you like to view/install the content? "
+ msgstr ""
++"<span weight=\"bold\" size=\"larger\">Un volume contenant des applications a "
++"été détecté.</span>\n"
++"\n"
++"Voulez-vous voir ou installer son contenu ?"
+ 
+-#: ../src/hal.c:90
++#: ../src/hal.c:91
+ msgid "Start addon installer"
+-msgstr ""
++msgstr "Démarer l’installation d’applications supplémentaires"
+ 
+-#: ../src/hal.c:97
++#: ../src/hal.c:98
+ msgid "APTonCD volume detected"
+-msgstr ""
++msgstr "Volume APT sur CD détecté"
+ 
+-#: ../src/hal.c:98
++#: ../src/hal.c:99
+ msgid ""
+ "<span weight=\"bold\" size=\"larger\">A volume with unofficial software "
+ "packages has been detected.</span>\n"
+ "\n"
+ "Would you like to open it with the package manager?"
+ msgstr ""
++"<span weight=\"bold\" size=\"larger\">Un volume contenant des paquets "
++"logiciels non officiels a été détecté.</span>\n"
++"\n"
++"Voulez-vous l’ouvrir avec le gestionnaire de paquets ?"
+ 
+-#: ../src/hooks.c:46 ../src/hooks.c:513
+-#, fuzzy
++#: ../src/hooks.c:46 ../src/hooks.c:516
+ msgid "Information available"
+-msgstr "%i mise à jour est disponible"
++msgstr "Information disponible"
+ 
+-#: ../src/hooks.c:514
+-#, fuzzy
++#: ../src/hooks.c:517
+ msgid "Click on the notification icon to show the available information.\n"
+-msgstr "Cliquez sur cette icône pour afficher les informations."
++msgstr ""
++"Cliquez sur l’icône de notification pour afficher les informations "
++"disponibles.\n"
+ 
+ #: ../src/reboot.c:38 ../src/reboot.c:76
+ msgid "System restart required"
+-msgstr ""
++msgstr "Redémarrage du système requis"
+ 
+ #: ../src/reboot.c:39
+ msgid ""
+@@ -129,97 +146,111 @@
+ "\n"
+ "Click on the notification icon to restart your system."
+ msgstr ""
++"Pour terminer la mise à jour, veuillez redémarrer le système.\n"
++"\n"
++"Cliquez sur l’icône de notification pour redémarrer votre système."
+ 
+-#: ../src/update.c:21
++#: ../src/update.c:20
+ msgid "Show updates"
+ msgstr "Afficher les mises à jour"
+ 
+-#: ../src/update.c:25
++#: ../src/update.c:24
+ msgid "Install all updates"
+ msgstr "Installer toutes les mises à jour"
+ 
+-#: ../src/update.c:28
+-#, fuzzy
++#: ../src/update.c:27
+ msgid "Check for updates"
+-msgstr "Afficher les mises à jour"
++msgstr "Vérifier la disponibilité de mises à jour"
+ 
+-#: ../src/update.c:66
+-#, fuzzy, c-format
++#: ../src/update.c:65
++#, c-format
+ msgid "There is %i update available"
+ msgid_plural "There are %i updates available"
+ msgstr[0] "%i mise à jour est disponible"
+ msgstr[1] "%i mises à jour sont disponibles"
+ 
+-#: ../src/update.c:134
++#: ../src/update.c:133
+ msgid "Show notifications"
+-msgstr ""
++msgstr "Afficher les notifications"
+ 
+ #. and update the tooltip
+-#: ../src/update.c:179
+-#, fuzzy
++#: ../src/update.c:178
+ msgid "A package manager is working"
+-msgstr "Gestionnaire de paquets"
++msgstr "Un gestionnaire de paquets est en cours de fonctionnement"
+ 
+-#: ../src/update.c:220
+-#, fuzzy
++#: ../src/update.c:219
+ msgid "Software updates available"
+-msgstr "%i mise à jour est disponible"
++msgstr "Mises à jour logicielles disponibles"
+ 
+-#: ../src/update.c:221
++#: ../src/update.c:220
+ msgid "Click on the notification icon to show the available updates.\n"
+ msgstr ""
++"Cliquez sur l’icône de notification pour afficher les mises à jour "
++"disponibles.\n"
+ 
+-#: ../src/update.c:259
++#: ../src/update.c:257
+ msgid ""
+ "The update information is outdated. This may be caused by network problems. "
+-"Please update manually by click on this icon and then selecting 'Check'."
++"Please update manually by clicking on this icon and then selecting 'Check'."
+ msgstr ""
++"Les informations de mise à jour sont obsolètes. Ceci peut être dû à des "
++"problèmes de réseau. Veuillez mettre à jour manuellement en cliquant sur "
++"cette icône et en cliquant sur « Vérifier »."
+ 
+-#: ../src/update.c:292
++#: ../src/update.c:299
+ #, c-format
+ msgid ""
+ "An error occurred, please run Package Manager from the right-click menu or "
+ "apt-get in a terminal to see what is wrong.\n"
+ "The error message was: '%s'"
+ msgstr ""
++"Une erreur s’est produite. Veuillez lancer le gestionnaire de paquets depuis "
++"le menu accessible par le bouton droit de la souris, ou exécuter apt-get "
++"depuis un terminal pour en savoir plus.\n"
++"Le message d’erreur était : « %s »."
+ 
+-#: ../src/update.c:299
++#: ../src/update.c:306
+ msgid ""
+ "An error occurred, please run Package Manager from the right-click menu or "
+ "apt-get in a terminal to see what is wrong."
+ msgstr ""
++"Une erreur s’est produite. Veuillez lancer le gestionnaire de paquets depuis "
++"le menu accessible par le bouton droit de la souris, ou exécuter apt-get "
++"depuis un terminal pour en savoir plus."
+ 
+-#: ../src/update.c:303
++#: ../src/update.c:310
+ msgid "This usually means that your installed packages have unmet dependencies"
+ msgstr ""
++"Cela signifie en général que vos paquets installés ont des dépendances non "
++"satisfaites"
+ 
+-#: ../src/update.c:316
+-msgid "Error communicating with the backend. Please report this as a bug."
+-msgstr ""
++#: ../src/update.c:323
++msgid "A problem occurred when checking for the updates."
++msgstr "Un problème s’est produit en vérifiant la disponibilité de mises à jour."
+ 
+-#: ../src/update-notifier.c:260
++#: ../src/update-notifier.c:270
+ msgid "Internal error"
+-msgstr ""
++msgstr "Erreur interne"
+ 
+-#: ../src/update-notifier.c:403
++#: ../src/update-notifier.c:417
+ msgid "update-notifier"
+ msgstr ""
+ 
+ #: ../ui/hooks-dialog.glade.h:1
+ msgid "<span weight=\"bold\" size=\"larger\">Update information</span>"
+-msgstr ""
++msgstr "<span weight=\"bold\" size=\"larger\">Informations sur les mises à jour</span>"
+ 
+ #: ../ui/hooks-dialog.glade.h:2
+ msgid "_Run this action now"
+-msgstr ""
++msgstr "_Exécuter cette action maintenant"
+ 
+ #: ../ui/preferences.glade.h:1
+ msgid "Default action"
+-msgstr ""
++msgstr "Action par défaut"
+ 
+ #: ../ui/preferences.glade.h:2
+ msgid "Upgrade Notifer Preferences"
+-msgstr ""
++msgstr "Préférences des notifications de mises à jour"
+ 
+ #: ../ui/reboot-dialog.glade.h:1
+ msgid ""
+@@ -233,14 +264,26 @@
+ "\n"
+ "Please make sure that you save all of your work before restarting."
+ msgstr ""
++"<span weight=\"bold\" size=\"larger\">Redémarrage requis</span>\n"
++"\n"
++"Afin de terminer la mise à jour de votre système, celui-ci nécessite "
++"d’être redémarré.\n"
++"\n"
++"Tant que ce n’est pas fait, les mises à jour de sécurité peuvent ne pas "
++"être totalement appliquées, le matériel récemment ajouté ou supporté "
++"peut ne pas fonctionner, et de nouveaux services peuvent ne pas être "
++"disponibles.\n"
++"\n"
++"Veuillez vous assurer de sauver tout vos travaux en cours avant de "
++"redémarrer."
+ 
+ #: ../ui/reboot-dialog.glade.h:8
+ msgid "Restart _Later"
+-msgstr ""
++msgstr "Redémarrer plus _tard"
+ 
+ #: ../ui/reboot-dialog.glade.h:9
+ msgid "_Restart Now"
+-msgstr ""
++msgstr "_Redémarrer maintenant"
+ 
+ #: ../data/update-notifier.schemas.in.h:1
+ msgid "Display apport crash reports automatically"
+@@ -252,74 +295,3 @@
+ "crash reports."
+ msgstr ""
+ 
+-#, fuzzy
+-#~ msgid "Click on the notification icon to show the information"
+-#~ msgstr "Cliquez sur cette icône pour afficher les informations."
+-
+-#, fuzzy
+-#~ msgid "Click on the notification icon to show the update"
+-#~ msgid_plural "Click on the notification icon to show the updates"
+-#~ msgstr[0] "Cliquez sur cette icône pour afficher les mises à jour."
+-#~ msgstr[1] "Cliquez sur cette icône pour afficher les mises à jour."
+-
+-#, fuzzy
+-#~ msgid ""
+-#~ "<span weight=\"bold\" size=\"larger\">Update information</span>\n"
+-#~ "\n"
+-#~ "There is some post-update information available. Please read the "
+-#~ "following messages carefully."
+-#~ msgstr ""
+-#~ "<span weight=\"bold\" size=\"larger\">Information de la mise à jour</"
+-#~ "span>\n"
+-#~ "\n"
+-#~ "Des informations post-update sont disponibles. Veuillez lire les "
+-#~ "informations suivantes attentivement."
+-
+-#, fuzzy
+-#~ msgid "Show upgradable packages"
+-#~ msgstr "Afficher les mises à jour"
+-
+-#, fuzzy
+-#~ msgid "Package manager"
+-#~ msgstr "Gestionnaire de paquets"
+-
+-#, fuzzy
+-#~ msgid "There is %i item of post-update information available!"
+-#~ msgid_plural "There are %i items of post-update information available!"
+-#~ msgstr[0] "%i informations post-update sont disponibles"
+-#~ msgstr[1] "%i informations post-update sont disponibles"
+-
+-#~ msgid "Package Manager"
+-#~ msgstr "Gestionnaire de paquets"
+-
+-#~ msgid "Update package list now"
+-#~ msgstr "Mettre à jour la liste des paquets"
+-
+-#~ msgid "Software preferences"
+-#~ msgstr "Préférences du logiciel"
+-
+-#~ msgid ""
+-#~ "Please enter your password to run:\n"
+-#~ " %s"
+-#~ msgstr ""
+-#~ "Veuillez saisir votre mot de passe pour exécuter :\n"
+-#~ "%s"
+-
+-#, fuzzy
+-#~ msgid "Please enter your password to start the package manager"
+-#~ msgstr ""
+-#~ "Veuillez saisir votre mot de passe pour exécuter :\n"
+-#~ "%s"
+-
+-#, fuzzy
+-#~ msgid "%i system upgrade available"
+-#~ msgid_plural "%i system upgrades available"
+-#~ msgstr[0] "%i mise à jour est disponible"
+-#~ msgstr[1] "%i mise à jour est disponible"
+-
+-#, fuzzy
+-#~ msgid "Show Updates"
+-#~ msgstr "Afficher les mises à jour"
+-
+-#~ msgid "Run now"
+-#~ msgstr "Exécuter maintenant"

Modified: packages/unstable/update-notifier/debian/postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-notifier/debian/postinst?rev=17320&op=diff
==============================================================================
--- packages/unstable/update-notifier/debian/postinst (original)
+++ packages/unstable/update-notifier/debian/postinst Wed Oct 22 12:08:24 2008
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 STAMP=/var/lib/update-notifier/dpkg-run-stamp
 

Modified: packages/unstable/update-notifier/debian/postrm
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-notifier/debian/postrm?rev=17320&op=diff
==============================================================================
--- packages/unstable/update-notifier/debian/postrm (original)
+++ packages/unstable/update-notifier/debian/postrm Wed Oct 22 12:08:24 2008
@@ -1,9 +1,11 @@
 #!/bin/sh
+set -e
 
 STAMP=/var/lib/update-notifier/dpkg-run-stamp
 
-if [ "$1" = purge -a -f $STAMP ]; then
-	rm $STAMP
+if [ "$1" = purge ] && [ -f $STAMP ]; then
+	rm -f $STAMP
+	rmdir --ignore-fail-on-non-empty /var/lib/update-notifier
 fi
 
 #DEBHELPER#

Modified: packages/unstable/update-notifier/debian/preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-notifier/debian/preinst?rev=17320&op=diff
==============================================================================
--- packages/unstable/update-notifier/debian/preinst (original)
+++ packages/unstable/update-notifier/debian/preinst Wed Oct 22 12:08:24 2008
@@ -1,5 +1,5 @@
 #!/bin/sh
-
+set -e
 
 # check if we have a unmodified conf-file rm upgrade-notifer 
 if [ -f /etc/apt/apt.conf.d/99upgrade-notifier ]; then
@@ -7,4 +7,5 @@
 	rm -f  /etc/apt/apt.conf.d/99upgrade-notifier
     fi
 fi
+
 #DEBHELPER#

Modified: packages/unstable/update-notifier/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-notifier/debian/rules?rev=17320&op=diff
==============================================================================
--- packages/unstable/update-notifier/debian/rules (original)
+++ packages/unstable/update-notifier/debian/rules Wed Oct 22 12:08:24 2008
@@ -49,13 +49,7 @@
 	rm -f build-stamp 
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
+	[ ! -f Makefile ] || $(MAKE) distclean
 
 	dh_clean
 	-cd debian/gdm-signal && $(MAKE) clean
@@ -75,42 +69,47 @@
 	install -p -m 644 debian/10periodic $(tmp)/etc/apt/apt.conf.d
 	install -p -m 644 debian/15update-stamp $(tmp)/etc/apt/apt.conf.d
 	install -p -m 644 debian/20archive $(tmp)/etc/apt/apt.conf.d
-	install -p -m 644 debian/gdm-signal/gdm-signal $(tmp)/usr/lib/update-notifier
+	install -p -m 755 debian/gdm-signal/gdm-signal $(tmp)/usr/lib/update-notifier
 
 # Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -i ChangeLog
+	dh_installdocs -i
+	dh_installexamples -i
+	dh_install -i --sourcedir=debian/tmp
+	dh_icons -i
+	dh_gconf -i
+	dh_installman -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
 # Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-	dh_icons
-	dh_install --sourcedir=debian/tmp
-	dh_gconf
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-arch-build: 
-	#-$(MAKE) distclean
-	rm -rf debian/arch-build
-	mkdir -p debian/arch-build/$(PKG)-$(DEBVER)
-	tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(DEBVER);tar xf -)
-	debian/arch-build/$(PKG)-$(DEBVER)/autogen.sh
-	# HACK to fix the *$§/$&"§" automake generated po/Makefile.in
-	sed -i 's/@install_sh@/..\/install-sh/' debian/arch-build/$(PKG)-$(DEBVER)/po/Makefile.in.in
-	(cd debian/arch-build/$(PKG)-$(DEBVER) && $(DEB_BUILD_PROG))
+	dh_installchangelogs -a ChangeLog
+	dh_installdocs -a
+	dh_installexamples -a
+	dh_install -a --sourcedir=debian/tmp
+	dh_icons -a
+	dh_gconf -a
+	dh_installman -a
+	dh_link -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install

Modified: packages/unstable/update-notifier/debian/update-notifier.1
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-notifier/debian/update-notifier.1?rev=17320&op=diff
==============================================================================
--- packages/unstable/update-notifier/debian/update-notifier.1 (original)
+++ packages/unstable/update-notifier/debian/update-notifier.1 Wed Oct 22 12:08:24 2008
@@ -15,7 +15,7 @@
 .\"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 .TH update-notifier 1 "2007\-05\-05" "GNOME"
 .SH NAME
-Update Notifier \- Notifies about package updates
+update-notifier \- Notifies about package updates
 .SH SYNOPSIS
 .B update-notifier
 .RI [ OPTION... ]
@@ -28,7 +28,7 @@
 
 For
 .B Update Notifier
-to detect new avialable updates a task has to run periodically to
+to detect new available updates a task has to run periodically to
 update the package database. You can use the
 .B Software Properties
 application (\fBsoftware-properties-gtk\fR if you run GNOME or

Modified: packages/unstable/update-notifier/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-notifier/debian/watch?rev=17320&op=diff
==============================================================================
--- packages/unstable/update-notifier/debian/watch (original)
+++ packages/unstable/update-notifier/debian/watch Wed Oct 22 12:08:24 2008
@@ -1,2 +1,3 @@
 version=3
+opts=dversionmangle=s/\.debian$// \
 http://ftp.ubuntu.com/ubuntu/pool/main/u/update-notifier/update-notifier_(.*)\.tar\.gz

More information about the pkg-gnome-commits mailing list