Hello community,
here is the log from the commit of package desktop-file-utils for openSUSE:Factory checked in at 2013-09-04 13:27:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/desktop-file-utils (Old)
and /work/SRC/openSUSE:Factory/.desktop-file-utils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "desktop-file-utils"
Changes:
--------
--- /work/SRC/openSUSE:Factory/desktop-file-utils/desktop-file-utils.changes 2012-10-12 07:48:40.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.desktop-file-utils.new/desktop-file-utils.changes 2013-09-04 13:27:17.000000000 +0200
@@ -1,0 +2,16 @@
+Fri Aug 30 17:55:02 UTC 2013 - hrvoje.senjan@gmail.com
+
+- Update to version 0.22:
+ + desktop-file-validate
+ - add DBusActivatable key to allowed keys
+ - warn about OnlyShowIn in Action groups
+ - allow validating multiple desktop files
+ - improve help output
+ - update man page
+ + update-desktop-database
+ - list only once a desktop file per mime type
+ + misc
+ - honor NOCONFIGURE=1
+- Rebase desktop-file-utils-suse-keys.patch to new release
+
+-------------------------------------------------------------------
Old:
----
desktop-file-utils-0.21.tar.xz
New:
----
desktop-file-utils-0.22.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ desktop-file-utils.spec ++++++
--- /var/tmp/diff_new_pack.EkvqEG/_old 2013-09-04 13:27:18.000000000 +0200
+++ /var/tmp/diff_new_pack.EkvqEG/_new 2013-09-04 13:27:18.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package desktop-file-utils
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: desktop-file-utils
-Version: 0.21
+Version: 0.22
Release: 0
Summary: Utilities for Manipulating Desktop Files
License: GPL-2.0+
++++++ desktop-file-utils-0.21.tar.xz -> desktop-file-utils-0.22.tar.xz ++++++
++++ 3805 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/desktop-file-utils-0.21/ChangeLog new/desktop-file-utils-0.22/ChangeLog
--- old/desktop-file-utils-0.21/ChangeLog 2012-10-11 16:08:39.000000000 +0200
+++ new/desktop-file-utils-0.22/ChangeLog 2013-08-29 09:55:38.000000000 +0200
@@ -1,5 +1,118 @@
# Generated by Makefile. Do not edit.
+commit a539c745051d7eeea6617a0512b71a649105de52
+Author: Vincent Untz
+Date: Thu Aug 29 09:53:31 2013 +0200
+
+ validator: Do not print two errors if file doesn't exist
+
+M src/validator.c
+
+commit 0b6e84cd489091b5fdaea6ffac0fc8a83589e8c7
+Author: Matthias Clasen
+Date: Sun Jul 14 12:18:35 2013 -0400
+
+ Allow validating multiple desktop files
+
+ There is no good reason to not allow this.
+ https://bugs.freedesktop.org/show_bug.cgi?id=60744
+
+M src/validator.c
+
+commit fd0df83df2531e3e25b4d56d0450b39004b8ed20
+Author: Matthias Clasen
+Date: Sun Jul 14 12:04:28 2013 -0400
+
+ Admit that we validate more than 1.0
+
+ While the versioning of the spec itself is in a somewhat sad
+ state, it is more realistic to say we are validating according
+ to 1.1 than to 1.0.
+
+M src/validate.h
+
+commit 9075a05a384998ab96ad707b412a54fa5a8ddf48
+Author: Matthias Clasen
+Date: Sun Jul 14 11:55:58 2013 -0400
+
+ Warn about OnlyShowIn in Action groups
+
+ This was recently removed from the desktop entry spec,
+ see https://bugs.freedesktop.org/show_bug.cgi?id=66712
+
+M src/validate.c
+
+commit 479c0caa966f60367a8595b7f566ced3a82b889b
+Author: Matthias Clasen
+Date: Sun Jul 14 11:54:14 2013 -0400
+
+ Add DBusActivatable key to allowed keys
+
+ This is a recent addition to the desktop entry spec.
+
+M src/validate.c
+
+commit fbbc223e238e0a2da0caff921bdf5aa42f424549
+Author: Matthias Clasen
+Date: Sun Jul 14 12:32:23 2013 -0400
+
+ Update the desktop-file-validate man page
+
+ The man page was not mentioning --no-hints, and was referring
+ to version 1.0 of the desktop entry spec. This commit fixes
+ both issues.
+
+M man/desktop-file-validate.1
+
+commit f8931babe81c347c273c41a5c8bb214a8ca30f45
+Author: Matthias Clasen
+Date: Sun Jul 14 12:28:40 2013 -0400
+
+ Tweak help output to stay within 80 columns
+
+M src/validator.c
+
+commit 645a01946ed5abdf3e314f9b25c24db6132c1988
+Author: Colin Walters
+Date: Mon May 20 16:01:35 2013 -0400
+
+ autogen.sh: Honor NOCONFIGURE=1
+
+ See http://people.gnome.org/~walters/docs/build-api.txt
+
+M autogen.sh
+
+commit f0a269e1d65843822915faa1bb020da8b6b9954c
+Author: Vincent Untz
+Date: Mon Jan 7 09:02:08 2013 +0100
+
+ update-desktop-database: List only once a desktop file per mime type
+
+ If a desktop file is registering the same mime type more than once
+ (useless but okay), the desktop file was listed more than once for that
+ mime type in mimeinfo.cache.
+
+ It's easy to avoid, so make sure we only have a desktop file once per
+ mime type.
+
+M src/update-desktop-database.c
+
+commit ee609e13bbdab6385721b2f27c84f34a049c2fb4
+Author: Vincent Untz
+Date: Thu Oct 11 16:10:38 2012 +0200
+
+ release: post-release bump to 0.22
+
+M configure.ac
+
+commit 762b560ddbea19dfe09f818c7185229b4a3bb080
+Author: Vincent Untz
+Date: Thu Oct 11 16:09:48 2012 +0200
+
+ release: 0.21
+
+M NEWS
+
commit c0c4c6c1dcfc410984a96193678f40b7a31c9ba1
Author: Vincent Untz
Date: Thu Oct 11 15:25:25 2012 +0200
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/desktop-file-utils-0.21/NEWS new/desktop-file-utils-0.22/NEWS
--- old/desktop-file-utils-0.21/NEWS 2012-10-11 16:08:32.000000000 +0200
+++ new/desktop-file-utils-0.22/NEWS 2013-08-29 09:55:26.000000000 +0200
@@ -1,4 +1,21 @@
============
+Version 0.22
+============
+
+ desktop-file-validate
+ - add DBusActivatable key to allowed keys (Matthias Clasen)
+ - warn about OnlyShowIn in Action groups (Matthias Clasen)
+ - allow validating multiple desktop files (Matthias Clasen)
+ - improve help output (Matthias Clasen)
+ - update man page (Matthias Clasen)
+
+ update-desktop-database
+ - list only once a desktop file per mime type (Vincent)
+
+ misc
+ - honor NOCONFIGURE=1 (Colin Walters)
+
+============
Version 0.21
============
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/desktop-file-utils-0.21/configure.ac new/desktop-file-utils-0.22/configure.ac
--- old/desktop-file-utils-0.21/configure.ac 2012-08-27 16:09:02.000000000 +0200
+++ new/desktop-file-utils-0.22/configure.ac 2012-10-11 16:10:28.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT([desktop-file-utils], [0.21],
+AC_INIT([desktop-file-utils], [0.22],
[https://bugs.freedesktop.org/enter_bug.cgi?product=desktop-file-utils])
AC_CONFIG_SRCDIR(src/validate.h)
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/desktop-file-utils-0.21/elisp-comp new/desktop-file-utils-0.22/elisp-comp
--- old/desktop-file-utils-0.21/elisp-comp 2012-07-04 13:54:59.000000000 +0200
+++ new/desktop-file-utils-0.22/elisp-comp 1970-01-01 01:00:00.000000000 +0100
@@ -1,93 +0,0 @@
-#!/bin/sh
-# Copyright (C) 1995-2012 Free Software Foundation, Inc.
-
-scriptversion=2010-02-06.18; # UTC
-
-# Franc,ois Pinard , 1995.
-#
-# 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 or send patches to
-# .
-
-case $1 in
- '')
- echo "$0: No files. Try '$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: elisp-comp [--help] [--version] FILES...
-
-This script byte-compiles all '.el' files listed as FILES using GNU
-Emacs, and put the resulting '.elc' files into the current directory,
-so disregarding the original directories used in '.el' arguments.
-
-This script manages in such a way that all Emacs LISP files to
-be compiled are made visible between themselves, in the event
-they require or load-library one another.
-
-Report bugs to .
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "elisp-comp $scriptversion"
- exit $?
- ;;
-esac
-
-if test -z "$EMACS" || test "$EMACS" = "t"; then
- # Value of "t" means we are running in a shell under Emacs.
- # Just assume Emacs is called "emacs".
- EMACS=emacs
-fi
-
-tempdir=elc.$$
-
-# Cleanup the temporary directory on exit.
-trap 'ret=$?; rm -rf "$tempdir" && exit $ret' 0
-do_exit='(exit $ret); exit $ret'
-trap "ret=129; $do_exit" 1
-trap "ret=130; $do_exit" 2
-trap "ret=141; $do_exit" 13
-trap "ret=143; $do_exit" 15
-
-mkdir $tempdir
-cp "$@" $tempdir
-
-(
- cd $tempdir
- echo "(setq load-path (cons nil load-path))" > script
- $EMACS -batch -q -l script -f batch-byte-compile *.el || exit $?
- mv *.elc ..
-) || exit $?
-
-(exit 0); exit 0
-
-# 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/desktop-file-utils-0.21/man/desktop-file-validate.1 new/desktop-file-utils-0.22/man/desktop-file-validate.1
--- old/desktop-file-utils-0.21/man/desktop-file-validate.1 2012-08-27 16:09:02.000000000 +0200
+++ new/desktop-file-utils-0.22/man/desktop-file-validate.1 2013-07-19 09:14:39.000000000 +0200
@@ -6,10 +6,10 @@
.SH NAME
desktop-file-validate \- Validate desktop entry files
.SH SYNOPSIS
-.B desktop-file-validate [\-\-no-warn-deprecated] [\-\-warn-kde] FILE...
+.B desktop-file-validate [\-\-no-hints] [\-\-no-warn-deprecated] [\-\-warn-kde] FILE...
.SH DESCRIPTION
The \fIdesktop-file-validate\fP program is a tool to validate desktop
-entry files according to the Desktop Entry specification 1.0.
+entry files according to the Desktop Entry specification 1.1.
.PP
The specification describes a file format to provide information such as
name, icon and description for an application. Such a file can then be
@@ -23,6 +23,9 @@
.SH OPTIONS
The following options are supported:
.TP
+.I --no-hints
+Do not output hints about things that might be improved in the desktop file.
+.TP
.I --no-warn-deprecated
Do not warn about usage of deprecated items that were defined in
previous versions of the specification.
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/desktop-file-utils-0.21/missing new/desktop-file-utils-0.22/missing
--- old/desktop-file-utils-0.21/missing 2012-07-04 13:54:59.000000000 +0200
+++ new/desktop-file-utils-0.22/missing 2013-06-25 19:32:03.000000000 +0200
@@ -1,10 +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.18; # UTC
+scriptversion=2012-06-26.16; # UTC
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard , 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard , 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
@@ -29,61 +29,33 @@
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.
@@ -98,228 +70,141 @@
;;
-*)
- echo 1>&2 "$0: Unknown '$1' option"
+ 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 'automa4te' 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/desktop-file-utils-0.21/src/update-desktop-database.c new/desktop-file-utils-0.22/src/update-desktop-database.c
--- old/desktop-file-utils-0.21/src/update-desktop-database.c 2012-08-27 16:09:02.000000000 +0200
+++ new/desktop-file-utils-0.22/src/update-desktop-database.c 2013-01-07 08:59:20.000000000 +0100
@@ -83,6 +83,13 @@
desktop_files = (GList *) g_hash_table_lookup (mime_types_map, mime_type);
+ /* do not add twice a desktop file mentioning the mime type more than once
+ * (no need to use g_list_find() because we cache all mime types registered
+ * by a desktop file before moving to another desktop file) */
+ if (desktop_files &&
+ strcmp (desktop_file, (const char *) desktop_files->data) == 0)
+ return;
+
desktop_files = g_list_prepend (desktop_files, g_strdup (desktop_file));
g_hash_table_insert (mime_types_map, g_strdup (mime_type), desktop_files);
}
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/desktop-file-utils-0.21/src/validate.c new/desktop-file-utils-0.22/src/validate.c
--- old/desktop-file-utils-0.21/src/validate.c 2012-10-11 15:26:43.000000000 +0200
+++ new/desktop-file-utils-0.22/src/validate.c 2013-07-19 09:19:42.000000000 +0200
@@ -313,6 +313,8 @@
* specified) */
{ DESKTOP_STRING_LIST_TYPE, "Actions", FALSE, FALSE, FALSE, handle_actions_key },
+ { DESKTOP_BOOLEAN_TYPE, "DBusActivatable", FALSE, FALSE, FALSE, NULL },
+
/* Keys reserved for KDE */
/* since 0.9.4 */
@@ -355,8 +357,8 @@
static DesktopKeyDefinition registered_action_keys[] = {
{ DESKTOP_LOCALESTRING_TYPE, "Name", TRUE, FALSE, FALSE, NULL },
{ DESKTOP_LOCALESTRING_TYPE, "Icon", FALSE, FALSE, FALSE, handle_icon_key },
- { DESKTOP_STRING_LIST_TYPE, "OnlyShowIn", FALSE, FALSE, FALSE, handle_show_in_key },
- { DESKTOP_STRING_LIST_TYPE, "NotShowIn", FALSE, FALSE, FALSE, handle_show_in_key },
+ { DESKTOP_STRING_LIST_TYPE, "OnlyShowIn", FALSE, TRUE, FALSE, handle_show_in_key },
+ { DESKTOP_STRING_LIST_TYPE, "NotShowIn", FALSE, TRUE, FALSE, handle_show_in_key },
{ DESKTOP_STRING_TYPE, "Exec", TRUE, FALSE, FALSE, handle_exec_key }
};
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/desktop-file-utils-0.21/src/validate.h new/desktop-file-utils-0.22/src/validate.h
--- old/desktop-file-utils-0.21/src/validate.h 2012-10-03 13:02:22.000000000 +0200
+++ new/desktop-file-utils-0.22/src/validate.h 2013-07-19 09:19:52.000000000 +0200
@@ -27,7 +27,7 @@
#include
-#define CURRENT_SPEC_VERSION "1.0"
+#define CURRENT_SPEC_VERSION "1.1"
#define GROUP_KDE_DESKTOP_ENTRY "KDE Desktop Entry"
#define GROUP_DESKTOP_ACTION "Desktop Action "
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/desktop-file-utils-0.21/src/validator.c new/desktop-file-utils-0.22/src/validator.c
--- old/desktop-file-utils-0.21/src/validator.c 2012-10-03 13:02:22.000000000 +0200
+++ new/desktop-file-utils-0.22/src/validator.c 2013-08-29 09:51:57.000000000 +0200
@@ -36,8 +36,8 @@
static GOptionEntry option_entries[] = {
{ "no-hints", 0, 0, G_OPTION_ARG_NONE, &no_hints, "Do not output hints to improve desktop file", NULL },
{ "no-warn-deprecated", 0, 0, G_OPTION_ARG_NONE, &no_warn_deprecated, "Do not warn about usage of deprecated items", NULL },
- { "warn-kde", 0, 0, G_OPTION_ARG_NONE, &warn_kde, "Warn about usage of KDE extensions to the specification", NULL },
- { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &filename, NULL, "<desktop-file>" },
+ { "warn-kde", 0, 0, G_OPTION_ARG_NONE, &warn_kde, "Warn if KDE extensions to the specification are used", NULL },
+ { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &filename, NULL, "<desktop-file>..." },
{ NULL }
};
@@ -46,6 +46,8 @@
{
GOptionContext *context;
GError *error;
+ int i;
+ gboolean all_valid;
context = g_option_context_new (NULL);
g_option_context_set_summary (context, "Validate desktop entry files "
@@ -66,19 +68,22 @@
g_option_context_free (context);
- /* only accept one desktop file argument */
- if (filename == NULL || filename[0] == NULL || filename[1] != NULL) {
+ if (filename == NULL || filename[0] == NULL) {
g_printerr ("See \"%s --help\" for correct usage.\n", g_get_prgname ());
return 1;
}
- if (!g_file_test (filename[0], G_FILE_TEST_IS_REGULAR)) {
- g_printerr ("%s: file does not exist\n", filename[0]);
- return 1;
+ all_valid = TRUE;
+ for (i = 0; filename[i]; i++) {
+ if (!g_file_test (filename[i], G_FILE_TEST_IS_REGULAR)) {
+ g_printerr ("%s: file does not exist\n", filename[i]);
+ all_valid = FALSE;
+ } else if (!desktop_file_validate (filename[i], warn_kde, no_warn_deprecated, no_hints))
+ all_valid = FALSE;
}
- if (desktop_file_validate (filename[0], warn_kde, no_warn_deprecated, no_hints))
- return 0;
- else
+ if (!all_valid)
return 1;
+
+ return 0;
}
++++++ desktop-file-utils-suse-keys.patch ++++++
--- /var/tmp/diff_new_pack.EkvqEG/_old 2013-09-04 13:27:18.000000000 +0200
+++ /var/tmp/diff_new_pack.EkvqEG/_new 2013-09-04 13:27:18.000000000 +0200
@@ -2,13 +2,14 @@
===================================================================
--- src/validate.c.orig
+++ src/validate.c
-@@ -312,6 +312,9 @@ static DesktopKeyDefinition registered_d
- * specified) */
- { DESKTOP_STRING_LIST_TYPE, "Actions", FALSE, FALSE, FALSE, handle_actions_key },
-
+@@ -315,6 +315,10 @@ static DesktopKeyDefinition registered_d
+
+ { DESKTOP_BOOLEAN_TYPE, "DBusActivatable", FALSE, FALSE, FALSE, NULL },
+
+ /* SuSE specific */
+ { DESKTOP_BOOLEAN_TYPE, "X-SuSE-translate", FALSE, FALSE, FALSE, NULL },
+
++
/* Keys reserved for KDE */
-
+
/* since 0.9.4 */
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org