Hello community, here is the log from the commit of package dar for openSUSE:Factory checked in at 2015-03-05 15:41:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dar (Old) and /work/SRC/openSUSE:Factory/.dar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dar" Changes: -------- --- /work/SRC/openSUSE:Factory/dar/dar.changes 2015-01-24 22:20:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dar.new/dar.changes 2015-03-05 18:16:32.000000000 +0100 @@ -1,0 +2,20 @@ +Tue Mar 3 16:12:45 UTC 2015 - mplus...@suse.com + +- Add changelog to sources (necessary for _DATE_ and _TIME_ + macros substitution removal) + +------------------------------------------------------------------- +Sun Mar 1 13:17:54 UTC 2015 - mplus...@suse.com + +- Cleanup spec-file with spec-cleaner +- Use url for source +- Add gpg signature +- Get rid of _DATE_ and _TIME macros +- Update to 2.4.17 + * fixing issue when case insensitive comparison was requested + and invalid wide char for the current local was met in a + filename. In such situation the corresponding file was never + saved before (considering a filesystem error for that file), + while now the ASCII case insensitivity is used as fallback. + +------------------------------------------------------------------- Old: ---- dar-2.4.16.tar.gz New: ---- dar-2.4.17.tar.gz dar-2.4.17.tar.gz.sig dar.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dar.spec ++++++ --- /var/tmp/diff_new_pack.TznkeT/_old 2015-03-05 18:16:33.000000000 +0100 +++ /var/tmp/diff_new_pack.TznkeT/_new 2015-03-05 18:16:33.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dar # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX 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,30 +17,36 @@ Name: dar -Version: 2.4.16 +Version: 2.4.17 Release: 0 Summary: Backup and Restore Application License: SUSE-GPL-2.0+-with-openssl-exception Group: System/Filesystems Url: http://dar.linux.free.fr/ -Source0: %{name}-%{version}.tar.gz +Source0: http://sourceforge.net/projects/dar/files/dar/%{version}/%{name}-%{version}.tar.gz +Source1: http://dar.linux.free.fr/sign/v%{version}/%{name}-%{version}.tar.gz.sig +Source2: %{name}.keyring +Source3: %{name}.changes Patch2: dar-use-libc-xattr.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: e2fsprogs-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gettext-tools +BuildRequires: libattr-devel BuildRequires: libbz2-devel BuildRequires: libgcrypt-devel BuildRequires: libtool BuildRequires: lzo-devel BuildRequires: openssl-devel BuildRequires: pkg-config -%ifarch %ix86 x86_64 ppc -BuildRequires: upx -%endif BuildRequires: zlib-devel Recommends: par BuildRoot: %{_tmppath}/%{name}-%{version}-build +%ifarch %ix86 x86_64 ppc +BuildRequires: upx +%endif %description Dar (Disk Archive) is a hardware-independent backup solution. Dar uses @@ -97,19 +103,27 @@ This package contains the library used by Dar and KDar. %lang_package + %prep %setup -q %patch2 -p1 -%if 0%{suse_version} > 1200 +%if 0%{?suse_version} > 1200 sed -i -e 's,^AM_GNU_GETTEXT_VERSION.*,-AM_GNU_GETTEXT_VERSION(0.18),' configure.ac %else # sle 11 sed -i -e 's,^AM_GNU_GETTEXT_VERSION.*,-AM_GNU_GETTEXT_VERSION(0.17),' configure.ac %endif +# remove _DATE_ and _TIME_ macros +modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" +DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" +TIME="\"$(date -d "${modified}" "+%%R")\"" +find . -name '*.?pp' |\ + xargs sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" %build autoreconf -f -i -v -%configure --with-pic --datadir=%_defaultdocdir \ +%configure \ + --with-pic --datadir=%{_defaultdocdir} \ --disable-static \ --enable-largefile \ --disable-dar-static @@ -117,23 +131,23 @@ %check # ensure that dynamic linked binaries get installed -file $RPM_BUILD_ROOT/usr/bin/* | grep -q dynamic || exit 1 -file $RPM_BUILD_ROOT/usr/bin/* | grep -q static && exit 1 +file %{buildroot}%{_bindir}/* | grep -q dynamic || exit 1 +file %{buildroot}%{_bindir}/* | grep -q static && exit 1 %install -%if 0%{suse_version} > 1200 +%if 0%{?suse_version} > 1200 %make_install %else -make install DESTDIR=$RPM_BUILD_ROOT +make DESTDIR=%{buildroot} install %{?_smp_mflags} %endif # libtool make executables static during installation # overwrite them with original dynamic linked binaries -install -m 0755 src/dar_suite/.libs/* $RPM_BUILD_ROOT/usr/bin/ -find %{buildroot}%{_libdir} -name '*.la' -delete -print +install -m 0755 src/dar_suite/.libs/* %{buildroot}%{_bindir}/ +find %{buildroot} -type f -name "*.la" -delete -print # Move the sample scripts to the correct location (otherwise rpmlint will error due to these scripts having execute perms) -mkdir %{buildroot}/%_defaultdocdir/%{name}/examples/ -mv %{buildroot}/%_defaultdocdir/%{name}/samples/* %{buildroot}/%_defaultdocdir/%{name}/examples +mkdir %{buildroot}/%{_defaultdocdir}/%{name}/examples/ +mv %{buildroot}/%{_defaultdocdir}/%{name}/samples/* %{buildroot}/%{_defaultdocdir}/%{name}/examples %fdupes %{buildroot}%{_defaultdocdir}/%{name} %find_lang %{name} @@ -148,11 +162,12 @@ %{_mandir}/man1/* %files lang -f %{name}.lang +%defattr(-,root,root) %files -n libdar5000 %defattr(-,root,root) %{_libdir}/libdar.so.* -%config(noreplace) /etc/darrc +%config(noreplace) %{_sysconfdir}/darrc %files -n libdar-devel %defattr(-,root,root) ++++++ dar-2.4.16.tar.gz -> dar-2.4.17.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dar-2.4.16/ChangeLog new/dar-2.4.17/ChangeLog --- old/dar-2.4.16/ChangeLog 2015-01-18 17:47:28.000000000 +0100 +++ new/dar-2.4.17/ChangeLog 2015-01-31 16:20:43.000000000 +0100 @@ -1,3 +1,10 @@ +from 2.4.16 to 2.4.17 +- fixing issue when case insensitive comparison was requested and invalid + wide char for the current local was met in a filename. In such situation + the corresponding file was never saved before (considering a filesystem + error for that file), while now the ASCII case insensitivity is used + as fallback. + from 2.4.15 to 2.4.16 - fixing archive listing displayed information for catalogue size when archive is read in --sequential-read mode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dar-2.4.16/THANKS new/dar-2.4.17/THANKS --- old/dar-2.4.16/THANKS 2015-01-18 17:32:35.000000000 +0100 +++ new/dar-2.4.17/THANKS 2015-01-31 16:08:38.000000000 +0100 @@ -1,3 +1,6 @@ +version 2.4.17 +-------------- + version 2.4.16 -------------- Thanks to Georg Sauthoff for clear bug report and to Oleksandr Chumachenko diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dar-2.4.16/configure new/dar-2.4.17/configure --- old/dar-2.4.16/configure 2015-01-18 17:47:26.000000000 +0100 +++ new/dar-2.4.17/configure 2015-01-31 16:20:41.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for DAR 2.4.16. +# Generated by GNU Autoconf 2.69 for DAR 2.4.17. # # Report bugs to <http://sourceforge.net/tracker/?group_id=65612&atid=511612>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='DAR' PACKAGE_TARNAME='dar' -PACKAGE_VERSION='2.4.16' -PACKAGE_STRING='DAR 2.4.16' +PACKAGE_VERSION='2.4.17' +PACKAGE_STRING='DAR 2.4.17' PACKAGE_BUGREPORT='http://sourceforge.net/tracker/?group_id=65612&atid=511612' PACKAGE_URL='' @@ -1396,7 +1396,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures DAR 2.4.16 to adapt to many kinds of systems. +\`configure' configures DAR 2.4.17 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1466,7 +1466,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of DAR 2.4.16:";; + short | recursive ) echo "Configuration of DAR 2.4.17:";; esac cat <<\_ACEOF @@ -1634,7 +1634,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -DAR configure 2.4.16 +DAR configure 2.4.17 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2604,7 +2604,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by DAR $as_me 2.4.16, which was +It was created by DAR $as_me 2.4.17, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2965,7 +2965,7 @@ cat >>confdefs.h <<_ACEOF -#define DAR_VERSION "2.4.16" +#define DAR_VERSION "2.4.17" _ACEOF @@ -3436,7 +3436,7 @@ # Define the identity of the package. PACKAGE='dar' - VERSION='2.4.16' + VERSION='2.4.17' cat >>confdefs.h <<_ACEOF @@ -23622,7 +23622,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by DAR $as_me 2.4.16, which was +This file was extended by DAR $as_me 2.4.17, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23688,7 +23688,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -DAR config.status 2.4.16 +DAR config.status 2.4.17 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dar-2.4.16/configure.ac new/dar-2.4.17/configure.ac --- old/dar-2.4.16/configure.ac 2015-01-18 17:46:52.000000000 +0100 +++ new/dar-2.4.17/configure.ac 2015-01-31 16:20:05.000000000 +0100 @@ -1,6 +1,6 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.69) -AC_INIT([DAR], [2.4.16], [[http://sourceforge.net/tracker/?group_id=65612&atid=511612]]) +AC_INIT([DAR], [2.4.17], [[http://sourceforge.net/tracker/?group_id=65612&atid=511612]]) AC_CONFIG_HEADERS([config.h]) AC_LANG([C++]) AC_CONFIG_SRCDIR([src/libdar/catalogue.cpp]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dar-2.4.16/doc/Notes.html new/dar-2.4.17/doc/Notes.html --- old/dar-2.4.16/doc/Notes.html 2015-01-18 17:44:03.000000000 +0100 +++ new/dar-2.4.17/doc/Notes.html 2015-01-31 16:19:46.000000000 +0100 @@ -7,6 +7,7 @@ + <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>DAR/LIBDAR Internals - Notes</title></head><body style="background-color: rgb(221, 221, 221); color: rgb(0, 0, 170);" alink="#ff0000" link="#0000ff" vlink="#000055"> <center> <table style="width: 90%; text-align: left; margin-left: auto; margin-right: auto;" border="0" cellpadding="2" cellspacing="2"> @@ -2438,10 +2439,28 @@ </td> <td style="vertical-align: top; text-align: center;">1.2.8<br> </td> + </tr><tr> + <td style="vertical-align: top; text-align: right;">January 31th, 2015<br> + </td> + <td style="vertical-align: top; text-align: center;">2.4.17<br> + </td> + <td style="vertical-align: top; text-align: center;">08<br> + </td> + <td style="vertical-align: top; text-align: center;">5.6.4<br> + </td> + <td style="vertical-align: top; text-align: center;">1.5.6<br> + </td> + <td style="vertical-align: top; text-align: center;">1.4.6<br> + </td> + <td style="vertical-align: top; text-align: center;">1.7.8<br> + </td> + <td style="vertical-align: top; text-align: center;">1.2.8<br> + </td> </tr> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dar-2.4.16/m4/ChangeLog new/dar-2.4.17/m4/ChangeLog --- old/dar-2.4.16/m4/ChangeLog 2015-01-18 17:46:52.000000000 +0100 +++ new/dar-2.4.17/m4/ChangeLog 2015-01-31 16:20:05.000000000 +0100 @@ -1,4 +1,4 @@ -2015-01-18 gettextize <bug-gnu-gett...@gnu.org> +2015-01-31 gettextize <bug-gnu-gett...@gnu.org> * gettext.m4: New file, from gettext-0.18.3. * iconv.m4: New file, from gettext-0.18.3. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dar-2.4.16/man/dar.1 new/dar-2.4.17/man/dar.1 --- old/dar-2.4.16/man/dar.1 2015-01-18 17:44:03.000000000 +0100 +++ new/dar-2.4.17/man/dar.1 2015-01-31 16:19:46.000000000 +0100 @@ -1,4 +1,4 @@ -.TH DAR 1 "June 15th, 2014" +.TH DAR 1 "January 31th, 2015" .UC 8 .SH NAME dar \- create, test, list, extract, compare, merge, isolate dar archives @@ -336,6 +336,8 @@ .TP 20 -an, --alter=no-case set the filters in case insensitive mode. This concerns only masks specified after this option (see also -acase option below). This changes the behavior of -I, -X, -g, -P, -Z, -Y, -u and -U options. +.P +Warning: case insensitivity requires interpreting filenames which depends on the locale with which dar is run (defined by the LANG environment variable). For example if you create files with LANG set to fr_FR.UTF-8 and use non plain ASCII characters in filename, there is chances that these non ASCII characters will be stored over several bytes in that filename: so called "wide characters". If then you run dar with LANG set to another value like ru_RU.koi8r, there is much chances that these wide characters do not correspond to the same letter or worse, that they do not match any valid wide character for that locale. A filename is always a sequence of bytes and always saved as such, but using --alter=no-case implies interpreting that sequence in a way that depends on the given locale (as defined by the LANG environment variable). As such, dar cannot know if a given file has to be read with fr_FR.UTF-8 locale or with it_IT.iso88591 or ru_RU.koi8r and so on, because this information is not stored in filenames. In consequence, if different locales are used on your system and you are doing a system wide backup, using --alter=no-case option may lead dar to detect invalid wide character, in that case it falls back to a byte by byte case sensitivity comparison (ASCII characters), which may not be what you would expect at first sight: Most of the time, an upper case wide character (stored on several bytes) does not match the equivalent lower case wide character (several bytes too), when case sensitivity comparison is performed byte by byte. .TP 20 -acase, --alter=case set back to case sensitive mode for filters. All following masks are case sensitive, up to end of parsing or up to the next -an option. This changes the behavior of -I, -X, -g, -P, -Z, -Y, -u and -U options. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dar-2.4.16/misc/make_cygwin_dist new/dar-2.4.17/misc/make_cygwin_dist --- old/dar-2.4.16/misc/make_cygwin_dist 2013-08-25 19:09:49.000000000 +0200 +++ new/dar-2.4.17/misc/make_cygwin_dist 2015-01-31 16:08:38.000000000 +0100 @@ -25,7 +25,7 @@ make make install-strip mv $build_dir/bin/* $build_dir/lib/*.so.*.*.* $build_dir -cp /bin/cygwin1.dll /bin/cygz.dll /bin/cygbz2-1.dll /bin/cygiconv-2.dll /usr/bin/cygintl-8.dll /bin/cyggcc_s-1.dll /bin/cygstdc++-6.dll /bin/cyggcrypt-11.dll /bin/cyggpg-error-0.dll /bin/cyglzo2-2.dll $build_dir +cp /bin/cygwin1.dll /bin/cygz.dll /bin/cygbz2-1.dll /bin/cygiconv-2.dll /usr/bin/cygintl-8.dll /bin/cyggcc_s-seh-1.dll /bin/cygstdc++-6.dll /bin/cyggcrypt-11.dll /bin/cyggpg-error-0.dll /bin/cyglzo2-2.dll $build_dir cp -R doc $build_dir foreach fichier (README TODO INSTALL ChangeLog THANKS COPYING) cp $fichier "$build_dir/`basename $fichier`.txt" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dar-2.4.16/po/ChangeLog new/dar-2.4.17/po/ChangeLog --- old/dar-2.4.16/po/ChangeLog 2015-01-18 17:46:51.000000000 +0100 +++ new/dar-2.4.17/po/ChangeLog 2015-01-31 16:20:05.000000000 +0100 @@ -1,4 +1,4 @@ -2015-01-18 gettextize <bug-gnu-gett...@gnu.org> +2015-01-31 gettextize <bug-gnu-gett...@gnu.org> * Makefile.in.in: New file, from gettext-0.18.3. * Rules-quot: New file, from gettext-0.18.3. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dar-2.4.16/po/dar.pot new/dar-2.4.17/po/dar.pot --- old/dar-2.4.16/po/dar.pot 2015-01-18 17:44:03.000000000 +0100 +++ new/dar-2.4.17/po/dar.pot 2015-01-31 16:13:10.000000000 +0100 @@ -7,10 +7,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: dar 2.4.16\n" +"Project-Id-Version: dar 2.4.17\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"; "group_id=65612MSGID_BUGS_ADDRESS =atid=511612\n" -"POT-Creation-Date: 2015-01-18 16:47+0100\n" +"POT-Creation-Date: 2015-01-31 16:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" @@ -956,41 +956,37 @@ msgid "Cannot set last access and last modification time: " msgstr "" -#: src/libdar/tools.cpp:1308 -msgid "NULL given as argument" -msgstr "" - -#: src/libdar/tools.cpp:1358 +#: src/libdar/tools.cpp:1356 msgid "Aborting program: child process died unexpectedly" msgstr "" -#: src/libdar/tools.cpp:1364 +#: src/libdar/tools.cpp:1362 #, c-format msgid "Error trying to run %s: %s" msgstr "" -#: src/libdar/tools.cpp:1366 +#: src/libdar/tools.cpp:1364 msgid "execvp() failed but did not returned error code" msgstr "" -#: src/libdar/tools.cpp:1563 +#: src/libdar/tools.cpp:1561 #, c-format msgid "Removing file %s" msgstr "" -#: src/libdar/tools.cpp:1565 +#: src/libdar/tools.cpp:1563 #, c-format msgid "Error removing file %s: %s" msgstr "" -#: src/libdar/tools.cpp:1590 +#: src/libdar/tools.cpp:1588 #, c-format msgid "" "Overwriting not allowed while a slice of a previous archive with the same " "basename has been found in the %s directory, Operation aborted" msgstr "" -#: src/libdar/tools.cpp:1596 +#: src/libdar/tools.cpp:1594 #, c-format msgid "" "At least one slice of an old archive with the same name remains in the " @@ -998,131 +994,131 @@ "creating an archive of same name. Can I remove these old slices?" msgstr "" -#: src/libdar/tools.cpp:1634 src/libdar/tools.cpp:1638 +#: src/libdar/tools.cpp:1632 src/libdar/tools.cpp:1636 #, c-format msgid "Cannot get inode information for %s: %s" msgstr "" -#: src/libdar/tools.cpp:1647 +#: src/libdar/tools.cpp:1645 msgid "Current Working Directory cannot be a relative path" msgstr "" -#: src/libdar/tools.cpp:1664 +#: src/libdar/tools.cpp:1662 msgid "Cannot block signals: " msgstr "" -#: src/libdar/tools.cpp:1674 +#: src/libdar/tools.cpp:1672 msgid "Cannot unblock signals: " msgstr "" -#: src/libdar/tools.cpp:1692 src/libdar/tools.cpp:1702 +#: src/libdar/tools.cpp:1690 src/libdar/tools.cpp:1700 #, c-format msgid "Cannot get last modification date: %s" msgstr "" -#: src/libdar/tools.cpp:1705 +#: src/libdar/tools.cpp:1703 #, c-format msgid "Cannot get size of %S: not a plain file" msgstr "" -#: src/libdar/tools.cpp:1716 +#: src/libdar/tools.cpp:1714 #, c-format msgid "Cannot get mtime: %s" msgstr "" -#: src/libdar/tools.cpp:1814 +#: src/libdar/tools.cpp:1812 #, c-format msgid "Parse error: Unmatched `%c'" msgstr "" -#: src/libdar/tools.cpp:1857 +#: src/libdar/tools.cpp:1855 msgid "Unknown substitution string: %" msgstr "" -#: src/libdar/tools.cpp:1864 +#: src/libdar/tools.cpp:1862 msgid "" "last char of user command-line to execute is '%', (use '%%' instead to avoid " "this message)" msgstr "" -#: src/libdar/tools.cpp:1918 +#: src/libdar/tools.cpp:1916 msgid "execve() failed. (process table is full ?)" msgstr "" -#: src/libdar/tools.cpp:1920 +#: src/libdar/tools.cpp:1918 msgid "system() call failed: " msgstr "" -#: src/libdar/tools.cpp:1922 +#: src/libdar/tools.cpp:1920 #, c-format msgid "execution of [ %S ] returned error code: %d" msgstr "" -#: src/libdar/tools.cpp:1929 +#: src/libdar/tools.cpp:1927 msgid "Error during user command line execution: " msgstr "" -#: src/libdar/tools.cpp:1929 +#: src/libdar/tools.cpp:1927 msgid " . Retry command-line ?" msgstr "" -#: src/libdar/tools.cpp:1934 +#: src/libdar/tools.cpp:1932 msgid "Ignore previous error on user command line and continue ?" msgstr "" -#: src/libdar/tools.cpp:1974 +#: src/libdar/tools.cpp:1972 msgid "Fatal error on user command line: " msgstr "" -#: src/libdar/tools.cpp:2100 src/libdar/tools.cpp:2106 +#: src/libdar/tools.cpp:2098 src/libdar/tools.cpp:2104 msgid "Badly formated octal number" msgstr "" -#: src/libdar/tools.cpp:2133 +#: src/libdar/tools.cpp:2131 #, c-format msgid "Error while setting file permission: %s" msgstr "" -#: src/libdar/tools.cpp:2143 +#: src/libdar/tools.cpp:2141 msgid "Cannot get effective permission given a file descriptor: " msgstr "" -#: src/libdar/tools.cpp:2203 +#: src/libdar/tools.cpp:2201 #, c-format msgid "Unknown user: %S" msgstr "" -#: src/libdar/tools.cpp:2207 +#: src/libdar/tools.cpp:2205 msgid "" "Cannot convert username to uid in statically linked binary, either directly " "provide the UID or run libdar from a dynamically linked executable" msgstr "" -#: src/libdar/tools.cpp:2219 +#: src/libdar/tools.cpp:2217 #, c-format msgid "Unknown group: %S" msgstr "" -#: src/libdar/tools.cpp:2223 +#: src/libdar/tools.cpp:2221 msgid "" "Cannot convert group to gid in statically linked binary, either directly " "provide the GID or run libdar from a dynamically linked executable" msgstr "" -#: src/libdar/tools.cpp:2230 +#: src/libdar/tools.cpp:2228 #, c-format msgid "Error while setting file user ownership: %s" msgstr "" -#: src/libdar/tools.cpp:2390 +#: src/libdar/tools.cpp:2388 msgid "Error while fetching hostname: " msgstr "" -#: src/libdar/tools.cpp:2416 src/libdar/catalogue.cpp:4925 +#: src/libdar/tools.cpp:2414 src/libdar/catalogue.cpp:4925 msgid "[Worse]" msgstr "" -#: src/libdar/tools.cpp:2438 +#: src/libdar/tools.cpp:2436 msgid "Invalid wide-char found in string: " msgstr "" @@ -2902,22 +2898,22 @@ msgid "compressReset called but compressInit never called before" msgstr "" -#: src/libdar/mask_list.cpp:95 +#: src/libdar/mask_list.cpp:97 #, c-format msgid "Cannot allocate memory for buffer while reading %S" msgstr "" -#: src/libdar/mask_list.cpp:121 +#: src/libdar/mask_list.cpp:123 msgid "Found '" msgstr "" -#: src/libdar/mask_list.cpp:166 +#: src/libdar/mask_list.cpp:172 msgid "" "Mask_list's prefix must be an absolute path or start with \"<ROOT>\" string " "for archive merging" msgstr "" -#: src/libdar/mask_list.cpp:188 +#: src/libdar/mask_list.cpp:194 #, c-format msgid "" "Error met while reading line\n" @@ -2925,7 +2921,7 @@ " from file %S: %S" msgstr "" -#: src/libdar/mask_list.cpp:205 +#: src/libdar/mask_list.cpp:211 #, c-format msgid "Too much line in file %S (integer overflow)" msgstr "" @@ -3488,7 +3484,7 @@ msgid "Cannot add an absolute path" msgstr "" -#: src/libdar/path.cpp:322 +#: src/libdar/path.cpp:328 msgid "Empty string as subdirectory does not make a valid path" msgstr "" Files old/dar-2.4.16/po/de.gmo and new/dar-2.4.17/po/de.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dar-2.4.16/po/de.po new/dar-2.4.17/po/de.po --- old/dar-2.4.16/po/de.po 2015-01-18 17:44:03.000000000 +0100 +++ new/dar-2.4.17/po/de.po 2015-01-31 16:13:10.000000000 +0100 @@ -11,7 +11,7 @@ "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"; "group_id=65612MSGID_BUGS_ADDRESS =atid=511612\n" -"POT-Creation-Date: 2015-01-18 16:47+0100\n" +"POT-Creation-Date: 2015-01-31 16:04+0100\n" "PO-Revision-Date: 2011-07-21 16:13+0200\n" "Last-Translator: Markus Kamp <mk_cac...@gmx.de>\n" "Language-Team: Deutsch\n" @@ -1011,35 +1011,31 @@ msgstr "" "Letzter Zugriffs- und letzter �nderungszeitpunkt kann nicht gesetzt werden." -#: src/libdar/tools.cpp:1308 -msgid "NULL given as argument" -msgstr "" - -#: src/libdar/tools.cpp:1358 +#: src/libdar/tools.cpp:1356 msgid "Aborting program: child process died unexpectedly" msgstr "" -#: src/libdar/tools.cpp:1364 +#: src/libdar/tools.cpp:1362 #, fuzzy, c-format msgid "Error trying to run %s: %s" msgstr "Fehler beim lesen der erweiterten Attribute f�r %s : %s" -#: src/libdar/tools.cpp:1366 +#: src/libdar/tools.cpp:1364 #, fuzzy msgid "execvp() failed but did not returned error code" msgstr "execvp fehlgeschlagen, aber ohne einen Fehlercode." -#: src/libdar/tools.cpp:1563 +#: src/libdar/tools.cpp:1561 #, c-format msgid "Removing file %s" msgstr "Entferne Datei %s" -#: src/libdar/tools.cpp:1565 +#: src/libdar/tools.cpp:1563 #, fuzzy, c-format msgid "Error removing file %s: %s" msgstr "Fehler beim �ffnen derr Datei %s : %s" -#: src/libdar/tools.cpp:1590 +#: src/libdar/tools.cpp:1588 #, c-format msgid "" "Overwriting not allowed while a slice of a previous archive with the same " @@ -1049,7 +1045,7 @@ "fr�heren Archivs mit dem gleichen Grundnamen im Ordner %s befindet, Vorgang " "abgebrochen." -#: src/libdar/tools.cpp:1596 +#: src/libdar/tools.cpp:1594 #, fuzzy, c-format msgid "" "At least one slice of an old archive with the same name remains in the " @@ -1063,54 +1059,54 @@ "des alten Archive versteckt sein k�nnte. Sollen alle alten Archiv-Abschnitte " "zuerst entfernt werden?" -#: src/libdar/tools.cpp:1634 src/libdar/tools.cpp:1638 +#: src/libdar/tools.cpp:1632 src/libdar/tools.cpp:1636 #, fuzzy, c-format msgid "Cannot get inode information for %s: %s" msgstr "iNode-Informationen sind nicht Verf�gbar f�r %s : %s" -#: src/libdar/tools.cpp:1647 +#: src/libdar/tools.cpp:1645 #, fuzzy msgid "Current Working Directory cannot be a relative path" msgstr "Argument muss ein relativer Pfad sein" -#: src/libdar/tools.cpp:1664 +#: src/libdar/tools.cpp:1662 #, fuzzy msgid "Cannot block signals: " msgstr "Kann Datei nicht �ffnen: " -#: src/libdar/tools.cpp:1674 +#: src/libdar/tools.cpp:1672 #, fuzzy msgid "Cannot unblock signals: " msgstr "Kann Datei nicht �ffnen: " -#: src/libdar/tools.cpp:1692 src/libdar/tools.cpp:1702 +#: src/libdar/tools.cpp:1690 src/libdar/tools.cpp:1700 #, fuzzy, c-format msgid "Cannot get last modification date: %s" msgstr "" "Letzter Zugriffs- und letzter �nderungszeitpunkt kann nicht gesetzt werden." -#: src/libdar/tools.cpp:1705 +#: src/libdar/tools.cpp:1703 #, c-format msgid "Cannot get size of %S: not a plain file" msgstr "" -#: src/libdar/tools.cpp:1716 +#: src/libdar/tools.cpp:1714 #, fuzzy, c-format msgid "Cannot get mtime: %s" msgstr "Dateigr��e kann nicht bestimmt werden: %s" -#: src/libdar/tools.cpp:1814 +#: src/libdar/tools.cpp:1812 #, fuzzy, c-format msgid "Parse error: Unmatched `%c'" msgstr "" "Auswertungsfehler beim lesen der Konfigurationsdatei %s : Nicht zugeordnet: " "%c" -#: src/libdar/tools.cpp:1857 +#: src/libdar/tools.cpp:1855 msgid "Unknown substitution string: %" msgstr "Unbekannte Ersatz-Zeichenkette: %" -#: src/libdar/tools.cpp:1864 +#: src/libdar/tools.cpp:1862 #, fuzzy msgid "" "last char of user command-line to execute is '%', (use '%%' instead to avoid " @@ -1120,87 +1116,87 @@ "(verwenden Sie stattdessen '%%', um diese Meldung zu vermeiden). Ignorieren " "und fortsetzen?" -#: src/libdar/tools.cpp:1918 +#: src/libdar/tools.cpp:1916 msgid "execve() failed. (process table is full ?)" msgstr "Fehler bei execve(). (Prozesstabelle voll?)" -#: src/libdar/tools.cpp:1920 +#: src/libdar/tools.cpp:1918 msgid "system() call failed: " msgstr "system() Aufruf fehlgeschlagen" -#: src/libdar/tools.cpp:1922 +#: src/libdar/tools.cpp:1920 #, c-format msgid "execution of [ %S ] returned error code: %d" msgstr "Ausf�hrung von [ %S ] ergab folgenden Fehlercode: %d" -#: src/libdar/tools.cpp:1929 +#: src/libdar/tools.cpp:1927 msgid "Error during user command line execution: " msgstr "Fehler bei der Ausf�hrung des Benutzerkommandos" -#: src/libdar/tools.cpp:1929 +#: src/libdar/tools.cpp:1927 msgid " . Retry command-line ?" msgstr " . Versuche , das Kommando erneut auszuf�hren? " -#: src/libdar/tools.cpp:1934 +#: src/libdar/tools.cpp:1932 msgid "Ignore previous error on user command line and continue ?" msgstr "Letzten Fehler beim Benutzerkommando ignoroieren und fortsetzen?" -#: src/libdar/tools.cpp:1974 +#: src/libdar/tools.cpp:1972 msgid "Fatal error on user command line: " msgstr "Fataler Fehler beim Benutzerkommando" -#: src/libdar/tools.cpp:2100 src/libdar/tools.cpp:2106 +#: src/libdar/tools.cpp:2098 src/libdar/tools.cpp:2104 #, fuzzy msgid "Badly formated octal number" msgstr "Schlecht formatierte Datenbank" -#: src/libdar/tools.cpp:2133 +#: src/libdar/tools.cpp:2131 #, fuzzy, c-format msgid "Error while setting file permission: %s" msgstr "Fehler beim Lesen der Benutzereingabe vom Terminal" -#: src/libdar/tools.cpp:2143 +#: src/libdar/tools.cpp:2141 #, fuzzy msgid "Cannot get effective permission given a file descriptor: " msgstr "Folgende Berechtigungen konnten nicht wiederhergestellt werden: %s :%s" -#: src/libdar/tools.cpp:2203 +#: src/libdar/tools.cpp:2201 #, fuzzy, c-format msgid "Unknown user: %S" msgstr "Unbekanntes Argument f�r -a: %s" -#: src/libdar/tools.cpp:2207 +#: src/libdar/tools.cpp:2205 msgid "" "Cannot convert username to uid in statically linked binary, either directly " "provide the UID or run libdar from a dynamically linked executable" msgstr "" -#: src/libdar/tools.cpp:2219 +#: src/libdar/tools.cpp:2217 #, fuzzy, c-format msgid "Unknown group: %S" msgstr "Unbekanntes Argument f�r -a: %s" -#: src/libdar/tools.cpp:2223 +#: src/libdar/tools.cpp:2221 msgid "" "Cannot convert group to gid in statically linked binary, either directly " "provide the GID or run libdar from a dynamically linked executable" msgstr "" -#: src/libdar/tools.cpp:2230 +#: src/libdar/tools.cpp:2228 #, fuzzy, c-format msgid "Error while setting file user ownership: %s" msgstr "Fehler beim Lesen der Benutzereingabe vom Terminal" -#: src/libdar/tools.cpp:2390 +#: src/libdar/tools.cpp:2388 #, fuzzy msgid "Error while fetching hostname: " msgstr "Fehler beim Auflisten des Archivinhalts: " -#: src/libdar/tools.cpp:2416 src/libdar/catalogue.cpp:4925 +#: src/libdar/tools.cpp:2414 src/libdar/catalogue.cpp:4925 msgid "[Worse]" msgstr "[Schlechter]" -#: src/libdar/tools.cpp:2438 +#: src/libdar/tools.cpp:2436 #, fuzzy msgid "Invalid wide-char found in string: " msgstr "Ung�ltige Archivnummer: " @@ -3104,22 +3100,22 @@ msgid "compressReset called but compressInit never called before" msgstr "" -#: src/libdar/mask_list.cpp:95 +#: src/libdar/mask_list.cpp:97 #, c-format msgid "Cannot allocate memory for buffer while reading %S" msgstr "" -#: src/libdar/mask_list.cpp:121 +#: src/libdar/mask_list.cpp:123 msgid "Found '" msgstr "" -#: src/libdar/mask_list.cpp:166 +#: src/libdar/mask_list.cpp:172 msgid "" "Mask_list's prefix must be an absolute path or start with \"<ROOT>\" string " "for archive merging" msgstr "" -#: src/libdar/mask_list.cpp:188 +#: src/libdar/mask_list.cpp:194 #, fuzzy, c-format msgid "" "Error met while reading line\n" @@ -3127,7 +3123,7 @@ " from file %S: %S" msgstr "Fehler beim Lesen der Datei: " -#: src/libdar/mask_list.cpp:205 +#: src/libdar/mask_list.cpp:211 #, c-format msgid "Too much line in file %S (integer overflow)" msgstr "" @@ -3732,7 +3728,7 @@ msgid "Cannot add an absolute path" msgstr "Absoluter Pfad kann nicht hinzugef�gt werden" -#: src/libdar/path.cpp:322 +#: src/libdar/path.cpp:328 msgid "Empty string as subdirectory does not make a valid path" msgstr "" "Eine leere Zeichenkette als Unterverzeichnis ergibt keine g�ltige Pfadangabe" Files old/dar-2.4.16/po/fr.gmo and new/dar-2.4.17/po/fr.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dar-2.4.16/po/fr.po new/dar-2.4.17/po/fr.po --- old/dar-2.4.16/po/fr.po 2015-01-18 17:44:03.000000000 +0100 +++ new/dar-2.4.17/po/fr.po 2015-01-31 16:13:10.000000000 +0100 @@ -9,7 +9,7 @@ "Project-Id-Version: DAR 2.4.0\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"; "group_id=65612MSGID_BUGS_ADDRESS =atid=511612\n" -"POT-Creation-Date: 2015-01-18 16:47+0100\n" +"POT-Creation-Date: 2015-01-31 16:04+0100\n" "PO-Revision-Date: 2015-01-18 16:18+0100\n" "Last-Translator: Denis Corbin <dar.li...@free.fr>\n" "Language-Team: French <tra...@traduc.org>\n" @@ -1085,34 +1085,30 @@ "Impossible de positionner les dates de dernier acc�s et de derni�re " "modification : " -#: src/libdar/tools.cpp:1308 -msgid "NULL given as argument" -msgstr "NULL fourni comme argument" - -#: src/libdar/tools.cpp:1358 +#: src/libdar/tools.cpp:1356 msgid "Aborting program: child process died unexpectedly" msgstr "Arr�t du programme : le processus fils est mort de fa�on inattendue" -#: src/libdar/tools.cpp:1364 +#: src/libdar/tools.cpp:1362 #, c-format msgid "Error trying to run %s: %s" msgstr "Erreur lors de l'execution de %s : %s" -#: src/libdar/tools.cpp:1366 +#: src/libdar/tools.cpp:1364 msgid "execvp() failed but did not returned error code" msgstr "execvp() a �chou� mais n'a pas retourn� de code d'erreur" -#: src/libdar/tools.cpp:1563 +#: src/libdar/tools.cpp:1561 #, c-format msgid "Removing file %s" msgstr "Suppression du fichier %s" -#: src/libdar/tools.cpp:1565 +#: src/libdar/tools.cpp:1563 #, c-format msgid "Error removing file %s: %s" msgstr "Erreur lors de la suppression du fichier %s : %s" -#: src/libdar/tools.cpp:1590 +#: src/libdar/tools.cpp:1588 #, c-format msgid "" "Overwriting not allowed while a slice of a previous archive with the same " @@ -1121,7 +1117,7 @@ "�crasement interdit alors qu'une tranche de m�me nom de base a �t� trouv�e " "dans le r�pertoire %s. Op�ration avort�e" -#: src/libdar/tools.cpp:1596 +#: src/libdar/tools.cpp:1594 #, c-format msgid "" "At least one slice of an old archive with the same name remains in the " @@ -1133,48 +1129,48 @@ "tranches avant de cr�er une archive de m�me nom. Peut-on supprimer les " "anciennes tranches ?" -#: src/libdar/tools.cpp:1634 src/libdar/tools.cpp:1638 +#: src/libdar/tools.cpp:1632 src/libdar/tools.cpp:1636 #, c-format msgid "Cannot get inode information for %s: %s" msgstr "Impossible d'obtenir des informations sur l'inode %s : %s" -#: src/libdar/tools.cpp:1647 +#: src/libdar/tools.cpp:1645 msgid "Current Working Directory cannot be a relative path" msgstr "Le r�petoire courant ne peut pas �tre un chemin relatif" -#: src/libdar/tools.cpp:1664 +#: src/libdar/tools.cpp:1662 msgid "Cannot block signals: " msgstr "Impossible de bloquer les signaux : " -#: src/libdar/tools.cpp:1674 +#: src/libdar/tools.cpp:1672 msgid "Cannot unblock signals: " msgstr "Impossible de d�bloquer les signaux : " -#: src/libdar/tools.cpp:1692 src/libdar/tools.cpp:1702 +#: src/libdar/tools.cpp:1690 src/libdar/tools.cpp:1700 #, c-format msgid "Cannot get last modification date: %s" msgstr "Impossible d'obtenir la date de derni�re modification : %s" -#: src/libdar/tools.cpp:1705 +#: src/libdar/tools.cpp:1703 #, c-format msgid "Cannot get size of %S: not a plain file" msgstr "Impossible de conna�tre la taill de %S: ce n'est pas un fichier plein" -#: src/libdar/tools.cpp:1716 +#: src/libdar/tools.cpp:1714 #, c-format msgid "Cannot get mtime: %s" msgstr "Impossible d'obtenir la date de derni�re modification : %s" -#: src/libdar/tools.cpp:1814 +#: src/libdar/tools.cpp:1812 #, c-format msgid "Parse error: Unmatched `%c'" msgstr "Erreur de syntaxe : `%c' sans correspondance" -#: src/libdar/tools.cpp:1857 +#: src/libdar/tools.cpp:1855 msgid "Unknown substitution string: %" msgstr "Cha�ne de substitution inconnue : %" -#: src/libdar/tools.cpp:1864 +#: src/libdar/tools.cpp:1862 msgid "" "last char of user command-line to execute is '%', (use '%%' instead to avoid " "this message)" @@ -1182,58 +1178,58 @@ "Le dernier caract�re de la ligne de commande utilisateur � ex�cuter est '%', " "(utiliser '%%' � la place pour �viter ce message)" -#: src/libdar/tools.cpp:1918 +#: src/libdar/tools.cpp:1916 msgid "execve() failed. (process table is full ?)" msgstr "execve() a �chou�. (table de processus pleine ?)" -#: src/libdar/tools.cpp:1920 +#: src/libdar/tools.cpp:1918 msgid "system() call failed: " msgstr "system() a �chou� : " -#: src/libdar/tools.cpp:1922 +#: src/libdar/tools.cpp:1920 #, c-format msgid "execution of [ %S ] returned error code: %d" msgstr "l'ex�cution de [ %S ] a retourn� un code d'erreur : %d" -#: src/libdar/tools.cpp:1929 +#: src/libdar/tools.cpp:1927 msgid "Error during user command line execution: " msgstr "Erreur pendant l'ex�cution de la ligne de commande utilisateur : " -#: src/libdar/tools.cpp:1929 +#: src/libdar/tools.cpp:1927 msgid " . Retry command-line ?" msgstr " . Essayer � nouveau la ligne de commande ?" -#: src/libdar/tools.cpp:1934 +#: src/libdar/tools.cpp:1932 msgid "Ignore previous error on user command line and continue ?" msgstr "" "Ignorer l'erreur pr�c�dente concernant la ligne de commande utilisateur et " "continuer ?" -#: src/libdar/tools.cpp:1974 +#: src/libdar/tools.cpp:1972 msgid "Fatal error on user command line: " msgstr "Erreur fatale sur la ligne de commande utilisateur : " -#: src/libdar/tools.cpp:2100 src/libdar/tools.cpp:2106 +#: src/libdar/tools.cpp:2098 src/libdar/tools.cpp:2104 msgid "Badly formated octal number" msgstr "Nombre octal malform�e" -#: src/libdar/tools.cpp:2133 +#: src/libdar/tools.cpp:2131 #, c-format msgid "Error while setting file permission: %s" msgstr "Erreur lors de la configuration des droits d'acc�s : %s" -#: src/libdar/tools.cpp:2143 +#: src/libdar/tools.cpp:2141 msgid "Cannot get effective permission given a file descriptor: " msgstr "" "Impossible d'obtenir les droits d'acc�s � partir d'un description de " "fichier : " -#: src/libdar/tools.cpp:2203 +#: src/libdar/tools.cpp:2201 #, c-format msgid "Unknown user: %S" msgstr "Utilisateur inconnu : %S" -#: src/libdar/tools.cpp:2207 +#: src/libdar/tools.cpp:2205 msgid "" "Cannot convert username to uid in statically linked binary, either directly " "provide the UID or run libdar from a dynamically linked executable" @@ -1242,12 +1238,12 @@ "executable li� statiquement. Fournir soit directement l'UID soit utiliser un " "ex�cutable li� dynamiquement" -#: src/libdar/tools.cpp:2219 +#: src/libdar/tools.cpp:2217 #, c-format msgid "Unknown group: %S" msgstr "Groupe inconnu : %S" -#: src/libdar/tools.cpp:2223 +#: src/libdar/tools.cpp:2221 msgid "" "Cannot convert group to gid in statically linked binary, either directly " "provide the GID or run libdar from a dynamically linked executable" @@ -1256,20 +1252,20 @@ "li� statiquement. Fournir soit directement le GID soit utiliser un " "ex�cutable li� dynamiquement" -#: src/libdar/tools.cpp:2230 +#: src/libdar/tools.cpp:2228 #, c-format msgid "Error while setting file user ownership: %s" msgstr "Erreur lors de la changement de propri�taire : %s" -#: src/libdar/tools.cpp:2390 +#: src/libdar/tools.cpp:2388 msgid "Error while fetching hostname: " msgstr "Erreur lors de recherche du nom d'h�te (hostname) : " -#: src/libdar/tools.cpp:2416 src/libdar/catalogue.cpp:4925 +#: src/libdar/tools.cpp:2414 src/libdar/catalogue.cpp:4925 msgid "[Worse]" msgstr "[Pire ]" -#: src/libdar/tools.cpp:2438 +#: src/libdar/tools.cpp:2436 msgid "Invalid wide-char found in string: " msgstr "Caract�re large invalide dans la cha�ne : " @@ -3364,16 +3360,16 @@ "\"compressReset appel� alors que \"compressInit\" n'a jamais �t� invoqu� au " "pr�alable" -#: src/libdar/mask_list.cpp:95 +#: src/libdar/mask_list.cpp:97 #, c-format msgid "Cannot allocate memory for buffer while reading %S" msgstr "Impossible d'allouer de m�moire pour un tampon lors de la lecture %S" -#: src/libdar/mask_list.cpp:121 +#: src/libdar/mask_list.cpp:123 msgid "Found '" msgstr "Trouv� '" -#: src/libdar/mask_list.cpp:166 +#: src/libdar/mask_list.cpp:172 msgid "" "Mask_list's prefix must be an absolute path or start with \"<ROOT>\" string " "for archive merging" @@ -3381,7 +3377,7 @@ "Le pr�fixe pour une mask_list doit �tre un chemin absolu ou commencer par la " "cha�ne \"<ROOT>\" pour la fusion d'archives" -#: src/libdar/mask_list.cpp:188 +#: src/libdar/mask_list.cpp:194 #, c-format msgid "" "Error met while reading line\n" @@ -3392,7 +3388,7 @@ "\t%S\n" " � partir du fichier %S : %S" -#: src/libdar/mask_list.cpp:205 +#: src/libdar/mask_list.cpp:211 #, c-format msgid "Too much line in file %S (integer overflow)" msgstr "Trop de lignes dans le fichier %S (d�passement d'entiers)" @@ -4071,7 +4067,7 @@ msgid "Cannot add an absolute path" msgstr "Impossible d'ajouter un chemin absolu" -#: src/libdar/path.cpp:322 +#: src/libdar/path.cpp:328 msgid "Empty string as subdirectory does not make a valid path" msgstr "" "Une cha�ne vide en tant que sous-r�pertoire ne donne pas un chemin valide" @@ -6632,6 +6628,9 @@ " -E <cha�ne>\t ligne de commande � ex�cuter entre les tranches d'une " "archive\n" +#~ msgid "NULL given as argument" +#~ msgstr "NULL fourni comme argument" + #~ msgid "NULL argument given to \"sauv_path\"" #~ msgstr "Valeur NULL donn�e � \"filename\"" Files old/dar-2.4.16/po/sv.gmo and new/dar-2.4.17/po/sv.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dar-2.4.16/po/sv.po new/dar-2.4.17/po/sv.po --- old/dar-2.4.16/po/sv.po 2015-01-18 17:44:03.000000000 +0100 +++ new/dar-2.4.17/po/sv.po 2015-01-31 16:13:10.000000000 +0100 @@ -9,7 +9,7 @@ "Project-Id-Version: sv\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"; "group_id=65612MSGID_BUGS_ADDRESS =atid=511612\n" -"POT-Creation-Date: 2015-01-18 16:47+0100\n" +"POT-Creation-Date: 2015-01-31 16:04+0100\n" "PO-Revision-Date: 2012-04-15 11:28+0200\n" "Last-Translator: Peter Landgren <peter.tal...@telia.com>\n" "Language-Team: Swedish <kde-i18n-...@kde.org>\n" @@ -1065,35 +1065,31 @@ msgid "Cannot set last access and last modification time: " msgstr "Kan ej sätta senaste tillgångtid och senaste modifieringstid: " -#: src/libdar/tools.cpp:1308 -msgid "NULL given as argument" -msgstr "Tomt givet som argument" - -#: src/libdar/tools.cpp:1358 +#: src/libdar/tools.cpp:1356 msgid "Aborting program: child process died unexpectedly" msgstr "" -#: src/libdar/tools.cpp:1364 +#: src/libdar/tools.cpp:1362 #, fuzzy, c-format msgid "Error trying to run %s: %s" msgstr "Fel vid räddning av EA-lista för %s : %s" -#: src/libdar/tools.cpp:1366 +#: src/libdar/tools.cpp:1364 #, fuzzy msgid "execvp() failed but did not returned error code" msgstr "execvp misslyckades, men gav ingen felkod" -#: src/libdar/tools.cpp:1563 +#: src/libdar/tools.cpp:1561 #, c-format msgid "Removing file %s" msgstr "Tar bort fil %s" -#: src/libdar/tools.cpp:1565 +#: src/libdar/tools.cpp:1563 #, fuzzy, c-format msgid "Error removing file %s: %s" msgstr "Fel vid filöppning %s : %s" -#: src/libdar/tools.cpp:1590 +#: src/libdar/tools.cpp:1588 #, c-format msgid "" "Overwriting not allowed while a slice of a previous archive with the same " @@ -1102,7 +1098,7 @@ "Överskrivning ej tillåten då en del av ett tidigare arkiv med samma basnamn " "har hittats i %s-mappen. Åtgärden avbruten" -#: src/libdar/tools.cpp:1596 +#: src/libdar/tools.cpp:1594 #, fuzzy, c-format msgid "" "At least one slice of an old archive with the same name remains in the " @@ -1115,48 +1111,48 @@ "kan bli gömd bland delarna i detta gamla arkiv. Skall vi ta bort det gamla " "arkivets delar först ?" -#: src/libdar/tools.cpp:1634 src/libdar/tools.cpp:1638 +#: src/libdar/tools.cpp:1632 src/libdar/tools.cpp:1636 #, fuzzy, c-format msgid "Cannot get inode information for %s: %s" msgstr "Kan ej få inodinformation för %s : %s" -#: src/libdar/tools.cpp:1647 +#: src/libdar/tools.cpp:1645 msgid "Current Working Directory cannot be a relative path" msgstr "Aktuell arbetsmapp kan ej vara en relativ sökväg" -#: src/libdar/tools.cpp:1664 +#: src/libdar/tools.cpp:1662 msgid "Cannot block signals: " msgstr "Kan ej blockera signal: " -#: src/libdar/tools.cpp:1674 +#: src/libdar/tools.cpp:1672 msgid "Cannot unblock signals: " msgstr "Kan ej frisläppa signal: " -#: src/libdar/tools.cpp:1692 src/libdar/tools.cpp:1702 +#: src/libdar/tools.cpp:1690 src/libdar/tools.cpp:1700 #, fuzzy, c-format msgid "Cannot get last modification date: %s" msgstr "Kan ej sätta senaste tillgångtid och senaste modifieringstid: " -#: src/libdar/tools.cpp:1705 +#: src/libdar/tools.cpp:1703 #, c-format msgid "Cannot get size of %S: not a plain file" msgstr "" -#: src/libdar/tools.cpp:1716 +#: src/libdar/tools.cpp:1714 #, c-format msgid "Cannot get mtime: %s" msgstr "Kan inte hämta mtime: %s" -#: src/libdar/tools.cpp:1814 +#: src/libdar/tools.cpp:1812 #, fuzzy, c-format msgid "Parse error: Unmatched `%c'" msgstr "Analysfel: " -#: src/libdar/tools.cpp:1857 +#: src/libdar/tools.cpp:1855 msgid "Unknown substitution string: %" msgstr "Okänd utbytessträng :%" -#: src/libdar/tools.cpp:1864 +#: src/libdar/tools.cpp:1862 #, fuzzy msgid "" "last char of user command-line to execute is '%', (use '%%' instead to avoid " @@ -1165,87 +1161,87 @@ "sista tecknet i användarkommandoraden är '%', (använd '%%' i stället så " "undviks detta meddelande). Ignorera det och fortsätta ?" -#: src/libdar/tools.cpp:1918 +#: src/libdar/tools.cpp:1916 msgid "execve() failed. (process table is full ?)" msgstr "execve() misslyckades. (full processtabell ?)" -#: src/libdar/tools.cpp:1920 +#: src/libdar/tools.cpp:1918 msgid "system() call failed: " msgstr "system()-anrop misslyckades: " -#: src/libdar/tools.cpp:1922 +#: src/libdar/tools.cpp:1920 #, c-format msgid "execution of [ %S ] returned error code: %d" msgstr "utförande av [ %S ] resulterade i felkod: %d" -#: src/libdar/tools.cpp:1929 +#: src/libdar/tools.cpp:1927 msgid "Error during user command line execution: " msgstr "Fel vid utförande av användarkommandoradsexekvering: " -#: src/libdar/tools.cpp:1929 +#: src/libdar/tools.cpp:1927 msgid " . Retry command-line ?" msgstr " . Försöka med kommandoraden igen ?" -#: src/libdar/tools.cpp:1934 +#: src/libdar/tools.cpp:1932 msgid "Ignore previous error on user command line and continue ?" msgstr "Ignorera föregående fel från användarkommandorad och fortsätta ?" -#: src/libdar/tools.cpp:1974 +#: src/libdar/tools.cpp:1972 msgid "Fatal error on user command line: " msgstr "Ödesdigert fel i användarkommandorad: " -#: src/libdar/tools.cpp:2100 src/libdar/tools.cpp:2106 +#: src/libdar/tools.cpp:2098 src/libdar/tools.cpp:2104 #, fuzzy msgid "Badly formated octal number" msgstr "Dåligt formaterad databas" -#: src/libdar/tools.cpp:2133 +#: src/libdar/tools.cpp:2131 #, c-format msgid "Error while setting file permission: %s" msgstr "Fel vid tilldelning av en fils egenskaper:%s" -#: src/libdar/tools.cpp:2143 +#: src/libdar/tools.cpp:2141 #, fuzzy msgid "Cannot get effective permission given a file descriptor: " msgstr "Kan ej återställe behörigheter för %s : %s" -#: src/libdar/tools.cpp:2203 +#: src/libdar/tools.cpp:2201 #, c-format msgid "Unknown user: %S" msgstr "Okänd användare: %S" -#: src/libdar/tools.cpp:2207 +#: src/libdar/tools.cpp:2205 msgid "" "Cannot convert username to uid in statically linked binary, either directly " "provide the UID or run libdar from a dynamically linked executable" msgstr "" -#: src/libdar/tools.cpp:2219 +#: src/libdar/tools.cpp:2217 #, fuzzy, c-format msgid "Unknown group: %S" msgstr "Okänd användare: %S" -#: src/libdar/tools.cpp:2223 +#: src/libdar/tools.cpp:2221 msgid "" "Cannot convert group to gid in statically linked binary, either directly " "provide the GID or run libdar from a dynamically linked executable" msgstr "" -#: src/libdar/tools.cpp:2230 +#: src/libdar/tools.cpp:2228 #, c-format msgid "Error while setting file user ownership: %s" msgstr "Fel vid inställning av ägare till fil: %s" -#: src/libdar/tools.cpp:2390 +#: src/libdar/tools.cpp:2388 #, fuzzy msgid "Error while fetching hostname: " msgstr "Fel vid listning av arkivinnehåll: " -#: src/libdar/tools.cpp:2416 src/libdar/catalogue.cpp:4925 +#: src/libdar/tools.cpp:2414 src/libdar/catalogue.cpp:4925 msgid "[Worse]" msgstr "[Värre]" -#: src/libdar/tools.cpp:2438 +#: src/libdar/tools.cpp:2436 #, fuzzy msgid "Invalid wide-char found in string: " msgstr "Ogiltigt tal i sträng: %S" @@ -3238,16 +3234,16 @@ msgid "compressReset called but compressInit never called before" msgstr "'compressReset' anropad men 'compressInit' anropades inte först" -#: src/libdar/mask_list.cpp:95 +#: src/libdar/mask_list.cpp:97 #, c-format msgid "Cannot allocate memory for buffer while reading %S" msgstr "Kan ej tilldela buffertminne under läsning av %S" -#: src/libdar/mask_list.cpp:121 +#: src/libdar/mask_list.cpp:123 msgid "Found '" msgstr "Fann '" -#: src/libdar/mask_list.cpp:166 +#: src/libdar/mask_list.cpp:172 msgid "" "Mask_list's prefix must be an absolute path or start with \"<ROOT>\" string " "for archive merging" @@ -3255,7 +3251,7 @@ "Mask_lists prefix måste vara en absolut sökväg eller börja med \"<ROOT>\"-" "sträng vid arkivhopslagning" -#: src/libdar/mask_list.cpp:188 +#: src/libdar/mask_list.cpp:194 #, c-format msgid "" "Error met while reading line\n" @@ -3266,7 +3262,7 @@ "\t%S\n" " från fil %S: %S" -#: src/libdar/mask_list.cpp:205 +#: src/libdar/mask_list.cpp:211 #, c-format msgid "Too much line in file %S (integer overflow)" msgstr "För mycket rad i fil %S (heltalsspill)" @@ -3930,7 +3926,7 @@ msgid "Cannot add an absolute path" msgstr "Kan ej lägga till en etikett till en tom stack" -#: src/libdar/path.cpp:322 +#: src/libdar/path.cpp:328 msgid "Empty string as subdirectory does not make a valid path" msgstr "En tom sträng som undermapp utgör inte en giltig sökväg" @@ -6399,6 +6395,9 @@ msgstr "" " -E <sträng>\t kommandorad, som skall utföras mellan delar i ett arkiv\n" +#~ msgid "NULL given as argument" +#~ msgstr "Tomt givet som argument" + #~ msgid "NULL argument given to \"sauv_path\"" #~ msgstr "Tomt argument give till \"sauv_path\"" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dar-2.4.16/src/libdar/libdar.hpp new/dar-2.4.17/src/libdar/libdar.hpp --- old/dar-2.4.16/src/libdar/libdar.hpp 2015-01-18 17:44:03.000000000 +0100 +++ new/dar-2.4.17/src/libdar/libdar.hpp 2015-01-31 16:19:47.000000000 +0100 @@ -140,7 +140,7 @@ /// libdar Medium version defined at compilation time const U_I LIBDAR_COMPILE_TIME_MEDIUM = 6; /// libdar Minor version defined at compilation time - const U_I LIBDAR_COMPILE_TIME_MINOR = 3; + const U_I LIBDAR_COMPILE_TIME_MINOR = 4; //////////////////////////////////////////////////////////////////////// // LIBDAR INITIALIZATION METHODS // diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dar-2.4.16/src/libdar/libdar_4_4.hpp new/dar-2.4.17/src/libdar/libdar_4_4.hpp --- old/dar-2.4.16/src/libdar/libdar_4_4.hpp 2015-01-18 17:44:03.000000000 +0100 +++ new/dar-2.4.17/src/libdar/libdar_4_4.hpp 2015-01-31 16:19:47.000000000 +0100 @@ -455,7 +455,7 @@ // but we keep the major to 4 (to avoid alarming external programs expecting the libdar API version 4) const U_I LIBDAR_COMPILE_TIME_MEDIUM = 6; /// libdar Minor version defined at compilation time - const U_I LIBDAR_COMPILE_TIME_MINOR = 13; + const U_I LIBDAR_COMPILE_TIME_MINOR = 14; //////////////////////////////////////////////////////////////////////// // LIBDAR INITIALIZATION METHODS // diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dar-2.4.16/src/libdar/mask.cpp new/dar-2.4.17/src/libdar/mask.cpp --- old/dar-2.4.16/src/libdar/mask.cpp 2013-08-25 19:09:49.000000000 +0200 +++ new/dar-2.4.17/src/libdar/mask.cpp 2015-01-31 16:08:38.000000000 +0100 @@ -39,10 +39,12 @@ { simple_mask::simple_mask(const string & wilde_card_expression, - bool case_sensit) : the_mask(wilde_card_expression), case_s(case_sensit) + bool case_sensit) : case_s(case_sensit) { if(!case_s) - tools_to_upper(the_mask); + tools_to_upper(wilde_card_expression, the_mask); + else + the_mask = wilde_card_expression; } const simple_mask & simple_mask::operator = (const simple_mask & m) @@ -58,8 +60,9 @@ { if(!case_s) { - string upper = expression; - tools_to_upper(upper); + string upper; + + tools_to_upper(expression, upper); return fnmatch(the_mask.c_str(), upper.c_str(), FNM_PERIOD) == 0; } else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dar-2.4.16/src/libdar/mask_list.cpp new/dar-2.4.17/src/libdar/mask_list.cpp --- old/dar-2.4.16/src/libdar/mask_list.cpp 2015-01-18 17:44:03.000000000 +0100 +++ new/dar-2.4.17/src/libdar/mask_list.cpp 2015-01-31 16:19:47.000000000 +0100 @@ -70,6 +70,7 @@ list <string> tmp; //< list of all raw lines read, without any prefix U_I lu = 0, curs; //< cursor used as cisors to split data in line char *beg = NULL; //< points to the beginning of the next line inside buffer, when more than one line can be found in buffer + string str_beg; //< holds the std::string copy of beg, eventually uppercased string current_entry = ""; //< holds the current line converted to string between each read() path prefix = prefix_t; //< the prefix to add to relative paths @@ -81,8 +82,9 @@ if(!case_sensit) { string ptp = prefix_t.display(); - tools_to_upper(ptp); - prefix = path(ptp); + string upper; + tools_to_upper(ptp, upper); + prefix = path(upper); } @@ -123,8 +125,10 @@ { buffer[curs] = '\0'; if(!case_s) - tools_to_upper(beg); - current_entry += string(beg); + tools_to_upper(beg, str_beg); + else + str_beg = string(beg); + current_entry += str_beg; if(current_entry != "") tmp.push_back(current_entry); current_entry = ""; @@ -138,8 +142,10 @@ { buffer[lu] = '\0'; if(!case_s) - tools_to_upper(beg); - current_entry += string(beg); + tools_to_upper(beg, str_beg); + else + str_beg = string(beg); + current_entry += str_beg; } } while(curs < lu); @@ -224,11 +230,7 @@ if(case_s) target = expression; else - { - string hidden = expression; - tools_to_upper(hidden); - target = hidden; - } + tools_to_upper(expression, target); // divide & conquer algorithm on a sorted list (aka binary search) while(max - min > 1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dar-2.4.16/src/libdar/path.cpp new/dar-2.4.17/src/libdar/path.cpp --- old/dar-2.4.16/src/libdar/path.cpp 2015-01-18 17:44:03.000000000 +0100 +++ new/dar-2.4.17/src/libdar/path.cpp 2015-01-31 16:19:47.000000000 +0100 @@ -212,14 +212,20 @@ bool path::is_subdir_of(const path & p, bool case_sensit) const { - string me = display(); - string you = p.display(); + string me; + string you; if(!case_sensit) { // converting all string in upper case - tools_to_upper(me); - tools_to_upper(you); + + tools_to_upper(display(), me); + tools_to_upper(p.display(), you); + } + else + { + me = display(); + you = p.display(); } if(me.size() >= you.size()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dar-2.4.16/src/libdar/tools.cpp new/dar-2.4.17/src/libdar/tools.cpp --- old/dar-2.4.16/src/libdar/tools.cpp 2015-01-18 17:44:03.000000000 +0100 +++ new/dar-2.4.17/src/libdar/tools.cpp 2015-01-31 16:19:47.000000000 +0100 @@ -1300,31 +1300,29 @@ return curs >= a.size(); } - void tools_to_upper(char *nts) - { - char *ptr = nts; - - if(ptr == NULL) - throw Erange("tools_to_upper", dar_gettext("NULL given as argument")); - - while(*ptr != '\0') - { - *ptr = (char)toupper((int)*ptr); - ptr++; - } - } - - void tools_to_upper(string & r) + void tools_to_upper(const string & r, string & uppered) { #if HAVE_WCTYPE_H && HAVE_WCHAR_H - wstring tmp = tools_string_to_wstring(r); - tools_to_wupper(tmp); - r = tools_wstring_to_string(tmp); + try + { + wstring tmp = tools_string_to_wstring(r); + tools_to_wupper(tmp); + uppered = tools_wstring_to_string(tmp); + } + catch(Erange & e) + { + U_I taille = r.size(); + uppered = r; + + for(U_I x = 0; x < taille; ++x) + uppered[x] = toupper(uppered[x]); + } #else U_I taille = r.size(); + uppered = r; for(U_I x = 0; x < taille; ++x) - r[x] = toupper(r[x]); + uppered[x] = toupper(uppered[x]); #endif } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dar-2.4.16/src/libdar/tools.hpp new/dar-2.4.17/src/libdar/tools.hpp --- old/dar-2.4.16/src/libdar/tools.hpp 2015-01-18 17:44:03.000000000 +0100 +++ new/dar-2.4.17/src/libdar/tools.hpp 2015-01-31 16:19:47.000000000 +0100 @@ -410,13 +410,11 @@ /// \brief convert a string to upper case /// - /// \param[in,out] nts a NULL terminated string to convert - extern void tools_to_upper(char *nts); - - /// \brief convert a string to upper case - /// - /// \param[in,out] r to convert - extern void tools_to_upper(std::string & r); + /// \param[in] r the string to convert + /// \param[out] uppered resulting upper cased string + /// \note in case of invalid wide char met in source string, the upper case convertion + /// is done in ASCII mode (byte by byte) + extern void tools_to_upper(const std::string & r, std::string & uppered); #if HAVE_WCTYPE_H /// \brief convert a wstring to upper case ++++++ dar-use-libc-xattr.patch ++++++ --- /var/tmp/diff_new_pack.TznkeT/_old 2015-03-05 18:16:33.000000000 +0100 +++ /var/tmp/diff_new_pack.TznkeT/_new 2015-03-05 18:16:33.000000000 +0100 @@ -1,7 +1,8 @@ -diff -Nru dar-2.4.14.orig/configure.ac dar-2.4.14/configure.ac ---- dar-2.4.14.orig/configure.ac 2014-06-15 18:43:40.000000000 +0200 -+++ dar-2.4.14/configure.ac 2014-06-26 13:14:05.789271140 +0200 -@@ -336,15 +336,15 @@ +Index: dar-2.4.17/configure.ac +=================================================================== +--- dar-2.4.17.orig/configure.ac ++++ dar-2.4.17/configure.ac +@@ -350,15 +350,15 @@ AC_ARG_ENABLE( [ea-support], [ AC_MSG_CHECKING([for Extended Attribute support]) AC_MSG_RESULT([disabled]) ], @@ -21,10 +22,11 @@ #endif }]], [ lgetxattr((char *)0, (char *)0, (void *)0, 0); ]) -diff -Nru dar-2.4.14.orig/src/libdar/ea_filesystem.cpp dar-2.4.14/src/libdar/ea_filesystem.cpp ---- dar-2.4.14.orig/src/libdar/ea_filesystem.cpp 2014-06-15 13:12:18.000000000 +0200 -+++ dar-2.4.14/src/libdar/ea_filesystem.cpp 2014-06-26 13:13:35.549533341 +0200 -@@ -61,6 +61,10 @@ +Index: dar-2.4.17/src/libdar/ea_filesystem.cpp +=================================================================== +--- dar-2.4.17.orig/src/libdar/ea_filesystem.cpp ++++ dar-2.4.17/src/libdar/ea_filesystem.cpp +@@ -61,6 +61,10 @@ char *strchr (), *strrchr (); #endif } // end extern "C" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
