Mailinglist Archive: opensuse-commit (1194 mails)

< Previous Next >
commit eiciel
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Thu, 06 Mar 2008 00:40:48 +0100
  • Message-id: <20080305234048.CC65C678168@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package eiciel
checked in at Thu Mar 6 00:40:48 CET 2008.

--------
--- GNOME/eiciel/eiciel.changes 2007-11-07 18:23:04.000000000 +0100
+++ eiciel/eiciel.changes 2008-03-04 13:44:50.293136000 +0100
@@ -1,0 +2,6 @@
+Tue Mar 4 13:47:08 CET 2008 - jpr@xxxxxxx
+
+- Update to 0.9.5.1
+* Make help launching more robust
+
+-------------------------------------------------------------------

Old:
----
eiciel-0.9.4.tar.bz2

New:
----
eiciel-0.9.5.1.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ eiciel.spec ++++++
--- /var/tmp/diff_new_pack.u10717/_old 2008-03-06 00:39:55.000000000 +0100
+++ /var/tmp/diff_new_pack.u10717/_new 2008-03-06 00:39:55.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package eiciel (Version 0.9.4)
+# spec file for package eiciel (Version 0.9.5.1)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,16 +10,19 @@

# norootforbuild

+
Name: eiciel
BuildRequires: fdupes gcc-c++ gnome-desktop-devel gnutls-devel gtkmm24-devel
intltool libacl-devel libattr-devel libglade2-devel libgnomeprintui-devel
libwnck-devel nautilus-devel perl-XML-Parser update-desktop-files
-Version: 0.9.4
-Release: 135
+Version: 0.9.5.1
+Release: 1
Url: http://rofi.pinchito.com/eiciel/
Group: System/GUI/GNOME
License: GPL v2 or later
Summary: GNOME ACL viewer and editor
Source: %{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM eiciel-library-packaging.patch -- No upstream bugzilla,
sent to author
Patch0: eiciel-library-packaging.patch
+# PATCH-FIX-UPSTREAM eiciel-gcc4.3-fixes.patch -- No upstream bugzilla, sent
to author
Patch1: eiciel-gcc4.3-fixes.patch
AutoReqProv: on
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -59,14 +62,14 @@
%build
autoreconf -f -i
%configure \
- --with-nautilus-extensions-dir=%{_libdir}/nautilus/extensions-1.0
-make %{?jobs:-j%jobs}
+ --with-nautilus-extensions-dir=%{_libdir}/nautilus/extensions-2.0
+%__make %{?jobs:-j%jobs}

%install
-make DESTDIR=$RPM_BUILD_ROOT install
+%makeinstall
%find_lang %{name}
rm $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
-rm $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/*.*a
+rm $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.*a
%if %suse_version > 1020
%fdupes -s $RPM_BUILD_ROOT
%endif
@@ -78,43 +81,40 @@
%defattr (-, root, root)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/eiciel
-%dir %{_datadir}/eiciel
-%dir %{_datadir}/eiciel/doc
-%dir %{_datadir}/eiciel/doc/C
-%dir %{_datadir}/eiciel/doc/C/figures
-%doc %{_datadir}/eiciel/doc/C/*.xml
-%doc %{_datadir}/eiciel/doc/C/figures/*.png
%doc %{_mandir}/man1/eiciel.1.gz
-%dir %{_datadir}/eiciel/img
-%{_datadir}/eiciel/img/*.png
+%{_datadir}/eiciel

%files lang -f %{name}.lang

%files -n nautilus-eiciel
%defattr (-, root, root)
-%{_libdir}/nautilus/extensions-1.0/*.so
+%{_libdir}/nautilus/extensions-2.0/*.so
+
%changelog
-* Wed Nov 07 2007 - maw@xxxxxxx
+* Tue Mar 04 2008 jpr@xxxxxxx
+- Update to 0.9.5.1
+ * Make help launching more robust
+* Wed Nov 07 2007 maw@xxxxxxx
- Add eiciel-gcc4.3-fixes.patch.
-* Thu Oct 11 2007 - sbrabec@xxxxxxx
+* Thu Oct 11 2007 sbrabec@xxxxxxx
- Removed bogus dependency on mDNSResponder.
-* Thu Aug 09 2007 - maw@xxxxxxx
+* Thu Aug 09 2007 maw@xxxxxxx
- Fix up the -lang subpackage.
-* Tue Aug 07 2007 - mauro@xxxxxxx
+* Tue Aug 07 2007 mauro@xxxxxxx
- Split out a -lang subpackage
- Add %%fdupes stuff
-* Wed Jan 31 2007 - jhargadon@xxxxxxx
+* Wed Jan 31 2007 jhargadon@xxxxxxx
- added eiciel to Requires of nautilus-eiciel subpackage (#239732)
- specfile cleanup
-* Fri Jan 26 2007 - jhargadon@xxxxxxx
+* Fri Jan 26 2007 jhargadon@xxxxxxx
- fixed a shared library packaging bug (#238541)
-* Thu Jan 25 2007 - ro@xxxxxxx
+* Thu Jan 25 2007 ro@xxxxxxx
- GNOME moved to /usr
-* Wed Dec 13 2006 - jpr@xxxxxxx
+* Wed Dec 13 2006 jpr@xxxxxxx
- Update to 0.9.4, bugfix release to improve compatibility with
filesystems implemented using FUSE
-* Wed Sep 20 2006 - jpr@xxxxxxx
+* Wed Sep 20 2006 jpr@xxxxxxx
- Fix 64 bit builds by ensure that the nautilus extensions are
searched for in %%{_lib} not lib
-* Mon Aug 28 2006 - jpr@xxxxxxx
+* Mon Aug 28 2006 jpr@xxxxxxx
- Eiciel a plugin for nautilus to handle posix ACLs

++++++ eiciel-0.9.4.tar.bz2 -> eiciel-0.9.5.1.tar.bz2 ++++++
++++ 12057 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/eiciel-0.9.4/configure.ac new/eiciel-0.9.5.1/configure.ac
--- old/eiciel-0.9.4/configure.ac 2006-11-12 21:27:47.000000000 +0100
+++ new/eiciel-0.9.5.1/configure.ac 2007-10-23 06:52:24.000000000 +0200
@@ -1,5 +1,5 @@
dnl Establim el nom del paquet, la versi� i l'email de contacte
-AC_INIT(eiciel, 0.9.4, rofi@xxxxxx)
+AC_INIT(eiciel, 0.9.5.1, rofi@xxxxxx)

dnl On estem ?
AC_CANONICAL_BUILD
@@ -38,7 +38,7 @@
AC_PROG_LIBTOOL

dnl Comprovem si hi ha la llibreria gtkmm-2.0
-PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.4.0 libgnome-2.0 >= 2.10.0
gnome-vfs-2.0 >= 2.10.0 libnautilus-extension >= 2.10.0)
+PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.4.0 libgnome-2.0 >= 2.10.0
libgnomeui-2.0 >= 2.10.0 gnome-vfs-2.0 >= 2.10.0 libnautilus-extension >=
2.10.0)

AC_MSG_CHECKING([for nautilus extensions directory])

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/eiciel-0.9.4/doc/C/figures/Makefile.am
new/eiciel-0.9.5.1/doc/C/figures/Makefile.am
--- old/eiciel-0.9.4/doc/C/figures/Makefile.am 2005-12-26 19:36:36.000000000
+0100
+++ new/eiciel-0.9.5.1/doc/C/figures/Makefile.am 2007-10-22
21:28:07.000000000 +0200
@@ -1,4 +1,4 @@
-eicieldocfiguresdir=$(pkgdatadir)/doc/C/figures
+eicieldocfiguresdir=$(datadir)/gnome/help/eiciel/C/figures

dist_eicieldocfigures_DATA = \
entrada_acl.png \
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/eiciel-0.9.4/doc/C/Makefile.am new/eiciel-0.9.5.1/doc/C/Makefile.am
--- old/eiciel-0.9.4/doc/C/Makefile.am 2006-11-12 21:20:51.000000000 +0100
+++ new/eiciel-0.9.5.1/doc/C/Makefile.am 2007-10-23 06:51:33.000000000
+0200
@@ -1,14 +1,12 @@
SUBDIRS=figures

-eicieldocdir = $(pkgdatadir)/doc/C
+eicieldocdir = $(datadir)/gnome/help/eiciel/C

eicieldoc_DATA = eiciel.xml

EXTRA_DIST = eiciel.xml.in
+CLEANFILES = eiciel.xml

eiciel.xml : eiciel.xml.in
sed -e "s|@PKG_VERSION@|$(VERSION)|" $(srcdir)/eiciel.xml.in >
eiciel.xml

-CLEANFILES =
-
-CLEANFILES += eiciel.xml
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/eiciel-0.9.4/missing new/eiciel-0.9.5.1/missing
--- old/eiciel-0.9.4/missing 2005-08-13 12:39:05.000000000 +0200
+++ new/eiciel-0.9.5.1/missing 2007-10-22 21:28:36.000000000 +0200
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation,
Inc.
+
+scriptversion=2006-05-10.23
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@xxxxxxxxxxxxxxxx>, 1996.

# This program is free software; you can redistribute it and/or modify
@@ -15,8 +19,8 @@

# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.

# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -29,6 +33,8 @@
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.
@@ -38,18 +44,24 @@
configure_ac=configure.in
fi

-case "$1" in
+msg="missing on your system"
+
+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
;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in

-h|--h|--he|--hel|--help)
echo "\
@@ -67,6 +79,7 @@
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
@@ -74,11 +87,15 @@
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to <bug-automake@xxxxxxx>."
+ exit $?
;;

-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;

-*)
@@ -87,14 +104,44 @@
exit 1
;;

- aclocal*)
+esac
+
+# 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).
+case $1 in
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
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 $1 in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+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."
@@ -102,13 +149,8 @@
;;

autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+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."
@@ -116,13 +158,8 @@
;;

autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+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."
@@ -130,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -140,13 +177,8 @@
;;

automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+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."
@@ -156,20 +188,15 @@
;;

autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+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 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -185,74 +212,67 @@

bison|yacc)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+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 [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;

lex|flex)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+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 [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;

help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+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 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ 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
@@ -262,32 +282,36 @@
;;

makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+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."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # 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
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
- fi
+ # ... 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
;;

tar)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi

# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
@@ -300,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
@@ -323,8 +347,8 @@

*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+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
@@ -334,3 +358,10 @@
esac

exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
Files old/eiciel-0.9.4/po/ca.gmo and new/eiciel-0.9.5.1/po/ca.gmo differ
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/eiciel-0.9.4/po/ca.po new/eiciel-0.9.5.1/po/ca.po
--- old/eiciel-0.9.4/po/ca.po 2006-06-24 22:49:10.000000000 +0200
+++ new/eiciel-0.9.5.1/po/ca.po 2007-10-22 21:33:16.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Eiciel 0.9\n"
"Report-Msgid-Bugs-To: Roger Ferrer Ibáñez <rofi@xxxxxx>\n"
-"POT-Creation-Date: 2006-06-24 22:49+0200\n"
+"POT-Creation-Date: 2007-10-22 21:33+0200\n"
"PO-Revision-Date: 2005-12-08 15:41+0100\n"
"Last-Translator: Roger Ferrer Ibáñez <rofi@xxxxxx>\n"
"Language-Team: Catalan <ca@xxxxxx>\n"
@@ -124,27 +124,24 @@
msgid "<b>File name</b>"
msgstr "<b>Nom de fitxer</b>"

-#: src/eiciel_container.cpp:24 src/eiciel_container.cpp:216
+#: src/eiciel_container.cpp:24 src/eiciel_container.cpp:190
msgid "No file opened"
msgstr "No hi ha cap fitxer obert"

-#: src/eiciel_container.cpp:27 src/eiciel_container.cpp:224
+#: src/eiciel_container.cpp:27 src/eiciel_container.cpp:198
msgid "About..."
msgstr "Quant a..."

-#: src/eiciel_container.cpp:127
-msgid "Could not show the help file even if it was found"
+#: src/eiciel_container.cpp:108
+#, fuzzy, c-format
+msgid "Could not show the help file: %s"
msgstr "No s'ha pogut mostrar l'ajuda tot i que s'ha trobat"

-#: src/eiciel_container.cpp:136
-msgid "Help file not found"
-msgstr "No s'ha trobat el fitxer d'ajuda"
-
-#: src/eiciel_container.cpp:158
+#: src/eiciel_container.cpp:132
msgid "Choose a file or a directory"
msgstr "Escull un fitxer o directori"

-#: src/eiciel_container.cpp:178
+#: src/eiciel_container.cpp:152
msgid "Could not open the file \""
msgstr "No es pot obrir el fitxer \""

@@ -179,3 +176,6 @@
#: src/eiciel_xattr_window.cpp:299
msgid "Could not add attribute: "
msgstr "No he pogut afegir l'atribut: "
+
+#~ msgid "Help file not found"
+#~ msgstr "No s'ha trobat el fitxer d'ajuda"
Files old/eiciel-0.9.4/po/de.gmo and new/eiciel-0.9.5.1/po/de.gmo differ
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/eiciel-0.9.4/po/de.po new/eiciel-0.9.5.1/po/de.po
--- old/eiciel-0.9.4/po/de.po 2006-06-24 22:49:10.000000000 +0200
+++ new/eiciel-0.9.5.1/po/de.po 2007-10-22 21:33:16.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: Roger Ferrer Ibáñez <rofi@xxxxxx>\n"
-"POT-Creation-Date: 2006-06-24 22:49+0200\n"
+"POT-Creation-Date: 2007-10-22 21:33+0200\n"
"PO-Revision-Date: 2005-12-08 15:39+0100\n"
"Last-Translator: Michael Biebl <biebl@xxxxxxxx>\n"
"Language-Team: deutsch <de@xxxxxx>\n"
@@ -126,27 +126,24 @@
msgid "<b>File name</b>"
msgstr "<b>Datei</b>"

-#: src/eiciel_container.cpp:24 src/eiciel_container.cpp:216
+#: src/eiciel_container.cpp:24 src/eiciel_container.cpp:190
msgid "No file opened"
msgstr "Keine Datei geöffnet"

-#: src/eiciel_container.cpp:27 src/eiciel_container.cpp:224
+#: src/eiciel_container.cpp:27 src/eiciel_container.cpp:198
msgid "About..."
msgstr "Über..."

-#: src/eiciel_container.cpp:127
-msgid "Could not show the help file even if it was found"
+#: src/eiciel_container.cpp:108
+#, fuzzy, c-format
+msgid "Could not show the help file: %s"
msgstr "Konnte Hilfe Datei nicht anzeigen"

-#: src/eiciel_container.cpp:136
-msgid "Help file not found"
-msgstr "Hilfe Datei nicht gefunden"
-
-#: src/eiciel_container.cpp:158
+#: src/eiciel_container.cpp:132
msgid "Choose a file or a directory"
msgstr "Datei oder Verzeichnis öffnen"

-#: src/eiciel_container.cpp:178
+#: src/eiciel_container.cpp:152
msgid "Could not open the file \""
msgstr "Konnte Datei nicht öffnen \""

@@ -181,3 +178,6 @@
#: src/eiciel_xattr_window.cpp:299
msgid "Could not add attribute: "
msgstr ""
+
+#~ msgid "Help file not found"
+#~ msgstr "Hilfe Datei nicht gefunden"
Files old/eiciel-0.9.4/po/es.gmo and new/eiciel-0.9.5.1/po/es.gmo differ
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/eiciel-0.9.4/po/es.po new/eiciel-0.9.5.1/po/es.po
--- old/eiciel-0.9.4/po/es.po 2006-06-24 22:49:10.000000000 +0200
+++ new/eiciel-0.9.5.1/po/es.po 2007-10-22 21:33:16.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Eiciel\n"
"Report-Msgid-Bugs-To: Roger Ferrer Ibáñez <rofi@xxxxxx>\n"
-"POT-Creation-Date: 2006-06-24 22:49+0200\n"
+"POT-Creation-Date: 2007-10-22 21:33+0200\n"
"PO-Revision-Date: 2005-12-08 15:42+0100\n"
"Last-Translator: Roger Ferrer Ibáñez <rofi@xxxxxx>\n"
"Language-Team: Spanish <es@xxxxxx>\n"
@@ -125,27 +125,24 @@
msgid "<b>File name</b>"
msgstr "<b>Nombre de fichero</b>"

-#: src/eiciel_container.cpp:24 src/eiciel_container.cpp:216
+#: src/eiciel_container.cpp:24 src/eiciel_container.cpp:190
msgid "No file opened"
msgstr "Ningún fichero abierto"

-#: src/eiciel_container.cpp:27 src/eiciel_container.cpp:224
+#: src/eiciel_container.cpp:27 src/eiciel_container.cpp:198
msgid "About..."
msgstr "Acerca de..."

-#: src/eiciel_container.cpp:127
-msgid "Could not show the help file even if it was found"
+#: src/eiciel_container.cpp:108
+#, fuzzy, c-format
+msgid "Could not show the help file: %s"
msgstr "No se puede mostrar la ayuda aunque ésta ha sido encontrada"

-#: src/eiciel_container.cpp:136
-msgid "Help file not found"
-msgstr "No se ha encontrado el fichero de ayuda"
-
-#: src/eiciel_container.cpp:158
+#: src/eiciel_container.cpp:132
msgid "Choose a file or a directory"
msgstr "Escoja un fichero o un directorio"

-#: src/eiciel_container.cpp:178
+#: src/eiciel_container.cpp:152
msgid "Could not open the file \""
msgstr "No he podido abrir el fichero \""

@@ -180,3 +177,6 @@
#: src/eiciel_xattr_window.cpp:299
msgid "Could not add attribute: "
msgstr "No se pudo añadir el atributo: "
+
+#~ msgid "Help file not found"
+#~ msgstr "No se ha encontrado el fichero de ayuda"
Files old/eiciel-0.9.4/po/sv.gmo and new/eiciel-0.9.5.1/po/sv.gmo differ
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/eiciel-0.9.4/po/sv.po new/eiciel-0.9.5.1/po/sv.po
--- old/eiciel-0.9.4/po/sv.po 2006-06-24 22:49:10.000000000 +0200
+++ new/eiciel-0.9.5.1/po/sv.po 2007-10-22 21:33:16.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: eiciel 0.9-1\n"
"Report-Msgid-Bugs-To: Roger Ferrer Ibáñez <rofi@xxxxxx>\n"
-"POT-Creation-Date: 2006-06-24 22:49+0200\n"
+"POT-Creation-Date: 2007-10-22 21:33+0200\n"
"PO-Revision-Date: 2006-01-29 00:08+0100\n"
"Last-Translator: Daniel Nylander <po@xxxxxxxxxxxxxxxxx>\n"
"Language-Team: Swedish <tp-sv@xxxxxxxxxxxxxxx>\n"
@@ -125,27 +125,24 @@
msgid "<b>File name</b>"
msgstr "<b>Filnamn</b>"

-#: src/eiciel_container.cpp:24 src/eiciel_container.cpp:216
+#: src/eiciel_container.cpp:24 src/eiciel_container.cpp:190
msgid "No file opened"
msgstr "Ingen fil öppnades"

-#: src/eiciel_container.cpp:27 src/eiciel_container.cpp:224
+#: src/eiciel_container.cpp:27 src/eiciel_container.cpp:198
msgid "About..."
msgstr "Om..."

-#: src/eiciel_container.cpp:127
-msgid "Could not show the help file even if it was found"
+#: src/eiciel_container.cpp:108
+#, fuzzy, c-format
+msgid "Could not show the help file: %s"
msgstr "Kunde inte visa hjälpfilen även om den hittades"

-#: src/eiciel_container.cpp:136
-msgid "Help file not found"
-msgstr "Hjälpfil hittades inte"
-
-#: src/eiciel_container.cpp:158
+#: src/eiciel_container.cpp:132
msgid "Choose a file or a directory"
msgstr "Välj en fil eller en katalog"

-#: src/eiciel_container.cpp:178
+#: src/eiciel_container.cpp:152
msgid "Could not open the file \""
msgstr "Kunde inte öppna filen \""

@@ -180,3 +177,6 @@
#: src/eiciel_xattr_window.cpp:299
msgid "Could not add attribute: "
msgstr "Kunde inte lägga till attribut: "
+
+#~ msgid "Help file not found"
+#~ msgstr "Hjälpfil hittades inte"
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/eiciel-0.9.4/src/eiciel_container.cpp
new/eiciel-0.9.5.1/src/eiciel_container.cpp
--- old/eiciel-0.9.4/src/eiciel_container.cpp 2005-12-08 14:09:57.000000000
+0100
+++ new/eiciel-0.9.5.1/src/eiciel_container.cpp 2007-10-22 21:28:06.000000000
+0200
@@ -100,40 +100,14 @@

void EicielContainer::mostrarAjuda()
{
- // Farem com fa l'ajuda de GNOME pero sense usar
- // tota la cutreria de GNOME
-
- // Obtenim la llista de llenguatges. Aix� incorporar� C en el
- // pitjor dels casos
- const GList *lang_list = gnome_i18n_get_language_list ("LC_MESSAGES");
- Glib::FileTest ftest = Glib::FILE_TEST_EXISTS;
-
- for (;lang_list != NULL; lang_list = lang_list->next)
- {
- // const char *lang = lang_list->data;
- // Glib::ustring cami_ajuda(lang_list->data);
+ GError* error = NULL;

- // Ho fem comode pero ineficient xD
- Glib::ustring cami_ajuda = Glib::ustring(PKGDATADIR "/doc/") +
- Glib::ustring((const char*)lang_list->data) +
- Glib::ustring("/eiciel.xml");
-
- Glib::ustring uri_ajuda = Glib::ustring("ghelp:") + cami_ajuda;
-
- if (Glib::file_test(cami_ajuda, ftest))
- {
- if (!gnome_help_display_uri(uri_ajuda.c_str(), NULL))
- {
- g_warning(_("Could not show the help file even
if it was found"));
- }
- // else
- // {
- // g_warning("Hem obert %s", uri_ajuda.c_str());
- // }
- return;
- }
- }
- g_warning(_("Help file not found"));
+ gnome_help_display("eiciel", NULL, &error);
+ if (error != NULL)
+ {
+ g_warning(_("Could not show the help file: %s"), error->message);
+ g_error_free(error);
+ }
}

void EicielContainer::sortidaAplicacio()
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/eiciel-0.9.4/src/eiciel.desktop.in new/eiciel-0.9.5.1/src/eiciel.desktop.in
--- old/eiciel-0.9.4/src/eiciel.desktop.in 2006-02-12 15:36:26.000000000
+0100
+++ new/eiciel-0.9.5.1/src/eiciel.desktop.in 2007-10-22 21:28:06.000000000
+0200
@@ -11,5 +11,5 @@
Icon=@DSK_pkgdatadir@/img/icona_eiciel_24.png
Terminal=false
Type=Application
-Categories=Application;Accessories;GNOME;System;
+Categories=GNOME;System;FileTools;
Version=@DSK_VERSION@
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/eiciel-0.9.4/src/eiciel_standalone.cpp
new/eiciel-0.9.5.1/src/eiciel_standalone.cpp
--- old/eiciel-0.9.4/src/eiciel_standalone.cpp 2005-12-08 14:05:11.000000000
+0100
+++ new/eiciel-0.9.5.1/src/eiciel_standalone.cpp 2007-10-22
21:28:06.000000000 +0200
@@ -20,29 +20,37 @@
#include <gtkmm.h>
#include "eiciel_container.hpp"
#include <gettext.h>
+#include <gnome.h>

int main(int argc, char* argv[])
{
#ifdef ENABLE_NLS
- setlocale(LC_ALL, "");
+ setlocale(LC_ALL, "");
bindtextdomain("eiciel", DATADIR "/locale");
// textdomain("eiciel");
-
+
// Volem les traduccions en UTF-8 (independentment del
// format usat per a traduir)
bind_textdomain_codeset ("eiciel", "UTF-8");
#endif
- Gtk::Main kit(argc, argv);
-
- EicielContainer w;

- if (argc > 1)
- {
- w.obrirFitxer(argv[1]);
- }
+ GnomeProgram *my_app;
+ my_app = gnome_program_init(PACKAGE, VERSION,
+ LIBGNOMEUI_MODULE, argc, argv,
+ GNOME_PARAM_HUMAN_READABLE_NAME, "Eiciel",
+ GNOME_PARAM_APP_DATADIR, DATADIR,
+ NULL);
+ Gtk::Main kit(argc, argv);
+
+ EicielContainer w;
+
+ if (argc > 1)
+ {
+ w.obrirFitxer(argv[1]);
+ }

- kit.run(w);
+ kit.run(w);

- return 0;
+ return 0;
}

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/eiciel-0.9.4/src/Makefile.am new/eiciel-0.9.5.1/src/Makefile.am
--- old/eiciel-0.9.4/src/Makefile.am 2006-11-12 21:21:46.000000000 +0100
+++ new/eiciel-0.9.5.1/src/Makefile.am 2007-10-23 06:50:38.000000000 +0200
@@ -65,11 +65,7 @@
eiciel.desktop : eiciel.desktop.in
sed -e
"s|@DSK_VERSION@|$(VERSION)|;s|@DSK_bindir@|$(bindir)|;s|@DSK_pkgdatadir@|$(pkgdatadir)|"
$< > $@

-CLEANFILES =
-
-# Since 'make' built it, 'make clean' should clean it
-# see http://sources.redhat.com/automake/automake.html#Clean
-CLEANFILES += eiciel.desktop
-
EXTRA_DIST= \
eiciel.desktop.in
+
+CLEANFILES = eiciel.desktop


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages