Hello community,
here is the log from the commit of package lxsession for openSUSE:Factory
checked in at Tue Apr 6 23:04:15 CEST 2010.
--------
--- lxsession/lxsession.changes 2010-03-18 22:43:02.000000000 +0100
+++ lxsession/lxsession.changes 2010-04-05 21:07:58.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Apr 5 19:00:33 UTC 2010 - andrea@opensuse.org
+
+- new upstream version 0.4.4
+ - bug fixes
+ - added LTSP (Linux Terminal Server Project) support
+ - removed un-used gdm source code
+- removed lxsession-0.4.3-fix-buttons-position.patch
+ because has been merged upstream
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
lxsession-0.4.3-fix-buttons-position.patch
lxsession-0.4.3.tar.bz2
New:
----
lxsession-0.4.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lxsession.spec ++++++
--- /var/tmp/diff_new_pack.XKjsAI/_old 2010-04-06 23:02:59.000000000 +0200
+++ /var/tmp/diff_new_pack.XKjsAI/_new 2010-04-06 23:02:59.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package lxsession (Version 0.4.3)
+# spec file for package lxsession (Version 0.4.4)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,14 +19,13 @@
Name: lxsession
-Version: 0.4.3
+Version: 0.4.4
Release: 1
Summary: LXDE Session Manager, required for running the desktop environment
Group: System/GUI/Other
License: GPL
Url: http://www.lxde.org/
Source0: %{name}-%{version}.tar.bz2
-Patch0: %name-0.4.3-fix-buttons-position.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-glib-devel fdupes gtk2-devel intltool pkg-config
BuildRequires: docbook-utils docbook-xsl-stylesheets hal-devel libxslt
@@ -43,7 +42,6 @@
%prep
%setup -q -n %name-%version
-%patch0 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS"
@@ -53,7 +51,7 @@
%install
%makeinstall
-%__rm -rf %buildroot/%_datadir/locale/frp
+%__rm -rf %buildroot/%_datadir/locale/{frp,es_VE,ur_PK}
%find_lang %{name}
%fdupes -s %buildroot
++++++ lxsession-0.4.3.tar.bz2 -> lxsession-0.4.4.tar.bz2 ++++++
++++ 1748 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lxsession-0.4.3/configure.ac new/lxsession-0.4.4/configure.ac
--- old/lxsession-0.4.3/configure.ac 2010-03-18 17:32:17.000000000 +0100
+++ new/lxsession-0.4.4/configure.ac 2010-03-31 18:29:27.000000000 +0200
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT(lxsession,[0.4.3], [],lxsession)
+AC_INIT(lxsession,[0.4.4], [],lxsession)
AM_INIT_AUTOMAKE()
AC_PROG_INTLTOOL(, [no-xml])
AM_MAINTAINER_MODE
@@ -49,13 +49,20 @@
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
+# Generate po/LINGUAS on the fly rather than relying on translators
+# to maintain it manually. This also overcome the problem that Transifex
+# cannot add a language to po/LINGUAS if a new po file is submitted.
+rm -f $srcdir/po/LINGUAS
+for po_file in `ls $srcdir/po/*.po | sort`;
+do
+ lang=`echo "$po_file" | sed "s|.*/po/\(.*\)\.po|\1|g"`
+ echo $lang >> $srcdir/po/LINGUAS
+done
+
GETTEXT_PACKAGE=lxsession
-AM_GNU_GETTEXT_VERSION(0.14.1)
AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
-
-ALL_LINGUAS="af ar cs da de es et eu fa fi fr gl hr hu id it ja ko lt ml ms nb nl nn pl ps pt pt_BR ru sk sl sv tr uk ur ur_PK vi zh_CN zh_TW"
AM_GLIB_GNU_GETTEXT
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
if test x"$enable_man" = x"yes"; then
AC_PATH_PROG([XSLTPROC], [xsltproc])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lxsession-0.4.3/lxsession/xdg-autostart.c new/lxsession-0.4.4/lxsession/xdg-autostart.c
--- old/lxsession-0.4.3/lxsession/xdg-autostart.c 2010-03-09 21:41:37.000000000 +0100
+++ new/lxsession-0.4.4/lxsession/xdg-autostart.c 2010-03-28 20:20:12.000000000 +0200
@@ -276,10 +276,13 @@
char *path;
const char *name;
- while( (name = g_dir_read_name( dir )) && g_str_has_suffix( name, ".desktop" ) )
+ while( name = g_dir_read_name( dir ) )
{
- path = g_build_filename( dir_path, name, NULL );
- g_hash_table_replace( hash, g_strdup(name), path );
+ if(g_str_has_suffix(name, ".desktop"))
+ {
+ path = g_build_filename( dir_path, name, NULL );
+ g_hash_table_replace( hash, g_strdup(name), path );
+ }
}
g_dir_close( dir );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lxsession-0.4.3/lxsession-logout/lxsession-logout.c new/lxsession-0.4.4/lxsession-logout/lxsession-logout.c
--- old/lxsession-0.4.3/lxsession-logout/lxsession-logout.c 2010-03-18 17:21:34.000000000 +0100
+++ new/lxsession-0.4.4/lxsession-logout/lxsession-logout.c 2010-03-31 18:28:50.000000000 +0200
@@ -21,9 +21,19 @@
#include
#include
#include
+#include
#include
#include
+#include
+#include
+#include
#include
+#include
+#include
+#include
+
+#include
+#include
#include "dbus-interface.h"
@@ -57,10 +67,12 @@
int reboot_HAL : 1; /* Reboot is available via HAL */
int suspend_HAL : 1; /* Suspend is available via HAL */
int hibernate_HAL : 1; /* Hibernate is available via HAL */
- int switch_user_KDE : 1; /* Switch User is available via KDE */
-
+ int switch_user_GDM : 1; /* Switch User is available via GDM */
+ int switch_user_KDM : 1; /* Switch User is available via KDM */
+ int ltsp : 1; /* under LTSP environment */
} HandlerContext;
+static gboolean verify_running(char * display_manager, char * executable);
static void logout_clicked(GtkButton * button, HandlerContext * handler_context);
static void shutdown_clicked(GtkButton * button, HandlerContext * handler_context);
static void reboot_clicked(GtkButton * button, HandlerContext * handler_context);
@@ -71,6 +83,61 @@
static GtkPositionType get_banner_position(void);
static GdkPixbuf * get_background_pixbuf(void);
+/* Verify that a program is running and that an executable is available. */
+static gboolean verify_running(char * display_manager, char * executable)
+{
+ /* See if the executable we need to run is in the path. */
+ gchar * full_path = g_find_program_in_path(executable);
+ if (full_path != NULL)
+ {
+ g_free(full_path);
+
+ /* Form the filespec of the pid file for the display manager. */
+ char buffer[PATH_MAX];
+ sprintf(buffer, "/var/run/%s.pid", display_manager);
+
+ /* Open the pid file. */
+ int fd = open(buffer, O_RDONLY);
+ if (fd >= 0)
+ {
+ /* Pid file exists. Read it. */
+ ssize_t length = read(fd, buffer, sizeof(buffer));
+ close(fd);
+ if (length > 0)
+ {
+ /* Null terminate the buffer and convert the pid. */
+ buffer[length] = '\0';
+ pid_t pid = atoi(buffer);
+ if (pid > 0)
+ {
+ /* Form the filespec of the command line file under /proc.
+ * This is Linux specific. Should be conditionalized to the appropriate /proc layout for
+ * other systems. Your humble developer has no way to test on other systems. */
+ sprintf(buffer, "/proc/%d/cmdline", pid);
+
+ /* Open the file. */
+ int fd = open(buffer, O_RDONLY);
+ if (fd >= 0)
+ {
+ /* Read the command line. */
+ ssize_t length = read(fd, buffer, sizeof(buffer));
+ close(fd);
+ if (length > 0)
+ {
+ /* Null terminate the buffer and look for the display manager name in the command.
+ * If found, return success. */
+ buffer[length] = '\0';
+ if (strstr(buffer, display_manager) != NULL)
+ return TRUE;
+ }
+ }
+ }
+ }
+ }
+ }
+ return FALSE;
+}
+
/* Handler for "clicked" signal on Logout button. */
static void logout_clicked(GtkButton * button, HandlerContext * handler_context)
{
@@ -78,10 +145,24 @@
gtk_main_quit();
}
+static void change_root_property(GtkWidget* w, const char* prop_name, const char* value)
+{
+ GdkDisplay* dpy = gtk_widget_get_display(w);
+ GdkWindow* root = gtk_widget_get_root_window(w);
+ XChangeProperty(GDK_DISPLAY_XDISPLAY(dpy), GDK_WINDOW_XID(root),
+ XInternAtom(GDK_DISPLAY_XDISPLAY(dpy), prop_name, False), XA_STRING, 8,
+ PropModeReplace, value, strlen(value) + 1);
+}
+
/* Handler for "clicked" signal on Shutdown button. */
static void shutdown_clicked(GtkButton * button, HandlerContext * handler_context)
{
- if (handler_context->shutdown_ConsoleKit)
+ if (G_UNLIKELY(handler_context->ltsp))
+ {
+ change_root_property(GTK_WIDGET(button), "LTSP_LOGOUT_ACTION", "HALT");
+ kill(handler_context->lxsession_pid, SIGTERM);
+ }
+ else if (handler_context->shutdown_ConsoleKit)
dbus_ConsoleKit_Stop();
else if (handler_context->shutdown_HAL)
dbus_HAL_Shutdown();
@@ -91,7 +172,12 @@
/* Handler for "clicked" signal on Reboot button. */
static void reboot_clicked(GtkButton * button, HandlerContext * handler_context)
{
- if (handler_context->reboot_ConsoleKit)
+ if (G_UNLIKELY(handler_context->ltsp))
+ {
+ change_root_property(GTK_WIDGET(button), "LTSP_LOGOUT_ACTION", "REBOOT");
+ kill(handler_context->lxsession_pid, SIGTERM);
+ }
+ else if (handler_context->reboot_ConsoleKit)
dbus_ConsoleKit_Restart();
else if (handler_context->reboot_HAL)
dbus_HAL_Reboot();
@@ -121,7 +207,9 @@
/* Handler for "clicked" signal on Switch User button. */
static void switch_user_clicked(GtkButton * button, HandlerContext * handler_context)
{
- if (handler_context->switch_user_KDE)
+ if (handler_context->switch_user_GDM)
+ g_spawn_command_line_sync("gdmflexiserver --startnew", NULL, NULL, NULL, NULL);
+ else if (handler_context->switch_user_KDM)
g_spawn_command_line_sync("kdmctl reserve", NULL, NULL, NULL, NULL);
gtk_main_quit();
}
@@ -289,18 +377,24 @@
handler_context.hibernate_HAL = TRUE;
}
+ /* If we are under GDM, its "Switch User" is available. */
+ if (verify_running("gdm", "gdmflexiserver"))
+ {
+ handler_context.switch_user_available = TRUE;
+ handler_context.switch_user_GDM = TRUE;
+ }
+
/* If we are under KDM, its "Switch User" is available. */
- if (g_file_test("/var/run/kdm.pid", G_FILE_TEST_EXISTS))
+ if (verify_running("kdm", "kdmctl"))
{
- gchar * test = g_find_program_in_path("kdmctl");
- if (test != NULL)
- {
- g_free(test);
- handler_context.switch_user_available = TRUE;
- handler_context.switch_user_KDE = TRUE;
- }
+ handler_context.switch_user_available = TRUE;
+ handler_context.switch_user_KDM = TRUE;
}
+ /* LTSP support */
+ if (g_getenv("LTSP_CLIENT"))
+ handler_context.ltsp = TRUE;
+
/* Make the button images accessible. */
gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), PACKAGE_DATA_DIR "/lxsession/images");
@@ -395,6 +489,7 @@
GtkWidget * shutdown_button = gtk_button_new_with_mnemonic(_("Sh_utdown"));
GtkWidget * image = gtk_image_new_from_icon_name("system-shutdown", GTK_ICON_SIZE_BUTTON);
gtk_button_set_image(GTK_BUTTON(shutdown_button), image);
+ gtk_button_set_alignment(GTK_BUTTON(shutdown_button), 0.0, 0.5);
g_signal_connect(G_OBJECT(shutdown_button), "clicked", G_CALLBACK(shutdown_clicked), &handler_context);
gtk_box_pack_start(GTK_BOX(controls), shutdown_button, FALSE, FALSE, 4);
}
@@ -405,36 +500,40 @@
GtkWidget * reboot_button = gtk_button_new_with_mnemonic(_("_Reboot"));
GtkWidget * image = gtk_image_new_from_icon_name("gnome-session-reboot", GTK_ICON_SIZE_BUTTON);
gtk_button_set_image(GTK_BUTTON(reboot_button), image);
+ gtk_button_set_alignment(GTK_BUTTON(reboot_button), 0.0, 0.5);
g_signal_connect(G_OBJECT(reboot_button), "clicked", G_CALLBACK(reboot_clicked), &handler_context);
gtk_box_pack_start(GTK_BOX(controls), reboot_button, FALSE, FALSE, 4);
}
/* Create the Suspend button. */
- if (handler_context.suspend_available)
+ if (handler_context.suspend_available && !handler_context.ltsp)
{
GtkWidget * suspend_button = gtk_button_new_with_mnemonic(_("_Suspend"));
GtkWidget * image = gtk_image_new_from_icon_name("gnome-session-suspend", GTK_ICON_SIZE_BUTTON);
gtk_button_set_image(GTK_BUTTON(suspend_button), image);
+ gtk_button_set_alignment(GTK_BUTTON(suspend_button), 0.0, 0.5);
g_signal_connect(G_OBJECT(suspend_button), "clicked", G_CALLBACK(suspend_clicked), &handler_context);
gtk_box_pack_start(GTK_BOX(controls), suspend_button, FALSE, FALSE, 4);
}
/* Create the Hibernate button. */
- if (handler_context.hibernate_available)
+ if (handler_context.hibernate_available && !handler_context.ltsp)
{
GtkWidget * hibernate_button = gtk_button_new_with_mnemonic(_("_Hibernate"));
GtkWidget * image = gtk_image_new_from_icon_name("gnome-session-hibernate", GTK_ICON_SIZE_BUTTON);
gtk_button_set_image(GTK_BUTTON(hibernate_button), image);
+ gtk_button_set_alignment(GTK_BUTTON(hibernate_button), 0.0, 0.5);
g_signal_connect(G_OBJECT(hibernate_button), "clicked", G_CALLBACK(hibernate_clicked), &handler_context);
gtk_box_pack_start(GTK_BOX(controls), hibernate_button, FALSE, FALSE, 4);
}
/* Create the Switch User button. */
- if (handler_context.switch_user_available)
+ if (handler_context.switch_user_available && !handler_context.ltsp)
{
GtkWidget * switch_user_button = gtk_button_new_with_mnemonic(_("S_witch User"));
GtkWidget * image = gtk_image_new_from_icon_name("gnome-session-switch", GTK_ICON_SIZE_BUTTON);
gtk_button_set_image(GTK_BUTTON(switch_user_button), image);
+ gtk_button_set_alignment(GTK_BUTTON(switch_user_button), 0.0, 0.5);
g_signal_connect(G_OBJECT(switch_user_button), "clicked", G_CALLBACK(switch_user_clicked), &handler_context);
gtk_box_pack_start(GTK_BOX(controls), switch_user_button, FALSE, FALSE, 4);
}
@@ -443,11 +542,13 @@
GtkWidget * logout_button = gtk_button_new_with_mnemonic(_("_Logout"));
GtkWidget * image = gtk_image_new_from_icon_name("system-log-out", GTK_ICON_SIZE_BUTTON);
gtk_button_set_image(GTK_BUTTON(logout_button), image);
+ gtk_button_set_alignment(GTK_BUTTON(logout_button), 0.0, 0.5);
g_signal_connect(G_OBJECT(logout_button), "clicked", G_CALLBACK(logout_clicked), &handler_context);
gtk_box_pack_start(GTK_BOX(controls), logout_button, FALSE, FALSE, 4);
/* Create the Cancel button. */
GtkWidget * cancel_button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+ gtk_button_set_alignment(GTK_BUTTON(cancel_button), 0.0, 0.5);
g_signal_connect(G_OBJECT(cancel_button), "clicked", G_CALLBACK(cancel_clicked), NULL);
gtk_box_pack_start(GTK_BOX(controls), cancel_button, FALSE, FALSE, 4);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lxsession-0.4.3/man/lxsession-logout.1 new/lxsession-0.4.4/man/lxsession-logout.1
--- old/lxsession-0.4.3/man/lxsession-logout.1 2010-03-18 17:34:43.000000000 +0100
+++ new/lxsession-0.4.4/man/lxsession-logout.1 2010-04-05 18:24:58.000000000 +0200
@@ -9,6 +9,15 @@
.\"
.TH "LXSESSION" "1" "March 2, 2008" "http://LXDE\&.org" "http://LXDE.org"
.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
.\" disable hyphenation
@@ -35,7 +44,7 @@
.PP
These programs follow the usual
GNU
-command line syntax, with long options starting with two dashes (`\-\')\&. A summary of options is included below\&.
+command line syntax, with long options starting with two dashes (`\-\*(Aq)\&. A summary of options is included below\&.
.PP
\fB\-\-prompt \fR\fB\fIYour custom message\fR\fR
.RS 4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lxsession-0.4.3/man/lxsession.1 new/lxsession-0.4.4/man/lxsession.1
--- old/lxsession-0.4.3/man/lxsession.1 2010-03-18 17:34:42.000000000 +0100
+++ new/lxsession-0.4.4/man/lxsession.1 2010-04-05 18:24:57.000000000 +0200
@@ -9,6 +9,15 @@
.\"
.TH "LXSESSION" "1" "March 2, 2008" "http://LXDE\&.org" "http://LXDE.org"
.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
.\" disable hyphenation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lxsession-0.4.3/po/LINGUAS new/lxsession-0.4.4/po/LINGUAS
--- old/lxsession-0.4.3/po/LINGUAS 2010-02-16 19:21:39.000000000 +0100
+++ new/lxsession-0.4.4/po/LINGUAS 2010-04-05 18:24:50.000000000 +0200
@@ -1,18 +1,21 @@
af
ar
bg
+bn
bn_IN
ca
cs
da
de
el
+en_GB
es
es_VE
et
eu
fa
fi
+fo
fr
frp
gl
@@ -33,11 +36,13 @@
ps
pt
pt_BR
+ro
ru
sk
sl
sr
sv
+th
tr
uk
ur
@@ -45,4 +50,3 @@
vi
zh_CN
zh_TW
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lxsession-0.4.3/po/Makefile.in.in new/lxsession-0.4.4/po/Makefile.in.in
--- old/lxsession-0.4.3/po/Makefile.in.in 2010-03-18 17:34:31.000000000 +0100
+++ new/lxsession-0.4.4/po/Makefile.in.in 2010-03-31 18:29:34.000000000 +0200
@@ -56,7 +56,7 @@
PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
@@ -129,7 +129,7 @@
done
# Empty stubs to satisfy archaic automake needs
-dvi info tags TAGS ID:
+dvi info ctags tags CTAGS TAGS ID:
# Define this as empty until I found a useful application.
install-exec installcheck:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lxsession-0.4.3/po/bg.po new/lxsession-0.4.4/po/bg.po
--- old/lxsession-0.4.3/po/bg.po 2010-02-16 19:21:39.000000000 +0100
+++ new/lxsession-0.4.4/po/bg.po 2010-03-31 17:56:46.000000000 +0200
@@ -8,14 +8,14 @@
"Project-Id-Version: lxsession\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-04-15 19:49+0200\n"
-"PO-Revision-Date: 2009-10-09 12:22+0200\n"
-"Last-Translator: Rossen Karpuzov <gustav cointech net>\n"
-"Language-Team: Mandriva User Group - Bulgaria \n"
-"MIME-Version: 1.0\n"
+"PO-Revision-Date: 2010-03-31 00:35+0200\n"
+"Last-Translator: Радослав Иванов \n"
+"Language-Team: MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
"X-Poedit-Language: Bulgarian\n"
-"X-Poedit-Country: BULGARIA\n"
+"MIME-Version: 1.0\n"
#: ../lxsession-logout/main.c:63
msgid "Custom message to show on the dialog"
@@ -31,11 +31,11 @@
#: ../lxsession-logout/main.c:64
msgid "image file"
-msgstr "файл с изображение"
+msgstr "снимка"
#: ../lxsession-logout/main.c:65
msgid "Position of the banner"
-msgstr "позиция на банера"
+msgstr "Позиция на банера"
#: ../lxsession-logout/main.c:354
#: ../lxsession-logout/main.c:365
@@ -49,17 +49,17 @@
#: ../lxsession-logout/main.c:376
msgid "Logout"
-msgstr "Излез"
+msgstr "Изход"
#. %s is the name of the desktop session
#: ../lxsession-logout/main.c:428
#, c-format
msgid "<b><big>Logout %s session?</big></b>"
-msgstr "<b><big>Излизате от %s сесия?</big></b>"
+msgstr "<b><big>Изход от %s сесия?</big></b>"
#: ../lxsession-logout/main.c:438
msgid "Sh_utdown"
-msgstr "_Изключи"
+msgstr "_Изключване"
#: ../lxsession-logout/main.c:443
msgid "_Reboot"
@@ -79,5 +79,5 @@
#: ../lxsession-logout/main.c:466
msgid "_Logout"
-msgstr "И_злез"
+msgstr "_Излизане"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lxsession-0.4.3/po/bn.po new/lxsession-0.4.4/po/bn.po
--- old/lxsession-0.4.3/po/bn.po 1970-01-01 01:00:00.000000000 +0100
+++ new/lxsession-0.4.4/po/bn.po 2010-02-06 20:46:15.000000000 +0100
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+
+# Sankarshan , 2009.
+# Sadia Afroz , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-04-15 19:49+0200\n"
+"PO-Revision-Date: 2010-01-31 16:49+0600\n"
+"Last-Translator: Sadia Afroz \n"
+"Language-Team: Bengali \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#: ../lxsession-logout/main.c:63
+msgid "Custom message to show on the dialog"
+msgstr "ডায়ালগে প্রদর্শনের জন্য স্বনির্ধারিত বার্তা"
+
+#: ../lxsession-logout/main.c:63
+msgid "message"
+msgstr "বার্তা"
+
+#: ../lxsession-logout/main.c:64
+msgid "Banner to show on the dialog"
+msgstr "ডায়ালগে প্রদর্শন করার ব্যানার"
+
+#: ../lxsession-logout/main.c:64
+msgid "image file"
+msgstr "ছবির ফাইল"
+
+#: ../lxsession-logout/main.c:65
+msgid "Position of the banner"
+msgstr "ব্যানারের অবস্থান"
+
+#: ../lxsession-logout/main.c:354 ../lxsession-logout/main.c:365
+#, c-format
+msgid "Error: %s\n"
+msgstr "ত্রুটি: %s\n"
+
+#: ../lxsession-logout/main.c:354
+msgid "LXSession is not running."
+msgstr "LXSession চলছে না।"
+
+#: ../lxsession-logout/main.c:376
+msgid "Logout"
+msgstr "লগ-আউট"
+
+#. %s is the name of the desktop session
+#: ../lxsession-logout/main.c:428
+#, c-format
+msgid "<b><big>Logout %s session?</big></b>"
+msgstr "<b><big>%s সেশন লগ-আউট করা হবে?</big></b>"
+
+#: ../lxsession-logout/main.c:438
+msgid "Sh_utdown"
+msgstr "বন্ধ (_u)"
+
+#: ../lxsession-logout/main.c:443
+msgid "_Reboot"
+msgstr "পুনরায় আরম্ভ (_R)"
+
+#: ../lxsession-logout/main.c:448
+msgid "_Suspend"
+msgstr "স্থগিত (_S)"
+
+#: ../lxsession-logout/main.c:453
+msgid "_Hibernate"
+msgstr "বিচেতন (_H)"
+
+#: ../lxsession-logout/main.c:462
+msgid "S_witch User"
+msgstr "ব্যবহারকারী পরিবর্তন করুন (_w)"
+
+#: ../lxsession-logout/main.c:466
+msgid "_Logout"
+msgstr "লগ-আউট (_L)"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lxsession-0.4.3/po/de.po new/lxsession-0.4.4/po/de.po
--- old/lxsession-0.4.3/po/de.po 2010-03-07 16:10:17.000000000 +0100
+++ new/lxsession-0.4.4/po/de.po 2010-03-28 20:20:12.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: lxsession-lite\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-02 04:07+0000\n"
+"POT-Creation-Date: 2010-03-19 04:10+0000\n"
"PO-Revision-Date: 2009-03-22 15:14+0100\n"
"Last-Translator: Benedikt Klus \n"
"Language-Team: Deutsch \n"
@@ -64,11 +64,11 @@
#: ../lxsession-logout/main.c:452
msgid "_Suspend"
-msgstr "Ru_hezustand"
+msgstr "_Bereitschaft"
#: ../lxsession-logout/main.c:457
msgid "_Hibernate"
-msgstr "_Bereitschaft"
+msgstr "Ru_hezustand"
#: ../lxsession-logout/main.c:466
msgid "S_witch User"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lxsession-0.4.3/po/en_GB.po new/lxsession-0.4.4/po/en_GB.po
--- old/lxsession-0.4.3/po/en_GB.po 1970-01-01 01:00:00.000000000 +0100
+++ new/lxsession-0.4.4/po/en_GB.po 2010-03-31 17:56:46.000000000 +0200
@@ -0,0 +1,79 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: lxsession\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-28 04:11+0000\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Steve Cook (Yorvyk) \n"
+"Language-Team: English UK en_GB \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\\n\n"
+"X-Poedit-Language: English\n"
+"X-Poedit-Country: UNITED KINGDOM\n"
+
+#: ../lxsession-logout/main.c:63
+msgid "Custom message to show on the dialog"
+msgstr "Custom message to show on the dialogue"
+
+#: ../lxsession-logout/main.c:63
+msgid "message"
+msgstr "message"
+
+#: ../lxsession-logout/main.c:64
+msgid "Banner to show on the dialog"
+msgstr "Banner to show on the dialogue"
+
+#: ../lxsession-logout/main.c:64
+msgid "image file"
+msgstr "image file"
+
+#: ../lxsession-logout/main.c:65
+msgid "Position of the banner"
+msgstr "Position of the banner"
+
+#: ../lxsession-logout/main.c:355
+#: ../lxsession-logout/main.c:366
+#, c-format
+msgid "Error: %s\n"
+msgstr "Error: %s\n"
+
+#: ../lxsession-logout/main.c:355
+msgid "LXSession is not running."
+msgstr "LXSession is not running."
+
+#: ../lxsession-logout/main.c:380
+msgid "Logout"
+msgstr "Logout"
+
+#. %s is the name of the desktop session
+#: ../lxsession-logout/main.c:432
+#, c-format
+msgid "<b><big>Logout %s session?</big></b>"
+msgstr "<b><big>Logout %s session?</big></b>"
+
+#: ../lxsession-logout/main.c:442
+msgid "Sh_utdown"
+msgstr "Sh_utdown"
+
+#: ../lxsession-logout/main.c:447
+msgid "_Reboot"
+msgstr "_Reboot"
+
+#: ../lxsession-logout/main.c:452
+msgid "_Suspend"
+msgstr "_Suspend"
+
+#: ../lxsession-logout/main.c:457
+msgid "_Hibernate"
+msgstr "_Hibernate"
+
+#: ../lxsession-logout/main.c:466
+msgid "S_witch User"
+msgstr "S_witch User"
+
+#: ../lxsession-logout/main.c:470
+msgid "_Logout"
+msgstr "_Logout"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lxsession-0.4.3/po/fo.po new/lxsession-0.4.4/po/fo.po
--- old/lxsession-0.4.3/po/fo.po 1970-01-01 01:00:00.000000000 +0100
+++ new/lxsession-0.4.4/po/fo.po 2010-03-31 18:30:08.000000000 +0200
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-04-15 19:49+0200\n"
+"PO-Revision-Date: 2010-03-23 00:43+0200\n"
+"Last-Translator: Gunleif \n"
+"Language-Team: LANGUAGE \n"
+"Language: fo\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.1\n"
+
+#: ../lxsession-logout/main.c:63
+msgid "Custom message to show on the dialog"
+msgstr "Sergjørd boðan"
+
+#: ../lxsession-logout/main.c:63
+msgid "message"
+msgstr "boðan"
+
+#: ../lxsession-logout/main.c:64
+msgid "Banner to show on the dialog"
+msgstr "Teknindi at sýna í damrøðukassanum"
+
+#: ../lxsession-logout/main.c:64
+msgid "image file"
+msgstr "myndafíla"
+
+#: ../lxsession-logout/main.c:65
+msgid "Position of the banner"
+msgstr ""
+
+#: ../lxsession-logout/main.c:354 ../lxsession-logout/main.c:365
+#, c-format
+msgid "Error: %s\n"
+msgstr "Villar: %s\n"
+
+#: ../lxsession-logout/main.c:354
+msgid "LXSession is not running."
+msgstr "LXSession koyrir ikki."
+
+#: ../lxsession-logout/main.c:376
+msgid "Logout"
+msgstr "Útrita"
+
+#. %s is the name of the desktop session
+#: ../lxsession-logout/main.c:428
+#, c-format
+msgid "<b><big>Logout %s session?</big></b>"
+msgstr "<b><big>Útrita úr %s setu?</big></b>"
+
+#: ../lxsession-logout/main.c:438
+msgid "Sh_utdown"
+msgstr "_Sløkk"
+
+#: ../lxsession-logout/main.c:443
+msgid "_Reboot"
+msgstr "_Endurbyrja"
+
+#: ../lxsession-logout/main.c:448
+msgid "_Suspend"
+msgstr "_Steðga"
+
+#: ../lxsession-logout/main.c:453
+msgid "_Hibernate"
+msgstr "_Dvala"
+
+#: ../lxsession-logout/main.c:462
+msgid "S_witch User"
+msgstr "S_kift brúkara"
+
+#: ../lxsession-logout/main.c:466
+msgid "_Logout"
+msgstr "_Útrita"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lxsession-0.4.3/po/ro.po new/lxsession-0.4.4/po/ro.po
--- old/lxsession-0.4.3/po/ro.po 1970-01-01 01:00:00.000000000 +0100
+++ new/lxsession-0.4.4/po/ro.po 2010-02-06 20:46:15.000000000 +0100
@@ -0,0 +1,77 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LXDE\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-04-15 19:49+0200\n"
+"PO-Revision-Date: 2010-01-24 11:10-0800\n"
+"Last-Translator: alexxed \n"
+"Language-Team: Romanian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
+"X-Generator: Narro 0.9.4 on http://tradu.softwareliber.ro\n"
+
+#: ../lxsession-logout/main.c:63
+msgid "Custom message to show on the dialog"
+msgstr "Mesaj personalizat pentru afișarea în caseta de dialog"
+
+#: ../lxsession-logout/main.c:63
+msgid "message"
+msgstr "mesaj"
+
+#: ../lxsession-logout/main.c:64
+msgid "Banner to show on the dialog"
+msgstr "Mesaj sau imagine de afișat în dialog"
+
+#: ../lxsession-logout/main.c:64
+msgid "image file"
+msgstr "fișier imagine"
+
+#: ../lxsession-logout/main.c:65
+msgid "Position of the banner"
+msgstr "Poziția imaginii"
+
+#: ../lxsession-logout/main.c:354 ../lxsession-logout/main.c:365
+#, c-format
+msgid "Error: %s\n"
+msgstr "Eroare: %s\n"
+
+#: ../lxsession-logout/main.c:354
+msgid "LXSession is not running."
+msgstr "LXSession nu rulează."
+
+#: ../lxsession-logout/main.c:376
+msgid "Logout"
+msgstr "Ieșire"
+
+#. %s is the name of the desktop session
+#: ../lxsession-logout/main.c:428
+#, c-format
+msgid "<b><big>Logout %s session?</big></b>"
+msgstr "<b><big>Ieșiți din sesiunea %s?</big></b>"
+
+#: ../lxsession-logout/main.c:438
+msgid "Sh_utdown"
+msgstr "Oprește calc_ulatorul"
+
+#: ../lxsession-logout/main.c:443
+msgid "_Reboot"
+msgstr "_Repornește"
+
+#: ../lxsession-logout/main.c:448
+msgid "_Suspend"
+msgstr "_Suspendă"
+
+#: ../lxsession-logout/main.c:453
+msgid "_Hibernate"
+msgstr "_Hibernează"
+
+#: ../lxsession-logout/main.c:462
+msgid "S_witch User"
+msgstr "_Schimbă utilizatorul"
+
+#: ../lxsession-logout/main.c:466
+msgid "_Logout"
+msgstr "_Ieșire"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lxsession-0.4.3/po/th.po new/lxsession-0.4.4/po/th.po
--- old/lxsession-0.4.3/po/th.po 1970-01-01 01:00:00.000000000 +0100
+++ new/lxsession-0.4.4/po/th.po 2010-03-31 17:56:46.000000000 +0200
@@ -0,0 +1,80 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-04-15 19:49+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../lxsession-logout/main.c:63
+msgid "Custom message to show on the dialog"
+msgstr ""
+
+#: ../lxsession-logout/main.c:63
+msgid "message"
+msgstr ""
+
+#: ../lxsession-logout/main.c:64
+msgid "Banner to show on the dialog"
+msgstr ""
+
+#: ../lxsession-logout/main.c:64
+msgid "image file"
+msgstr ""
+
+#: ../lxsession-logout/main.c:65
+msgid "Position of the banner"
+msgstr ""
+
+#: ../lxsession-logout/main.c:354 ../lxsession-logout/main.c:365
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: ../lxsession-logout/main.c:354
+msgid "LXSession is not running."
+msgstr ""
+
+#: ../lxsession-logout/main.c:376
+msgid "Logout"
+msgstr ""
+
+#. %s is the name of the desktop session
+#: ../lxsession-logout/main.c:428
+#, c-format
+msgid "<b><big>Logout %s session?</big></b>"
+msgstr ""
+
+#: ../lxsession-logout/main.c:438
+msgid "Sh_utdown"
+msgstr ""
+
+#: ../lxsession-logout/main.c:443
+msgid "_Reboot"
+msgstr ""
+
+#: ../lxsession-logout/main.c:448
+msgid "_Suspend"
+msgstr ""
+
+#: ../lxsession-logout/main.c:453
+msgid "_Hibernate"
+msgstr ""
+
+#: ../lxsession-logout/main.c:462
+msgid "S_witch User"
+msgstr ""
+
+#: ../lxsession-logout/main.c:466
+msgid "_Logout"
+msgstr ""
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org