Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2015-03-18 13:05:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-session" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2015-03-09 10:05:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2015-03-18 13:05:08.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Mar 16 08:45:42 UTC 2015 - g...@opensuse.org + +- update to version 4.12.1 + - bump libxfce4ui min to 4.12.1 + - drop check for sessions file before it's written (bxo#11632) + - translation updates + +------------------------------------------------------------------- Old: ---- xfce4-session-4.12.0.tar.bz2 New: ---- xfce4-session-4.12.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-session.spec ++++++ --- /var/tmp/diff_new_pack.A95rAq/_old 2015-03-18 13:05:09.000000000 +0100 +++ /var/tmp/diff_new_pack.A95rAq/_new 2015-03-18 13:05:09.000000000 +0100 @@ -19,7 +19,7 @@ %define libname libxfsm-4_6-0 Name: xfce4-session -Version: 4.12.0 +Version: 4.12.1 Release: 0 Summary: Xfce Session Manager License: GPL-2.0 ++++++ xfce4-session-4.12.0.tar.bz2 -> xfce4-session-4.12.1.tar.bz2 ++++++ ++++ 32632 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/xfce4-session-4.12.0/ChangeLog new/xfce4-session-4.12.1/ChangeLog --- old/xfce4-session-4.12.0/ChangeLog 2015-02-28 17:28:40.000000000 +0100 +++ new/xfce4-session-4.12.1/ChangeLog 2015-03-16 08:29:52.000000000 +0100 @@ -1,3 +1,37 @@ +commit bf78012c59319443da4e8f241483e338a6a80911 +Author: Eric Koegel <eric.koe...@gmail.com> +Date: Mon Mar 16 10:24:24 2015 +0300 + + Bump libxfce4ui min to 4.12.1 + + libxfce4ui contains a bugfix for xfsm 4.12 so bump the minimum to + ensure it gets used. + +commit a4620bb65812a7537d35e40c5117407392424f16 +Author: Anonymous <nore...@xfce.org> +Date: Sat Mar 14 18:30:48 2015 +0100 + + I18n: Update translation lt (100%). + + 203 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 364342fbd84c924783a415046f813169cf1d1a0a +Author: Eric Koegel <eric.koe...@gmail.com> +Date: Fri Mar 6 19:55:02 2015 +0300 + + Drop check for sessions file before it's written (Bug #11632) + + Just opening the session file in rc_open doesn't cause a write, + so drop the unneeded check that was breaking session saves. + +commit 66002968143827cf83b6e17276f7a49025f7c84e +Author: Sean Davis <smd.seanda...@gmail.com> +Date: Sat Feb 28 11:33:03 2015 -0500 + + Post release tag bump + commit 8bb68f5a15a45939bd7d567c2e67d5f1d4e42aaf Author: Sean Davis <smd.seanda...@gmail.com> Date: Sat Feb 28 11:25:16 2015 -0500 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/xfce4-session-4.12.0/INSTALL new/xfce4-session-4.12.1/INSTALL --- old/xfce4-session-4.12.0/INSTALL 2015-02-28 17:28:14.000000000 +0100 +++ new/xfce4-session-4.12.1/INSTALL 2015-03-16 08:29:44.000000000 +0100 @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, @@ -12,8 +12,8 @@ Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following + Briefly, the shell command `./configure && make && make install' +should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. Some packages provide this `INSTALL' file but do not implement all of the features documented @@ -309,9 +309,10 @@ overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== @@ -367,4 +368,3 @@ `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. - 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/xfce4-session-4.12.0/NEWS new/xfce4-session-4.12.1/NEWS --- old/xfce4-session-4.12.0/NEWS 2015-02-28 17:28:00.000000000 +0100 +++ new/xfce4-session-4.12.1/NEWS 2015-03-16 08:29:32.000000000 +0100 @@ -1,3 +1,14 @@ +4.12.1 +====== +Stable release of xfce4-session for Xfce 4.12. + +* Miscellaneous bug fixes: + - Bump libxfce4ui min to 4.12.1 + - Drop check for sessions file before it's written (Bug #11632) + +* Translation updates: + Lithuanian (lt) + 4.12.0 ====== Stable release of xfce4-session for Xfce 4.12. 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/xfce4-session-4.12.0/compile new/xfce4-session-4.12.1/compile --- old/xfce4-session-4.12.0/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-session-4.12.1/compile 2015-03-16 08:29:44.000000000 +0100 @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey <tro...@cygnus.com>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <bug-autom...@gnu.org> or send patches to +# <automake-patc...@gnu.org>. + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to <bug-autom...@gnu.org>. +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: 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/xfce4-session-4.12.0/config.h.in new/xfce4-session-4.12.1/config.h.in --- old/xfce4-session-4.12.0/config.h.in 2015-02-28 17:28:13.000000000 +0100 +++ new/xfce4-session-4.12.1/config.h.in 2015-03-16 08:29:52.000000000 +0100 @@ -181,8 +181,7 @@ /* Define for X11R5 sm compat */ #undef LEGACY_SESSION_MANAGEMENT -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Name of package */ 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/xfce4-session-4.12.0/configure.ac new/xfce4-session-4.12.1/configure.ac --- old/xfce4-session-4.12.0/configure.ac 2015-02-28 17:28:11.000000000 +0100 +++ new/xfce4-session-4.12.1/configure.ac 2015-03-16 08:29:39.000000000 +0100 @@ -13,9 +13,9 @@ dnl Version information m4_define([xfsm_version_major], [4]) m4_define([xfsm_version_minor], [12]) -m4_define([xfsm_version_micro], [0]) +m4_define([xfsm_version_micro], [1]) m4_define([xfsm_version_nano], []) dnl leave this empty to have no nano version -m4_define([xfsm_version_build], [8bb68f5]) +m4_define([xfsm_version_build], [bf78012]) m4_define([xfsm_version_tag], []) m4_define([xfsm_version], [xfsm_version_major().xfsm_version_minor().xfsm_version_micro()ifelse(xfsm_version_nano(), [], [], [.xfsm_version_nano()])ifelse(xfsm_version_tag(), [git], [xfsm_version_tag()-xfsm_version_build()], [xfsm_version_tag()])]) @@ -106,7 +106,7 @@ dnl Check for required packages XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.9.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.9.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.12.1]) XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0]) XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.24.0]) XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.30]) 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/xfce4-session-4.12.0/missing new/xfce4-session-4.12.1/missing --- old/xfce4-session-4.12.0/missing 2015-02-28 17:28:13.000000000 +0100 +++ new/xfce4-session-4.12.1/missing 2015-03-16 08:29:44.000000000 +0100 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.13; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,68 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <bug-autom...@gnu.org>." exit $? @@ -99,228 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) 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/xfce4-session-4.12.0/po/Makefile.in.in new/xfce4-session-4.12.1/po/Makefile.in.in --- old/xfce4-session-4.12.0/po/Makefile.in.in 2015-02-28 17:28:11.000000000 +0100 +++ new/xfce4-session-4.12.1/po/Makefile.in.in 2015-03-16 08:29:39.000000000 +0100 @@ -33,8 +33,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ libdir = @libdir@ -DATADIRNAME = @DATADIRNAME@ -itlocaledir = $(prefix)/$(DATADIRNAME)/locale +localedir = @localedir@ subdir = po install_sh = @install_sh@ # Automake >= 1.8 provides @mkdir_p@. @@ -109,7 +108,7 @@ install-data-yes: all linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ - dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ + dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ $(mkdir_p) $$dir; \ if test -r $$lang.gmo; then \ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ @@ -143,8 +142,8 @@ uninstall: linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ done check: all $(GETTEXT_PACKAGE).pot 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/xfce4-session-4.12.0/po/lt.po new/xfce4-session-4.12.1/po/lt.po --- old/xfce4-session-4.12.0/po/lt.po 2015-02-28 17:28:00.000000000 +0100 +++ new/xfce4-session-4.12.1/po/lt.po 2015-03-16 08:27:33.000000000 +0100 @@ -5,14 +5,15 @@ # Translators: # Algimantas Margevičius <margevicius.algiman...@gmail.com>, 2012 # Mantas Zapolskas <man...@users.sf.net>, 2004 +# Moo, 2015 msgid "" msgstr "" "Project-Id-Version: Xfce4-session\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-02 22:44+0200\n" -"PO-Revision-Date: 2013-11-19 13:02+0000\n" -"Last-Translator: Nick <n...@xfce.org>\n" -"Language-Team: Lithuanian (http://www.transifex.com/projects/p/xfce/language/lt/)\n" +"POT-Creation-Date: 2014-08-28 18:30+0200\n" +"PO-Revision-Date: 2015-03-14 16:46+0000\n" +"Last-Translator: Moo\n" +"Language-Team: Lithuanian (http://www.transifex.com/projects/p/xfce4-session/language/lt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -187,7 +188,7 @@ #: ../settings/main.c:128 msgid "App_lication Autostart" -msgstr "" +msgstr "_Automatinis programų paleidimas" #: ../settings/session-editor.c:61 msgid "If running" @@ -522,7 +523,7 @@ msgid "Session manager must be in idle state when requesting a shutdown" msgstr "Kai prašoma išjungti, seanso tvarkyklė turi būti neveiklumo būsenoje" -#: ../xfce4-session/xfsm-logout-dialog.c:188 +#: ../xfce4-session/xfsm-logout-dialog.c:182 #, c-format msgid "Log out %s" msgstr "Atsijungti %s" @@ -530,44 +531,34 @@ #. * #. * Logout #. * -#: ../xfce4-session/xfsm-logout-dialog.c:246 +#: ../xfce4-session/xfsm-logout-dialog.c:224 msgid "_Log Out" msgstr "_Atsijungti" -#: ../xfce4-session/xfsm-logout-dialog.c:266 +#: ../xfce4-session/xfsm-logout-dialog.c:244 msgid "_Restart" msgstr "Paleisti iš _naujo" -#: ../xfce4-session/xfsm-logout-dialog.c:286 +#: ../xfce4-session/xfsm-logout-dialog.c:264 msgid "Shut _Down" msgstr "Išj_ungti" -#: ../xfce4-session/xfsm-logout-dialog.c:309 +#: ../xfce4-session/xfsm-logout-dialog.c:287 msgid "Sus_pend" msgstr "_Sustabdyti" -#: ../xfce4-session/xfsm-logout-dialog.c:343 +#: ../xfce4-session/xfsm-logout-dialog.c:321 msgid "_Hibernate" msgstr "_Užmigdyti" -#: ../xfce4-session/xfsm-logout-dialog.c:368 +#: ../xfce4-session/xfsm-logout-dialog.c:346 msgid "_Save session for future logins" msgstr "_Išsaugoti seansą būsimiems prisijungimams" -#: ../xfce4-session/xfsm-logout-dialog.c:395 -msgid "Please enter your password" -msgstr "Įveskite savo slaptažodį" - -#: ../xfce4-session/xfsm-logout-dialog.c:427 +#: ../xfce4-session/xfsm-logout-dialog.c:374 msgid "An error occurred" msgstr "Įvyko klaida" -#: ../xfce4-session/xfsm-logout-dialog.c:433 -msgid "" -"Either the password you entered is invalid, or the system administrator " -"disallows shutting down this computer with your user account." -msgstr "Jūs įvedėte neteisingą slaptažodį arba sistemos administratorius neleidžia Jums išjungti kompiuterio." - #: ../xfce4-session/xfsm-splash-screen.c:178 msgid "Choose session" msgstr "Pasirinkti seansą" @@ -580,88 +571,88 @@ msgid "Choose a name for the new session:" msgstr "Pasirinkite naujo seanso naują vardą:" -#: ../xfce4-session/xfsm-startup.c:347 +#: ../xfce4-session/xfsm-startup.c:397 msgid "Starting the Volume Controller" msgstr "Paleidžiamas garso valdiklis" -#: ../xfce4-session/xfsm-startup.c:349 +#: ../xfce4-session/xfsm-startup.c:399 msgid "Starting the Panel" msgstr "Paleidžiamas skydelis" -#: ../xfce4-session/xfsm-startup.c:351 +#: ../xfce4-session/xfsm-startup.c:401 msgid "Starting the Desktop Manager" msgstr "Paleidžiama darbalaukio tvarkyklė" -#: ../xfce4-session/xfsm-startup.c:353 +#: ../xfce4-session/xfsm-startup.c:403 msgid "Starting the Taskbar" msgstr "Paleidžiama užduočių juosta" -#: ../xfce4-session/xfsm-startup.c:355 +#: ../xfce4-session/xfsm-startup.c:405 msgid "Starting the Window Manager" msgstr "Paleidžiama langų tvarkyklė" -#: ../xfce4-session/xfsm-startup.c:359 +#: ../xfce4-session/xfsm-startup.c:409 msgid "Starting the Gnome Terminal Emulator" msgstr "Paleidžiamas Gnome terminalas" -#: ../xfce4-session/xfsm-startup.c:363 +#: ../xfce4-session/xfsm-startup.c:413 msgid "Starting the KDE Advanced Text Editor" msgstr "Paleidžiamas KDE tekstinis redaktorius" -#: ../xfce4-session/xfsm-startup.c:365 +#: ../xfce4-session/xfsm-startup.c:415 msgid "Starting the KDE Clipboard Manager" msgstr "Paleidžiama KDE iškarpinės tvarkyklė" -#: ../xfce4-session/xfsm-startup.c:367 +#: ../xfce4-session/xfsm-startup.c:417 msgid "Starting the KDE Mail Reader" msgstr "Paleidžiama KDE pašto programa" -#: ../xfce4-session/xfsm-startup.c:369 +#: ../xfce4-session/xfsm-startup.c:419 msgid "Starting the KDE News Reader" msgstr "Paleidžiama KDE naujienų skaityklė" -#: ../xfce4-session/xfsm-startup.c:371 +#: ../xfce4-session/xfsm-startup.c:421 msgid "Starting the Konqueror" msgstr "Paleidžiama Konqueror" -#: ../xfce4-session/xfsm-startup.c:373 +#: ../xfce4-session/xfsm-startup.c:423 msgid "Starting the KDE Terminal Emulator" msgstr "Paleidžiamas KDE terminalo emuliatorius" -#: ../xfce4-session/xfsm-startup.c:377 +#: ../xfce4-session/xfsm-startup.c:427 msgid "Starting the Beep Media Player" msgstr "Paleidžiama Beep Media Player" -#: ../xfce4-session/xfsm-startup.c:379 +#: ../xfce4-session/xfsm-startup.c:429 msgid "Starting The Gimp" msgstr "Paleidžiama Gimp" -#: ../xfce4-session/xfsm-startup.c:381 +#: ../xfce4-session/xfsm-startup.c:431 msgid "Starting the VI Improved Editor" msgstr "Paleidžiamas VI Improved tekstinis redaktorius" -#: ../xfce4-session/xfsm-startup.c:383 +#: ../xfce4-session/xfsm-startup.c:433 msgid "Starting the Session Management Proxy" msgstr "Paleidžiamas seanso tvarkymo tarpinis serveris" -#: ../xfce4-session/xfsm-startup.c:385 +#: ../xfce4-session/xfsm-startup.c:435 msgid "Starting the X-Chat IRC Client" msgstr "Paleidžiamas X-Chat IRC klientas" -#: ../xfce4-session/xfsm-startup.c:387 +#: ../xfce4-session/xfsm-startup.c:437 msgid "Starting the X Multimedia System" msgstr "Paleidžiama X Multimedia System" -#: ../xfce4-session/xfsm-startup.c:389 +#: ../xfce4-session/xfsm-startup.c:439 msgid "Starting the X Terminal Emulator" msgstr "Paleidžiamas X terminalo emuliatorius" -#: ../xfce4-session/xfsm-startup.c:391 +#: ../xfce4-session/xfsm-startup.c:441 #, c-format msgid "Starting %s" msgstr "Paleidžiama %s" -#: ../xfce4-session/xfsm-startup.c:515 +#: ../xfce4-session/xfsm-startup.c:565 #, c-format msgid "" "The location and the format of the autostart directory has changed.\n" @@ -676,34 +667,19 @@ "You should delete this directory now.\n" msgstr "Automatinio paleidimo aplanko vieta ir formatas pasikeitė.\nNauja vieta yra\n\n %s\n\nten jūs galite įdėti .desktop failus, kurie aprašo programas\nkurios bus paleistos kai prisijungsite prie Xfce darbastalio.\nJūsų seni failai buvo perkelti į naują vietą.\nDabar galite ištrinti aplanką.\n" -#: ../xfce4-session/xfsm-startup.c:684 +#: ../xfce4-session/xfsm-startup.c:734 msgid "Performing Autostart..." msgstr "Vykdomas automatinis paleidimas..." -#: ../xfce4-session/xfsm-startup.c:790 +#: ../xfce4-session/xfsm-startup.c:840 msgid "Starting Assistive Technologies" msgstr "Paleidžiamos pagalbinės technologijos" -#: ../xfce4-session/xfsm-shutdown.c:429 -#, c-format -msgid "Error sending command to shutdown helper: %s" -msgstr "Klaida siunčiant komandą išjungimo padėjėjui: %s" - -#: ../xfce4-session/xfsm-shutdown.c:442 -#, c-format -msgid "Error receiving response from shutdown helper: %s" -msgstr "Klaida gaunant atsakymą iš išjungimo padėjėjo: %s" - -#: ../xfce4-session/xfsm-shutdown.c:450 -#, c-format -msgid "Shutdown command failed" -msgstr "Išjungimo komanda nepavyko" - -#: ../xfce4-session/xfsm-shutdown.c:555 +#: ../xfce4-session/xfsm-shutdown.c:182 msgid "Shutdown is blocked by the kiosk settings" msgstr "Išjungimas užblokuotas „kiosk“ nustatymuose" -#: ../xfce4-session/xfsm-shutdown.c:638 +#: ../xfce4-session/xfsm-shutdown.c:233 #, c-format msgid "Unknown shutdown method %d" msgstr "Nežinomas išjungimo būdas %d" @@ -794,7 +770,7 @@ #: ../settings/xfce4-session-settings.glade.h:8 msgid "Automatically save session on logo_ut" -msgstr "" +msgstr "Automatiškai išsaugoti seansą, atsi_jungiant" #: ../settings/xfce4-session-settings.glade.h:9 msgid "Always save the session when logging out" @@ -802,7 +778,7 @@ #: ../settings/xfce4-session-settings.glade.h:10 msgid "Pro_mpt on logout" -msgstr "" +msgstr "_Klausti, atsijungiant" #: ../settings/xfce4-session-settings.glade.h:11 msgid "Prompt for confirmation when logging out" @@ -869,7 +845,7 @@ #: ../settings/xfce4-session-settings.glade.h:26 msgid "Save Sess_ion" -msgstr "" +msgstr "Išsaugot_i seansą" #: ../settings/xfce4-session-settings.glade.h:27 msgid "Empty the session cache" @@ -877,7 +853,7 @@ #: ../settings/xfce4-session-settings.glade.h:28 msgid "Clear save_d sessions" -msgstr "" +msgstr "Išvalyti išsaugo_tus seansus" #: ../settings/xfce4-session-settings.glade.h:29 msgid "Quit the program, and remove it from the session" @@ -885,7 +861,7 @@ #: ../settings/xfce4-session-settings.glade.h:31 msgid "Sessio_n" -msgstr "" +msgstr "Sea_nsas" #: ../settings/xfce4-session-settings.glade.h:32 msgid "Launch GN_OME services on startup" @@ -922,7 +898,7 @@ #: ../settings/xfce4-session-settings.glade.h:40 msgid "Lock screen be_fore sleep" -msgstr "" +msgstr "_Prieš užmigdant, užrakinti ekraną" #: ../settings/xfce4-session-settings.glade.h:41 msgid "Run xflock4 before suspending or hibernating the system" 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/xfce4-session-4.12.0/scripts/xinitrc.in new/xfce4-session-4.12.1/scripts/xinitrc.in --- old/xfce4-session-4.12.0/scripts/xinitrc.in 2015-02-28 17:28:21.000000000 +0100 +++ new/xfce4-session-4.12.1/scripts/xinitrc.in 2015-03-16 08:29:52.000000000 +0100 @@ -52,9 +52,9 @@ # Modify libglade and glade environment variables so that # it will find the files installed by Xfce -GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:/usr/share/glade3/catalogs" -GLADE_PIXMAP_PATH="$GLADE_PIXMAP_PATH:/usr/lib/glade3/modules" -GLADE_MODULE_PATH="$GLADE_MODULE_PATH:/usr/share/glade3/pixmaps" +GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:" +GLADE_PIXMAP_PATH="$GLADE_PIXMAP_PATH:" +GLADE_MODULE_PATH="$GLADE_MODULE_PATH:" export GLADE_CATALOG_PATH export GLADE_PIXMAP_PATH export GLADE_MODULE_PATH 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/xfce4-session-4.12.0/xfce4-session/xfsm-manager.c new/xfce4-session-4.12.1/xfce4-session/xfsm-manager.c --- old/xfce4-session-4.12.0/xfce4-session/xfsm-manager.c 2015-02-28 17:28:00.000000000 +0100 +++ new/xfce4-session-4.12.1/xfce4-session/xfsm-manager.c 2015-03-07 17:25:57.000000000 +0100 @@ -1652,8 +1652,6 @@ GdkDisplay *display; WnckScreen *screen; XfceRc *rc; - GFile *session_file; - GFileInfo *info; GList *lp; gchar prefix[64]; gchar *backup; @@ -1673,32 +1671,6 @@ return; } - session_file = g_file_new_for_path (manager->session_file); - - /* query the file, we need to make sure we can write to it */ - info = g_file_query_info (session_file, - G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, - G_FILE_QUERY_INFO_NONE, - NULL, - NULL); - - /* if we're unable to query the file attributes or write to the file, - * log the failure and return */ - if (!info || !g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE)) - { - fprintf (stderr, - "xfce4-session: Unable to save changes to the session file %s" - "Please check your installation.\n", manager->session_file); - - if (info) - g_object_unref (info); - - xfce_rc_close (rc); - g_object_unref (session_file); - - return; - } - /* backup the old session file first */ if (g_file_test (manager->session_file, G_FILE_TEST_IS_REGULAR)) { @@ -1772,8 +1744,6 @@ xfce_rc_close (rc); - g_object_unref (session_file); - g_free (manager->checkpoint_session_name); manager->checkpoint_session_name = NULL; } ++++++ xfce4-session-adapt-session-scripts.patch ++++++ --- /var/tmp/diff_new_pack.A95rAq/_old 2015-03-18 13:05:10.000000000 +0100 +++ /var/tmp/diff_new_pack.A95rAq/_new 2015-03-18 13:05:10.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xfce4-session-4.12.0/scripts/xinitrc.in +Index: xfce4-session-4.12.1/scripts/xinitrc.in =================================================================== ---- xfce4-session-4.12.0.orig/scripts/xinitrc.in -+++ xfce4-session-4.12.0/scripts/xinitrc.in +--- xfce4-session-4.12.1.orig/scripts/xinitrc.in ++++ xfce4-session-4.12.1/scripts/xinitrc.in @@ -16,11 +16,16 @@ if test "x$XDG_MENU_PREFIX" = "x"; then export XDG_MENU_PREFIX fi @@ -32,7 +32,7 @@ - # Modify libglade and glade environment variables so that # it will find the files installed by Xfce - GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:/usr/share/glade3/catalogs" + GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:" @@ -87,112 +86,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp # load local modmap test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap @@ -158,10 +158,10 @@ -esac - -xsetroot -bg white -fg red -solid black -cursor_name watch -Index: xfce4-session-4.12.0/scripts/xinitrc.in.in +Index: xfce4-session-4.12.1/scripts/xinitrc.in.in =================================================================== ---- xfce4-session-4.12.0.orig/scripts/xinitrc.in.in -+++ xfce4-session-4.12.0/scripts/xinitrc.in.in +--- xfce4-session-4.12.1.orig/scripts/xinitrc.in.in ++++ xfce4-session-4.12.1/scripts/xinitrc.in.in @@ -16,11 +16,16 @@ if test "x$XDG_MENU_PREFIX" = "x"; then export XDG_MENU_PREFIX fi @@ -318,10 +318,10 @@ -esac - -xsetroot -bg white -fg red -solid black -cursor_name watch -Index: xfce4-session-4.12.0/scripts/startxfce4.in +Index: xfce4-session-4.12.1/scripts/startxfce4.in =================================================================== ---- xfce4-session-4.12.0.orig/scripts/startxfce4.in -+++ xfce4-session-4.12.0/scripts/startxfce4.in +--- xfce4-session-4.12.1.orig/scripts/startxfce4.in ++++ xfce4-session-4.12.1/scripts/startxfce4.in @@ -66,13 +66,22 @@ fi if test "x$XDG_DATA_DIRS" = "x" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
