diff options
| -rw-r--r-- | CHANGES | 8 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | acconfig.h | 143 | ||||
| -rw-r--r-- | aclocal.m4 | 628 | ||||
| -rwxr-xr-x | autogen.sh | 17 | ||||
| -rw-r--r-- | beecrypt/COPYING | 6 | ||||
| -rw-r--r-- | beecrypt/INSTALL | 127 | ||||
| -rw-r--r-- | beecrypt/Makefile.in | 207 | ||||
| -rw-r--r-- | beecrypt/aclocal.m4 | 580 | ||||
| -rwxr-xr-x | beecrypt/autogen.sh | 10 | ||||
| -rw-r--r-- | beecrypt/config.h | 83 | ||||
| -rw-r--r-- | beecrypt/config.h.in | 81 | ||||
| -rw-r--r-- | beecrypt/configure.in | 1 | ||||
| -rw-r--r-- | beecrypt/docs/Makefile.in | 43 | ||||
| -rw-r--r-- | beecrypt/gas/Makefile.in | 43 | ||||
| -rwxr-xr-x | beecrypt/install-sh | 34 | ||||
| -rw-r--r-- | beecrypt/masm/Makefile.in | 43 | ||||
| -rwxr-xr-x | beecrypt/missing | 166 | ||||
| -rw-r--r-- | beecrypt/mwerks/Makefile.in | 43 | ||||
| -rw-r--r-- | beecrypt/tests/Makefile.in | 73 | ||||
| -rw-r--r-- | configure.in | 157 | ||||
| -rwxr-xr-x | depcomp | 411 | ||||
| -rwxr-xr-x | install-sh | 251 | ||||
| -rw-r--r-- | lib/depends.c | 113 | ||||
| -rw-r--r-- | lib/poptI.c | 4 | ||||
| -rw-r--r-- | lib/query.c | 3 | ||||
| -rw-r--r-- | lib/rpmrc.c | 2 | ||||
| -rw-r--r-- | lib/signature.c | 24 | ||||
| -rwxr-xr-x | missing | 283 | ||||
| -rw-r--r-- | po/cs.po | 341 | ||||
| -rw-r--r-- | po/da.po | 343 | ||||
| -rw-r--r-- | po/de.po | 334 | ||||
| -rw-r--r-- | po/fi.po | 334 | ||||
| -rw-r--r-- | po/fr.po | 334 | ||||
| -rw-r--r-- | po/gl.po | 334 | ||||
| -rw-r--r-- | po/is.po | 334 | ||||
| -rw-r--r-- | po/ja.po | 334 | ||||
| -rw-r--r-- | po/ko.po | 343 | ||||
| -rw-r--r-- | po/no.po | 334 | ||||
| -rw-r--r-- | po/pl.po | 345 | ||||
| -rw-r--r-- | po/pt_BR.po | 334 | ||||
| -rw-r--r-- | po/ro.po | 334 | ||||
| -rw-r--r-- | po/rpm.pot | 334 | ||||
| -rw-r--r-- | po/ru.po | 343 | ||||
| -rw-r--r-- | po/sk.po | 345 | ||||
| -rw-r--r-- | po/sl.po | 345 | ||||
| -rw-r--r-- | po/sr.po | 334 | ||||
| -rw-r--r-- | po/sv.po | 343 | ||||
| -rw-r--r-- | po/tr.po | 343 | ||||
| -rw-r--r-- | popt/.cvsignore | 5 | ||||
| -rw-r--r-- | popt/acconfig.h | 32 | ||||
| -rwxr-xr-x | popt/autogen.sh | 2 | ||||
| -rwxr-xr-x | popt/configure.in | 4 | ||||
| -rwxr-xr-x | popt/depcomp | 411 | ||||
| -rwxr-xr-x | popt/install-sh | 251 | ||||
| -rwxr-xr-x | popt/missing | 283 | ||||
| -rw-r--r-- | python/Makefile.in | 101 | ||||
| -rw-r--r-- | rpm.spec | 548 | ||||
| -rw-r--r-- | rpm.spec.in | 16 | ||||
| -rw-r--r-- | rpmdb/Makefile.am | 7 | ||||
| -rw-r--r-- | rpmdb/db3.c | 185 | ||||
| -rw-r--r-- | rpmdb/dbconfig.c | 4 | ||||
| -rw-r--r-- | rpmdb/header.c | 33 | ||||
| -rw-r--r-- | rpmdb/header_internal.h | 12 | ||||
| -rw-r--r-- | rpmdb/rpmdb.c | 364 | ||||
| -rw-r--r-- | rpmdb/rpmdb.h | 359 | ||||
| -rw-r--r-- | rpmdb/tdbi.c | 2 | ||||
| -rw-r--r-- | rpmdb/tjfn.c | 2 | ||||
| -rw-r--r-- | rpmio/Makefile.am | 4 | ||||
| -rw-r--r-- | zlib/.cvsignore | 5 | ||||
| -rw-r--r-- | zlib/Makefile.in | 192 | ||||
| -rw-r--r-- | zlib/aclocal.m4 | 461 | ||||
| -rwxr-xr-x | zlib/autogen.sh | 2 | ||||
| -rw-r--r-- | zlib/configure.in | 2 | ||||
| -rwxr-xr-x | zlib/depcomp | 411 |
75 files changed, 5966 insertions, 8084 deletions
@@ -93,7 +93,7 @@ ` - don't bother with signing check if 16 bits of hash don't match. - only V3 signatures for now. - wire --nodigest/--nosignature options to checksig/query/verify modes. - - splint annotationsm, signature cleanup. + - splint annotations, signature cleanup. - drill ts/fi through verify mode, add methods to keep fi abstract. - use mmap when calculating file digests on verify, ~20% faster. - permit --dbpath and --root with signature (i.e. --import) modes. @@ -101,8 +101,10 @@ - rescusitate --rebuild. - use rpmdb-redhat to suggest dependency resolution(s). - merge conflicts into problems, handle as transaction set variable. - - use build time to choose one of multiple alternative suggestions. + - use build time to choose one of multiple alternative suggestions. - add --nosuggests to disable suggested resolutions. + - attempt to make peace with automake-1.6.1, autoconf-2.53. + - rip out two layers of dbN gook, internal Berkeley db is here to stay. 4.0.3 -> 4.0.4: - solaris: translate i86pc to i386 (#57182). @@ -155,6 +157,8 @@ - speedup large queries by ~50%. - revert to presentation ordering Yet Again (#62158). - non-glibc: on upgrade, mergesort is much faster than quicksort. + - fix: queries that evaluated to "" incorrectly returned NULL. + - fix: packages produced by rpm-4.0 dinna merge signature tags. 4.0.2 -> 4.0.3: - update per-interpreter dependency scripts, add sql/tcl (#20295). diff --git a/Makefile.am b/Makefile.am index 83987aaf7..8dcabc466 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,8 +50,7 @@ pkglib_SCRIPTS = find-provides find-requires mkinstalldirs \ rpmpopt-$(VERSION): rpmpopt cp rpmpopt $@ -noinst_HEADERS = \ - acconfig.h build.h debug.h system.h +noinst_HEADERS = build.h debug.h system.h rpm_SOURCES = rpm_LDFLAGS = @LDFLAGS_STATIC@ $(myLDFLAGS) diff --git a/acconfig.h b/acconfig.h deleted file mode 100644 index a533d54b5..000000000 --- a/acconfig.h +++ /dev/null @@ -1,143 +0,0 @@ -/* acconfig.h - This file is in the public domain. - - Descriptive text for the C preprocessor macros that - the distributed Autoconf macros can define. - No software package will use all of them; autoheader copies the ones - your configure.in uses into your configuration header file templates. - - The entries are in sort -df order: alphabetical, case insensitive, - ignoring punctuation (such as underscores). Although this order - can split up related entries, it makes it easier to check whether - a given entry is in the file. - - Leave the following blank line there!! Autoheader needs it. */ - - -/* Define to 1 if ANSI function prototypes are usable. */ -#undef PROTOTYPES - -/* Define as 1 if you have mntctl() (only aix?) */ -#undef HAVE_MNTCTL - -/* Define as 1 if <netdb.h> defines h_errno */ -#undef HAVE_HERRNO - -/* Define as 1 if <sys/stat.h> defines S_ISLNK */ -#undef HAVE_S_ISLNK - -/* Define as 1 if <sys/stat.h> defines S_IFSOCK */ -#undef HAVE_S_IFSOCK - -/* Define as 1 if <sys/stat.h> defines S_ISSOCK */ -#undef HAVE_S_ISSOCK - -/* Define as 1 if we need timezone */ -#undef NEED_TIMEZONE - -/* Define as 1 if we need myrealloc */ -#undef NEED_MYREALLOC - -/* Define as one if we need to include <strings.h> (along with <string.h>) */ -#undef NEED_STRINGS_H - -/* Define as 1 if you have getmntinfo_r() (only osf?) */ -#undef HAVE_GETMNTINFO_R - -/* Define as 1 if you have "struct mnttab" (only sco?) */ -#undef HAVE_STRUCT_MNTTAB - -/* Define as 1 if you have lchown() */ -#undef HAVE_LCHOWN - -/* Define as 1 if chown() follows symlinks and you don't have lchown() */ -#undef CHOWN_FOLLOWS_SYMLINK - -/* Define if the patch call you'll be using is 2.1 or older */ -#undef HAVE_OLDPATCH_21 - -/* Define as 1 if your zlib has gzseek() */ -#undef HAVE_GZSEEK - -/* Define as 1 if your va_list type is an array */ -#undef HAVE_VA_LIST_AS_ARRAY - -/* Define to the full path name of the bzip2 library (libbz2.a) */ -#undef BZIP2LIB - -/* Define as 1 if you bzip2 1.0 */ -#undef HAVE_BZ2_1_0 - -/* A full path to a program, possibly with arguments, that will create a - directory and all necessary parent directories, ala `mkdir -p' */ -#undef MKDIR_P - -/* Full path to rpm locale directory (usually /usr/share/locale) */ -#undef LOCALEDIR - -/* Full path to rpm global configuration directory (usually /usr/lib/rpm) */ -#undef RPMCONFIGDIR - -/* Full path to rpm system configuration directory (usually /etc/rpm) */ -#undef SYSCONFIGDIR - -/* Full path to find-provides script (usually /usr/lib/rpm/find-provides) */ -#undef FINDPROVIDES - -/* Full path to find-requires script (usually /usr/lib/rpm/find-requires) */ -#undef FINDREQUIRES - -/* Full path to rpmpopt configuration file (usually /usr/lib/rpm/rpmpopt) */ -#undef LIBRPMALIAS_FILENAME - -/* Full path to rpmrc configuration file (usually /usr/lib/rpm/rpmrc) */ -#undef LIBRPMRC_FILENAME - -/* Colon separated paths of macro files to read. */ -#undef MACROFILES - -/* statfs in <sys/statvfs.h> (for solaris 2.6+ systems) */ -#undef STATFS_IN_SYS_STATVFS - -/* statfs in <sys/vfs.h> (for linux systems) */ -#undef STATFS_IN_SYS_VFS - -/* statfs in <sys/mount.h> (for Digital Unix 4.0D systems) */ -#undef STATFS_IN_SYS_MOUNT - -/* statfs in <sys/statfs.h> (for Irix 6.4 systems) */ -#undef STATFS_IN_SYS_STATFS - -/* define if struct statfs has the f_bavail member */ -#undef STATFS_HAS_F_BAVAIL - -/* define if the statfs() call takes 4 arguments */ -#undef STAT_STATFS4 - -/* Use the included glob.c? */ -#undef USE_GNU_GLOB - -/* Use the Berkeley db3 API? */ -#undef USE_DB3 - -/* Use the Berkeley db2 API? */ -#undef USE_DB2 - -/* Use the Berkeley db1 retrofit to db2/db3 API? */ -#undef USE_DB1 - -/* Define if you have the <db3/db.h> header file. */ -#undef HAVE_DB3_DB_H - -/* Build with dmalloc support? */ -#undef DMALLOC - -/* Define if you have the getmntent() function */ -#undef HAVE_GETMNTENT - - -/* Leave that blank line there!! Autoheader needs it. - If you're adding to this file, keep in mind: - The entries are in sort -df order: alphabetical, case insensitive, - ignoring punctuation (such as underscores). */ - diff --git a/aclocal.m4 b/aclocal.m4 index 7334fe42b..a78077f9c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# aclocal.m4 generated automatically by aclocal 1.5 +# aclocal.m4 generated automatically by aclocal 1.6.1 -*- Autoconf -*- -# Copyright 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11,11 +11,30 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Do all the work for Automake. This macro actually does too much -- -# some checks are only needed if your package does certain things. -# But this isn't really a big deal. +# Do all the work for Automake. -*- Autoconf -*- -# serial 5 +# This macro actually does too much some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 8 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -24,62 +43,52 @@ # CC etc. in the Makefile, will ask for an AC_PROG_CC use... -# We require 2.13 because we rely on SHELL being computed by configure. -AC_PREREQ([2.13]) - -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -# ----------------------------------------------------------- -# If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED. -# The purpose of this macro is to provide the user with a means to -# check macros which are provided without letting her know how the -# information is coded. -# If this macro is not defined by Autoconf, define it here. -ifdef([AC_PROVIDE_IFELSE], - [], - [define([AC_PROVIDE_IFELSE], - [ifdef([AC_PROVIDE_$1], - [$2], [$3])])]) - +AC_PREREQ([2.52]) -# AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE]) -# ---------------------------------------------- +# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow +# the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AC_PROG_INSTALL])dnl +[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl # test to see if srcdir already configured -if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && +if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first]) + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) fi # Define the identity of the package. -PACKAGE=$1 -AC_SUBST(PACKAGE)dnl -VERSION=$2 -AC_SUBST(VERSION)dnl -ifelse([$3],, +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl + AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl + AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl + +_AM_IF_OPTION([no-define],, [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])]) - -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -# the ones we care about. -ifdef([m4_pattern_allow], - [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl - -# Autoconf 2.50 always computes EXEEXT. However we need to be -# compatible with 2.13, for now. So we always define EXEEXT, but we -# don't compute it. -AC_SUBST(EXEEXT) -# Similar for OBJEXT -- only we only use OBJEXT if the user actually -# requests that it be used. This is a bit dumb. -: ${OBJEXT=o} -AC_SUBST(OBJEXT) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal) +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) AM_MISSING_PROG(AMTAR, tar) @@ -89,9 +98,9 @@ AM_PROG_INSTALL_STRIP # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl -AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_PROVIDE_IFELSE([AC_PROG_][CC], + +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_][CC], [_AM_DEPENDENCIES(CC)], [define([AC_PROG_][CC], defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl @@ -100,11 +109,102 @@ AC_PROVIDE_IFELSE([AC_PROG_][CXX], [define([AC_PROG_][CXX], defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl ]) +]) + +# Copyright 2002 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"]) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION so it can be traced. +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], + [AM_AUTOMAKE_VERSION([1.6.1])]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright 2001, 2002 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 2 + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) # # Check to make sure that the build environment is sane. # +# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + # serial 3 # AM_SANITY_CHECK @@ -148,8 +248,27 @@ Check your system clock]) fi AC_MSG_RESULT(yes)]) +# -*- Autoconf -*- -# serial 2 + +# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 3 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -171,13 +290,29 @@ if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= - am_backtick='`' - AC_MSG_WARN([${am_backtick}missing' script is too old or missing]) + AC_MSG_WARN([`missing' script is too old or missing]) fi ]) # AM_AUX_DIR_EXPAND +# Copyright 2001 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -216,19 +351,59 @@ fi # absolute PATH. The drawback is that using absolute paths prevent a # configured tree to be moved without reconfiguration. +# Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50]) + AC_DEFUN([AM_AUX_DIR_EXPAND], [ # expand $ac_aux_dir to an absolute path -am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` +am_aux_dir=`cd $ac_aux_dir && pwd` ]) # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. + +# Copyright 2001 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl install_sh=${install_sh-"$am_aux_dir/install-sh"} AC_SUBST(install_sh)]) +# AM_PROG_INSTALL_STRIP + +# Copyright 2001 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + # One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip @@ -238,11 +413,35 @@ AC_SUBST(install_sh)]) # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) # serial 4 -*- Autoconf -*- +# Copyright 1999, 2000, 2001 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be @@ -254,9 +453,9 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) # _AM_DEPENDENCIES(NAME) -# --------------------- +# ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX" or "OBJC". +# NAME is "CC", "CXX", "GCJ", or "OBJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -333,8 +532,7 @@ else am_cv_$1_dependencies_compiler_type=none fi ]) -$1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type" -AC_SUBST([$1DEPMODE]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) ]) @@ -352,7 +550,7 @@ else DEPDIR=_deps fi rmdir .deps 2>/dev/null -AC_SUBST(DEPDIR) +AC_SUBST([DEPDIR]) ]) @@ -367,30 +565,42 @@ if test "x$enable_dependency_tracking" != xno; then AMDEPBACKSLASH='\' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -pushdef([subst], defn([AC_SUBST])) -subst(AMDEPBACKSLASH) -popdef([subst]) +AC_SUBST([AMDEPBACKSLASH]) ]) -# Generate code to set up dependency tracking. -# This macro should only be invoked once -- use via AC_REQUIRE. -# Usage: -# AM_OUTPUT_DEPENDENCY_COMMANDS +# Generate code to set up dependency tracking. -*- Autoconf -*- -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[ -AC_OUTPUT_COMMANDS([ -test x"$AMDEP_TRUE" != x"" || -for mf in $CONFIG_FILES; do - case "$mf" in - Makefile) dirpart=.;; - */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; - *) continue;; - esac - grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue +# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +#serial 2 + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + if (sed 1q $mf | fgrep 'generated by automake') > /dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue # Extract the definition of DEP_FILES from the Makefile without # running `make'. DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` @@ -414,14 +624,46 @@ for mf in $CONFIG_FILES; do sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue - fdir=`echo "$file" | sed -e 's|/[^/]*$||'` - $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1 + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done done -], [AMDEP_TRUE="$AMDEP_TRUE" -ac_aux_dir="$ac_aux_dir"])]) +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) + +# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*- + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 2 # AM_MAKE_INCLUDE() # ----------------- @@ -434,7 +676,7 @@ doit: END # If we don't find an include directive, just comment out the code. AC_MSG_CHECKING([for style of include used by $am_make]) -am__include='#' +am__include="#" am__quote= _am_result=none # First try GNU make style include. @@ -454,7 +696,7 @@ if test "$am__include" = "#"; then echo '.include "confinc"' > confmf if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then am__include=.include - am__quote='"' + am__quote="\"" _am_result=BSD fi fi @@ -464,23 +706,35 @@ AC_MSG_RESULT($_am_result) rm -f confinc confmf ]) -# serial 3 +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright 1997, 2000, 2001 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 5 + +AC_PREREQ(2.52) # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. -# -# FIXME: Once using 2.50, use this: -# m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl AC_DEFUN([AM_CONDITIONAL], -[ifelse([$1], [TRUE], - [errprint(__file__:__line__: [$0: invalid condition: $1 -])dnl -m4exit(1)])dnl -ifelse([$1], [FALSE], - [errprint(__file__:__line__: [$0: invalid condition: $1 -])dnl -m4exit(1)])dnl +[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE]) AC_SUBST([$1_FALSE]) if $2; then @@ -489,74 +743,90 @@ if $2; then else $1_TRUE='#' $1_FALSE= -fi]) +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([conditional \"$1\" was never defined. +Usually this means the macro was only invoked conditionally.]) +fi])]) -# Like AC_CONFIG_HEADER, but automatically create stamp file. +# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- -# serial 3 +# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +AC_PREREQ([2.52]) + +# serial 6 # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. We must strip everything past the first ":", # and everything past the last "/". -AC_PREREQ([2.12]) - -AC_DEFUN([AM_CONFIG_HEADER], -[ifdef([AC_FOREACH],dnl - [dnl init our file count if it isn't already - m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0])) - dnl prepare to store our destination file list for use in config.status - AC_FOREACH([_AM_File], [$1], - [m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*])) - m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index)) - dnl and add it to the list of files AC keeps track of, along - dnl with our hook - AC_CONFIG_HEADERS(_AM_File, -dnl COMMANDS, [, INIT-CMDS] -[# update the timestamp -echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h]_AM_Config_Header_Index[" -][$2]m4_ifval([$3], [, [$3]]))dnl AC_CONFIG_HEADERS - m4_popdef([_AM_Dest])])],dnl -[AC_CONFIG_HEADER([$1]) - AC_OUTPUT_COMMANDS( - ifelse(patsubst([$1], [[^ ]], []), - [], - [test -z "$CONFIG_HEADERS" || echo timestamp >dnl - patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),dnl -[am_indx=1 -for am_file in $1; do - case " \$CONFIG_HEADERS " in - *" \$am_file "*) - am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\` - if test -n "\$am_dir"; then - am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\` - for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do - am_tmpdir=\$am_tmpdir\$am_subdir/ - if test ! -d \$am_tmpdir; then - mkdir \$am_tmpdir - fi - done - fi - echo timestamp > "\$am_dir"stamp-h\$am_indx - ;; - esac - am_indx=\`expr \$am_indx + 1\` -done]) -])]) # AM_CONFIG_HEADER - # _AM_DIRNAME(PATH) # ----------------- # Like AS_DIRNAME, only do it during macro expansion AC_DEFUN([_AM_DIRNAME], - [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1, - m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1, - m4_if(m4_regexp([$1], [^/.*]), -1, + [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1, + m4_if(regexp([$1], [^//\([^/]\|$\)]), -1, + m4_if(regexp([$1], [^/.*]), -1, [.], - m4_patsubst([$1], [^\(/\).*], [\1])), - m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])), - m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl -]) # _AM_DIRNAME + patsubst([$1], [^\(/\).*], [\1])), + patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])), + patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl +])# _AM_DIRNAME + + +# The stamp files are numbered to have different names. +# We could number them on a directory basis, but that's additional +# complications, let's have a unique counter. +m4_define([_AM_STAMP_Count], [0]) + + +# _AM_STAMP(HEADER) +# ----------------- +# The name of the stamp file for HEADER. +AC_DEFUN([_AM_STAMP], +[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl +AS_ESCAPE(_AM_DIRNAME(patsubst([$1], + [:.*])))/stamp-h[]_AM_STAMP_Count]) + + +# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS) +# ------------------------------------------------------------ +# We used to try to get a real timestamp in stamp-h. But the fear is that +# that will cause unnecessary cvs conflicts. +AC_DEFUN([_AM_CONFIG_HEADER], +[# Add the stamp file to the list of files AC keeps track of, +# along with our hook. +AC_CONFIG_HEADERS([$1], + [# update the timestamp +echo 'timestamp for $1' >"_AM_STAMP([$1])" +$2], + [$3]) +])# _AM_CONFIG_HEADER + + +# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS) +# -------------------------------------------------------------- +AC_DEFUN([AM_CONFIG_HEADER], +[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])]) +])# AM_CONFIG_HEADER # isc-posix.m4 serial 1 (gettext-0.10.40) dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. @@ -584,6 +854,23 @@ AC_DEFUN([AC_ISC_POSIX], ) +# Copyright 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + # serial 1 AC_DEFUN([AM_C_PROTOTYPES], @@ -606,6 +893,23 @@ AC_SUBST(ANSI2KNR)dnl ]) +# Copyright 1996, 1997, 1999, 2000, 2001 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + # serial 1 # @defmac AC_PROG_CC_STDC @@ -4186,20 +4490,6 @@ AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) # This is just to silence aclocal about the macro not being used ifelse([AC_DISABLE_FAST_INSTALL]) -# From Jim Meyering. Use this if you use the GNU error.[ch]. -# FIXME: Migrate into libit - -AC_DEFUN([AM_FUNC_ERROR_AT_LINE], -[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line, - [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");], - am_cv_lib_error_at_line=yes, - am_cv_lib_error_at_line=no)]) - if test $am_cv_lib_error_at_line = no; then - LIBOBJS="$LIBOBJS error.$ac_objext" - fi - AC_SUBST(LIBOBJS)dnl -]) - # gettext.m4 serial 13 (gettext-0.11.1) dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU diff --git a/autogen.sh b/autogen.sh index ede543749..7dbbaa517 100755 --- a/autogen.sh +++ b/autogen.sh @@ -4,13 +4,13 @@ export CFLAGS export LDFLAGS LTV="libtoolize (GNU libtool) 1.4.2" -ACV="autoconf (GNU Autoconf) 2.52" -AMV="automake (GNU automake) 1.5" +ACV="autoconf (GNU Autoconf) 2.53" +AMV="automake (GNU automake) 1.6.1" USAGE=" This script documents the versions of the tools I'm using to build rpm: libtool-1.4.2 - autoconf-2.52 - automake-1.5 + autoconf-2.53 + automake-1.6.1 Simply edit this script to change the libtool/autoconf/automake versions checked if you need to, as rpm should build (and has built) with all recent versions of libtool/autoconf/automake. @@ -20,13 +20,14 @@ recent versions of libtool/autoconf/automake. [ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" && exit 1 [ "`automake --version | head -1 | sed -e 's/1\.4[a-z]/1.4/'`" != "$AMV" ] && echo "$USAGE" && exit 1 -(cd popt; ./autogen.sh --noconfigure "$@") -(cd zlib; ./autogen.sh --noconfigure "$@") -(cd beecrypt; ./autogen.sh --noconfigure "$@") +(echo "--- popt"; cd popt; ./autogen.sh --noconfigure "$@") +(echo "--- zlib"; cd zlib; ./autogen.sh --noconfigure "$@") +(echo "--- beecrypt"; cd beecrypt; ./autogen.sh --noconfigure "$@") + libtoolize --copy --force aclocal autoheader -automake +automake -a -c autoconf if [ "$1" = "--noconfigure" ]; then diff --git a/beecrypt/COPYING b/beecrypt/COPYING index 60549be51..d60c31a97 100644 --- a/beecrypt/COPYING +++ b/beecrypt/COPYING @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 19yy <name of author> + Copyright (C) <year> <name of author> 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 @@ -313,7 +313,7 @@ Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/beecrypt/INSTALL b/beecrypt/INSTALL index b42a17ac4..62ea076c1 100644 --- a/beecrypt/INSTALL +++ b/beecrypt/INSTALL @@ -1,3 +1,9 @@ +Copyright 1994, 1995, 1996, 1999, 2000, 2001 Free Software Foundation, +Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + Basic Installation ================== @@ -8,20 +14,27 @@ various system-dependent variables used during compilation. It uses those values to create a `Makefile' in each directory of the package. It may also create one or more `.h' files containing system-dependent definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, a file -`config.cache' that saves the results of its tests to speed up -reconfiguring, and a file `config.log' containing compiler output -(useful mainly for debugging `configure'). +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. (Caching is +disabled by default to prevent problems with accidental use of stale +cache files.) If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail diffs or instructions to the address given in the `README' so they can -be considered for the next release. If at some point `config.cache' -contains results you don't want to keep, you may remove or edit it. +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. - The file `configure.in' is used to create `configure' by a program -called `autoconf'. You only need `configure.in' if you want to change -it or regenerate `configure' using a newer version of `autoconf'. + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You only need +`configure.ac' if you want to change it or regenerate `configure' using +a newer version of `autoconf'. The simplest way to compile this package is: @@ -55,14 +68,15 @@ Compilers and Options ===================== Some systems require unusual options for compilation or linking that -the `configure' script does not know about. You can give `configure' -initial values for variables by setting them in the environment. Using -a Bourne-compatible shell, you can do that on the command line like -this: - CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for variables by setting +them in the environment. You can do that on the command line like this: -Or on systems that have the `env' program, you can do it like this: - env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure + ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + + *Note Defining Variables::, for more details. Compiling For Multiple Architectures ==================================== @@ -75,11 +89,11 @@ directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - If you have to use a `make' that does not supports the `VPATH' -variable, you have to compile the package for one architecture at a time -in the source code directory. After you have installed the package for -one architecture, use `make distclean' before reconfiguring for another -architecture. + If you have to use a `make' that does not support the `VPATH' +variable, you have to compile the package for one architecture at a +time in the source code directory. After you have installed the +package for one architecture, use `make distclean' before reconfiguring +for another architecture. Installation Names ================== @@ -122,22 +136,35 @@ you can use the `configure' options `--x-includes=DIR' and Specifying the System Type ========================== - There may be some features `configure' can not figure out + There may be some features `configure' cannot figure out automatically, but needs to determine by the type of host the package will run on. Usually `configure' can figure that out, but if it prints -a message saying it can not guess the host type, give it the -`--host=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name with three fields: +a message saying it cannot guess the host type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + CPU-COMPANY-SYSTEM -See the file `config.sub' for the possible values of each field. If +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't need to know the host type. - If you are building compiler tools for cross-compiling, you can also + If you are _building_ compiler tools for cross-compiling, you should use the `--target=TYPE' option to select the type of system they will -produce code for and the `--build=TYPE' option to select the type of -system on which you are compiling the package. +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the host +platform (i.e., that on which the generated programs will eventually be +run) with `--host=TYPE'. In this case, you should also specify the +build platform with `--build=TYPE', because, in this case, it may not +be possible to guess the build platform (it sometimes involves +compiling and running simple test programs, and this can't be done if +the compiler is a cross compiler). Sharing Defaults ================ @@ -150,20 +177,44 @@ default values for variables like `CC', `cache_file', and `prefix'. `CONFIG_SITE' environment variable to the location of the site script. A warning: not all `configure' scripts look for a site script. -Operation Controls +Defining Variables ================== + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +will cause the specified gcc to be used as the C compiler (unless it is +overridden in the site shell script). + +`configure' Invocation +====================== + `configure' recognizes the following options to control how it operates. -`--cache-file=FILE' - Use and save the results of the tests in FILE instead of - `./config.cache'. Set FILE to `/dev/null' to disable caching, for - debugging `configure'. - `--help' +`-h' Print a summary of the options to `configure', and exit. +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + `--quiet' `--silent' `-q' @@ -175,8 +226,6 @@ operates. Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. -`--version' - Print the version of Autoconf used to generate the `configure' - script, and exit. +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. -`configure' also accepts some other, not widely useful, options. diff --git a/beecrypt/Makefile.in b/beecrypt/Makefile.in index 82eee5cf9..9fd8e3efc 100644 --- a/beecrypt/Makefile.in +++ b/beecrypt/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -42,7 +43,6 @@ # # 3. Interfaces removed (bad): Increment CURRENT, set AGE and REVISION to 0. # - SHELL = @SHELL@ srcdir = @srcdir@ @@ -73,9 +73,12 @@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -91,6 +94,10 @@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ AS = @AS@ AWK = @AWK@ @@ -99,14 +106,12 @@ CPP = @CPP@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ -EXEEXT = @EXEEXT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LN_S = @LN_S@ OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ STRIP = @STRIP@ @@ -181,6 +186,7 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = +am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ @@ -197,12 +203,12 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ uninstall-info-recursive all-recursive install-data-recursive \ install-exec-recursive installdirs-recursive install-recursive \ uninstall-recursive check-recursive installcheck-recursive -DIST_COMMON = README $(noinst_HEADERS) $(pkginclude_HEADERS) \ - ./stamp-h.in AUTHORS COPYING COPYING.LIB ChangeLog Doxyfile.in \ - INSTALL Makefile.am Makefile.in NEWS acconfig.h aclocal.m4 \ - beecrypt.spec.in config.guess config.h.in config.sub configure \ - configure.in depcomp install-sh ltconfig ltmain.sh missing \ - mkinstalldirs types.h.in +DIST_COMMON = README $(noinst_HEADERS) $(pkginclude_HEADERS) AUTHORS \ + COPYING COPYING.LIB ChangeLog Doxyfile.in INSTALL Makefile.am \ + Makefile.in NEWS acconfig.h aclocal.m4 beecrypt.spec.in \ + config.guess config.h.in config.sub configure configure.in \ + depcomp install-sh ltconfig ltmain.sh missing mkinstalldirs \ + types.h.in DIST_SUBDIRS = $(SUBDIRS) SOURCES = $(libbeecrypt_la_SOURCES) @@ -211,22 +217,11 @@ all: config.h .SUFFIXES: .SUFFIXES: .S .c .lo .o .obj - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$@ $(SHELL) ./config.status + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -235,50 +230,45 @@ $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENC $(ACLOCAL_M4): configure.in cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -config.h: stamp-h - @if test ! -f $@; then \ - rm -f stamp-h; \ - $(MAKE) stamp-h; \ - else :; fi -stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h stamp-hT - @echo timestamp > stamp-hT 2> /dev/null - cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=config.h \ - $(SHELL) ./config.status - @mv stamp-hT stamp-h -$(srcdir)/config.h.in: $(srcdir)/./stamp-h.in + +config.h: stamp-h1 @if test ! -f $@; then \ - rm -f $(srcdir)/./stamp-h.in; \ - $(MAKE) $(srcdir)/./stamp-h.in; \ + rm -f stamp-h1; \ + $(MAKE) stamp-h1; \ else :; fi -$(srcdir)/./stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h - @rm -f $(srcdir)/./stamp-h.in $(srcdir)/./stamp-h.inT - @echo timestamp > $(srcdir)/./stamp-h.inT 2> /dev/null + +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h + +$(srcdir)/config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h cd $(top_srcdir) && $(AUTOHEADER) - @mv $(srcdir)/./stamp-h.inT $(srcdir)/./stamp-h.in + touch $(srcdir)/config.h.in distclean-hdr: -rm -f config.h Doxyfile: $(top_builddir)/config.status Doxyfile.in - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status + cd $(top_builddir) && $(SHELL) ./config.status $@ beecrypt.spec: $(top_builddir)/config.status beecrypt.spec.in - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status + cd $(top_builddir) && $(SHELL) ./config.status $@ types.h: $(top_builddir)/config.status types.h.in - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status + cd $(top_builddir) && $(SHELL) ./config.status $@ +libLTLIBRARIES_INSTALL = $(INSTALL) install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libdir) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \ - $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ + $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ else :; fi; \ done uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p="`echo $$p | sed -e 's|^.*/||'`"; \ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done @@ -295,22 +285,32 @@ distclean-compile: -rm -f *.tab.c .c.o: - $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< + $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: $(COMPILE) -c `cygpath -w $<` .c.lo: - $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool uninstall-info-am: +pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) install-pkgincludeHEADERS: $(pkginclude_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) @list='$(pkginclude_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f"; \ - $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f; \ + echo " $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f"; \ + $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f; \ done uninstall-pkgincludeHEADERS: @@ -328,7 +328,7 @@ uninstall-pkgincludeHEADERS: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @set fnord $(MAKEFLAGS); amf=$$2; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -348,7 +348,7 @@ $(RECURSIVE_TARGETS): mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ @@ -376,16 +376,19 @@ tags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done +ETAGS = etags +ETAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - mkid -fID $$unique $(LISP) + mkid -fID $$unique TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -396,30 +399,35 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ - || etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique GTAGS: - here=`CDPATH=: && cd $(top_builddir) && pwd` \ + here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = . -# Avoid unsightly `./'. distdir = $(PACKAGE)-$(VERSION) +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } + GZIP_ENV = --best +distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" >/dev/null; \ @@ -427,25 +435,30 @@ distdir: $(DISTFILES) echo "NEWS not updated; not releasing" 1>&2; \ exit 1; \ fi - -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) + $(am__remove_distdir) mkdir $(distdir) $(mkinstalldirs) $(distdir)/. @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ || exit 1; \ fi; \ done - for subdir in $(SUBDIRS); do \ + list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ @@ -463,23 +476,28 @@ distdir: $(DISTFILES) ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) -dist: distdir +dist-gzip: distdir + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +dist dist-all: distdir $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) + $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) + $(am__remove_distdir) GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - chmod -R a-w $(distdir); chmod a+w $(distdir) mkdir $(distdir)/=build mkdir $(distdir)/=inst chmod a-w $(distdir) - dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \ + dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ && cd $(distdir)/=build \ && ../configure --srcdir=.. --prefix=$$dc_install_base \ + $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -487,17 +505,24 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ - || (echo "Error: files left after uninstall" 1>&2; \ - exit 1) ) \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && $(MAKE) $(AM_MAKEFLAGS) distclean \ + || { echo "ERROR: files left after uninstall:" ; \ + find $$dc_install_base -type f -print ; \ + exit 1; } >&2 ) \ + && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ && rm -f $(distdir).tar.gz \ - && (test `find . -type f -print | wc -l` -eq 0 \ - || (echo "Error: files left after distclean" 1>&2; \ - exit 1) ) - -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + $(am__remove_distdir) @echo "$(distdir).tar.gz is ready for distribution" | \ sed 'h;s/./=/g;p;x;p;x' +distcleancheck: distclean + if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 check-am: all-am check: check-recursive all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h @@ -516,6 +541,7 @@ install-am: all-am installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -533,9 +559,6 @@ clean: clean-recursive clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ mostlyclean-am -dist-all: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) distclean: distclean-recursive -rm -f config.status config.cache config.log distclean-am: clean-am distclean-compile distclean-generic distclean-hdr \ @@ -575,17 +598,17 @@ uninstall-info: uninstall-info-recursive .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ clean-generic clean-libLTLIBRARIES clean-libtool \ - clean-recursive dist dist-all distcheck distclean \ + clean-recursive dist dist-all dist-gzip distcheck distclean \ distclean-compile distclean-generic distclean-hdr \ - distclean-libtool distclean-recursive distclean-tags distdir \ - dvi dvi-am dvi-recursive info info-am info-recursive install \ - install-am install-data install-data-am install-data-recursive \ - install-exec install-exec-am install-exec-recursive \ - install-info install-info-am install-info-recursive \ - install-libLTLIBRARIES install-man install-pkgincludeHEADERS \ - install-recursive install-strip installcheck installcheck-am \ - installdirs installdirs-am installdirs-recursive \ - maintainer-clean maintainer-clean-generic \ + distclean-libtool distclean-recursive distclean-tags \ + distcleancheck distdir dvi dvi-am dvi-recursive info info-am \ + info-recursive install install-am install-data install-data-am \ + install-data-recursive install-exec install-exec-am \ + install-exec-recursive install-info install-info-am \ + install-info-recursive install-libLTLIBRARIES install-man \ + install-pkgincludeHEADERS install-recursive install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + installdirs-recursive maintainer-clean maintainer-clean-generic \ maintainer-clean-recursive mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ tags tags-recursive uninstall uninstall-am uninstall-info-am \ diff --git a/beecrypt/aclocal.m4 b/beecrypt/aclocal.m4 index b0538f569..696a2b042 100644 --- a/beecrypt/aclocal.m4 +++ b/beecrypt/aclocal.m4 @@ -1,6 +1,6 @@ -# aclocal.m4 generated automatically by aclocal 1.5 +# aclocal.m4 generated automatically by aclocal 1.6.1 -*- Autoconf -*- -# Copyright 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11,11 +11,30 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Do all the work for Automake. This macro actually does too much -- -# some checks are only needed if your package does certain things. -# But this isn't really a big deal. +# Do all the work for Automake. -*- Autoconf -*- -# serial 5 +# This macro actually does too much some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 8 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -24,62 +43,52 @@ # CC etc. in the Makefile, will ask for an AC_PROG_CC use... -# We require 2.13 because we rely on SHELL being computed by configure. -AC_PREREQ([2.13]) +AC_PREREQ([2.52]) -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -# ----------------------------------------------------------- -# If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED. -# The purpose of this macro is to provide the user with a means to -# check macros which are provided without letting her know how the -# information is coded. -# If this macro is not defined by Autoconf, define it here. -ifdef([AC_PROVIDE_IFELSE], - [], - [define([AC_PROVIDE_IFELSE], - [ifdef([AC_PROVIDE_$1], - [$2], [$3])])]) - - -# AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE]) -# ---------------------------------------------- +# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow +# the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AC_PROG_INSTALL])dnl +[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl # test to see if srcdir already configured -if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && +if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first]) + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) fi # Define the identity of the package. -PACKAGE=$1 -AC_SUBST(PACKAGE)dnl -VERSION=$2 -AC_SUBST(VERSION)dnl -ifelse([$3],, +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl + AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl + AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl + +_AM_IF_OPTION([no-define],, [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])]) - -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -# the ones we care about. -ifdef([m4_pattern_allow], - [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl - -# Autoconf 2.50 always computes EXEEXT. However we need to be -# compatible with 2.13, for now. So we always define EXEEXT, but we -# don't compute it. -AC_SUBST(EXEEXT) -# Similar for OBJEXT -- only we only use OBJEXT if the user actually -# requests that it be used. This is a bit dumb. -: ${OBJEXT=o} -AC_SUBST(OBJEXT) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal) +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) AM_MISSING_PROG(AMTAR, tar) @@ -89,9 +98,9 @@ AM_PROG_INSTALL_STRIP # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl -AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_PROVIDE_IFELSE([AC_PROG_][CC], + +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_][CC], [_AM_DEPENDENCIES(CC)], [define([AC_PROG_][CC], defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl @@ -100,11 +109,102 @@ AC_PROVIDE_IFELSE([AC_PROG_][CXX], [define([AC_PROG_][CXX], defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl ]) +]) + +# Copyright 2002 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"]) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION so it can be traced. +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], + [AM_AUTOMAKE_VERSION([1.6.1])]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright 2001, 2002 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 2 + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) # # Check to make sure that the build environment is sane. # +# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + # serial 3 # AM_SANITY_CHECK @@ -148,8 +248,27 @@ Check your system clock]) fi AC_MSG_RESULT(yes)]) +# -*- Autoconf -*- -# serial 2 + +# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 3 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -171,13 +290,29 @@ if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= - am_backtick='`' - AC_MSG_WARN([${am_backtick}missing' script is too old or missing]) + AC_MSG_WARN([`missing' script is too old or missing]) fi ]) # AM_AUX_DIR_EXPAND +# Copyright 2001 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -216,19 +351,59 @@ fi # absolute PATH. The drawback is that using absolute paths prevent a # configured tree to be moved without reconfiguration. +# Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50]) + AC_DEFUN([AM_AUX_DIR_EXPAND], [ # expand $ac_aux_dir to an absolute path -am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` +am_aux_dir=`cd $ac_aux_dir && pwd` ]) # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. + +# Copyright 2001 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl install_sh=${install_sh-"$am_aux_dir/install-sh"} AC_SUBST(install_sh)]) +# AM_PROG_INSTALL_STRIP + +# Copyright 2001 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + # One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip @@ -238,11 +413,35 @@ AC_SUBST(install_sh)]) # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) # serial 4 -*- Autoconf -*- +# Copyright 1999, 2000, 2001 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be @@ -254,9 +453,9 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) # _AM_DEPENDENCIES(NAME) -# --------------------- +# ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX" or "OBJC". +# NAME is "CC", "CXX", "GCJ", or "OBJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -333,8 +532,7 @@ else am_cv_$1_dependencies_compiler_type=none fi ]) -$1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type" -AC_SUBST([$1DEPMODE]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) ]) @@ -352,7 +550,7 @@ else DEPDIR=_deps fi rmdir .deps 2>/dev/null -AC_SUBST(DEPDIR) +AC_SUBST([DEPDIR]) ]) @@ -367,30 +565,42 @@ if test "x$enable_dependency_tracking" != xno; then AMDEPBACKSLASH='\' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -pushdef([subst], defn([AC_SUBST])) -subst(AMDEPBACKSLASH) -popdef([subst]) +AC_SUBST([AMDEPBACKSLASH]) ]) -# Generate code to set up dependency tracking. -# This macro should only be invoked once -- use via AC_REQUIRE. -# Usage: -# AM_OUTPUT_DEPENDENCY_COMMANDS +# Generate code to set up dependency tracking. -*- Autoconf -*- -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[ -AC_OUTPUT_COMMANDS([ -test x"$AMDEP_TRUE" != x"" || -for mf in $CONFIG_FILES; do - case "$mf" in - Makefile) dirpart=.;; - */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; - *) continue;; - esac - grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue +# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +#serial 2 + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + if (sed 1q $mf | fgrep 'generated by automake') > /dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue # Extract the definition of DEP_FILES from the Makefile without # running `make'. DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` @@ -414,14 +624,46 @@ for mf in $CONFIG_FILES; do sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue - fdir=`echo "$file" | sed -e 's|/[^/]*$||'` - $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1 + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done done -], [AMDEP_TRUE="$AMDEP_TRUE" -ac_aux_dir="$ac_aux_dir"])]) +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) + +# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*- + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 2 # AM_MAKE_INCLUDE() # ----------------- @@ -434,7 +676,7 @@ doit: END # If we don't find an include directive, just comment out the code. AC_MSG_CHECKING([for style of include used by $am_make]) -am__include='#' +am__include="#" am__quote= _am_result=none # First try GNU make style include. @@ -454,7 +696,7 @@ if test "$am__include" = "#"; then echo '.include "confinc"' > confmf if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then am__include=.include - am__quote='"' + am__quote="\"" _am_result=BSD fi fi @@ -464,23 +706,35 @@ AC_MSG_RESULT($_am_result) rm -f confinc confmf ]) -# serial 3 +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright 1997, 2000, 2001 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 5 + +AC_PREREQ(2.52) # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. -# -# FIXME: Once using 2.50, use this: -# m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl AC_DEFUN([AM_CONDITIONAL], -[ifelse([$1], [TRUE], - [errprint(__file__:__line__: [$0: invalid condition: $1 -])dnl -m4exit(1)])dnl -ifelse([$1], [FALSE], - [errprint(__file__:__line__: [$0: invalid condition: $1 -])dnl -m4exit(1)])dnl +[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE]) AC_SUBST([$1_FALSE]) if $2; then @@ -489,74 +743,90 @@ if $2; then else $1_TRUE='#' $1_FALSE= -fi]) +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([conditional \"$1\" was never defined. +Usually this means the macro was only invoked conditionally.]) +fi])]) -# Like AC_CONFIG_HEADER, but automatically create stamp file. +# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- -# serial 3 +# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +AC_PREREQ([2.52]) + +# serial 6 # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. We must strip everything past the first ":", # and everything past the last "/". -AC_PREREQ([2.12]) - -AC_DEFUN([AM_CONFIG_HEADER], -[ifdef([AC_FOREACH],dnl - [dnl init our file count if it isn't already - m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0])) - dnl prepare to store our destination file list for use in config.status - AC_FOREACH([_AM_File], [$1], - [m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*])) - m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index)) - dnl and add it to the list of files AC keeps track of, along - dnl with our hook - AC_CONFIG_HEADERS(_AM_File, -dnl COMMANDS, [, INIT-CMDS] -[# update the timestamp -echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h]_AM_Config_Header_Index[" -][$2]m4_ifval([$3], [, [$3]]))dnl AC_CONFIG_HEADERS - m4_popdef([_AM_Dest])])],dnl -[AC_CONFIG_HEADER([$1]) - AC_OUTPUT_COMMANDS( - ifelse(patsubst([$1], [[^ ]], []), - [], - [test -z "$CONFIG_HEADERS" || echo timestamp >dnl - patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),dnl -[am_indx=1 -for am_file in $1; do - case " \$CONFIG_HEADERS " in - *" \$am_file "*) - am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\` - if test -n "\$am_dir"; then - am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\` - for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do - am_tmpdir=\$am_tmpdir\$am_subdir/ - if test ! -d \$am_tmpdir; then - mkdir \$am_tmpdir - fi - done - fi - echo timestamp > "\$am_dir"stamp-h\$am_indx - ;; - esac - am_indx=\`expr \$am_indx + 1\` -done]) -])]) # AM_CONFIG_HEADER - # _AM_DIRNAME(PATH) # ----------------- # Like AS_DIRNAME, only do it during macro expansion AC_DEFUN([_AM_DIRNAME], - [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1, - m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1, - m4_if(m4_regexp([$1], [^/.*]), -1, + [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1, + m4_if(regexp([$1], [^//\([^/]\|$\)]), -1, + m4_if(regexp([$1], [^/.*]), -1, [.], - m4_patsubst([$1], [^\(/\).*], [\1])), - m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])), - m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl -]) # _AM_DIRNAME + patsubst([$1], [^\(/\).*], [\1])), + patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])), + patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl +])# _AM_DIRNAME + + +# The stamp files are numbered to have different names. +# We could number them on a directory basis, but that's additional +# complications, let's have a unique counter. +m4_define([_AM_STAMP_Count], [0]) + + +# _AM_STAMP(HEADER) +# ----------------- +# The name of the stamp file for HEADER. +AC_DEFUN([_AM_STAMP], +[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl +AS_ESCAPE(_AM_DIRNAME(patsubst([$1], + [:.*])))/stamp-h[]_AM_STAMP_Count]) + + +# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS) +# ------------------------------------------------------------ +# We used to try to get a real timestamp in stamp-h. But the fear is that +# that will cause unnecessary cvs conflicts. +AC_DEFUN([_AM_CONFIG_HEADER], +[# Add the stamp file to the list of files AC keeps track of, +# along with our hook. +AC_CONFIG_HEADERS([$1], + [# update the timestamp +echo 'timestamp for $1' >"_AM_STAMP([$1])" +$2], + [$3]) +])# _AM_CONFIG_HEADER + + +# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS) +# -------------------------------------------------------------- +AC_DEFUN([AM_CONFIG_HEADER], +[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])]) +])# AM_CONFIG_HEADER # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*- diff --git a/beecrypt/autogen.sh b/beecrypt/autogen.sh index c552b4b15..b179240fb 100755 --- a/beecrypt/autogen.sh +++ b/beecrypt/autogen.sh @@ -4,13 +4,13 @@ export CFLAGS export LDFLAGS LTV="libtoolize (GNU libtool) 1.4.2" -ACV="autoconf (GNU Autoconf) 2.52" -AMV="automake (GNU automake) 1.5" +ACV="autoconf (GNU Autoconf) 2.53" +AMV="automake (GNU automake) 1.6.1" USAGE=" This script documents the versions of the tools I'm using to build rpm: libtool-1.4.2 - autoconf-2.52 - automake-1.5 + autoconf-2.53 + automake-1.6.1 Simply edit this script to change the libtool/autoconf/automake versions checked if you need to, as rpm should build (and has built) with all recent versions of libtool/autoconf/automake. @@ -23,7 +23,7 @@ recent versions of libtool/autoconf/automake. libtoolize --copy --force aclocal autoheader -automake +automake -a -c autoconf if [ "$1" = "--noconfigure" ]; then diff --git a/beecrypt/config.h b/beecrypt/config.h index 08f796d42..e7d3b2631 100644 --- a/beecrypt/config.h +++ b/beecrypt/config.h @@ -1,5 +1,5 @@ -/* config.h. Generated automatically by configure. */ -/* config.h.in. Generated automatically from configure.in by autoheader. */ +/* config.h. Generated by configure. */ +/* config.h.in. Generated from configure.in by autoheader. */ /* * acconfig.h * @@ -116,96 +116,111 @@ /* #undef inline */ #endif -/* Define if you have the <aio.h> header file. */ +/* Define to 1 if you have the <aio.h> header file. */ #define HAVE_AIO_H 1 -/* Define if you have the <ctype.h> header file. */ +/* Define to 1 if you have the <ctype.h> header file. */ #define HAVE_CTYPE_H 1 -/* Define if you have the <dlfcn.h> header file. */ +/* Define to 1 if you have the <dlfcn.h> header file. */ #define HAVE_DLFCN_H 1 -/* Define if you have the <errno.h> header file. */ +/* Define to 1 if you have the <errno.h> header file. */ #define HAVE_ERRNO_H 1 -/* Define if you have the <fcntl.h> header file. */ +/* Define to 1 if you have the <fcntl.h> header file. */ #define HAVE_FCNTL_H 1 -/* Define if you have the <inttypes.h> header file. */ +/* Define to 1 if you have the <inttypes.h> header file. */ #define HAVE_INTTYPES_H 1 -/* Define if you have the `mtmalloc' library (-lmtmalloc). */ +/* Define to 1 if you have the `mtmalloc' library (-lmtmalloc). */ /* #undef HAVE_LIBMTMALLOC */ -/* Define if you have the `pthread' library (-lpthread). */ +/* Define to 1 if you have the `pthread' library (-lpthread). */ #define HAVE_LIBPTHREAD 1 -/* Define if you have the `thread' library (-lthread). */ +/* Define to 1 if you have the `thread' library (-lthread). */ /* #undef HAVE_LIBTHREAD */ -/* Define if you have the <memory.h> header file. */ +/* Define to 1 if you have the <memory.h> header file. */ #define HAVE_MEMORY_H 1 -/* Define if you have the <mtmalloc.h> header file. */ +/* Define to 1 if you have the <mtmalloc.h> header file. */ /* #undef HAVE_MTMALLOC_H */ -/* Define if you have the <pthread.h> header file. */ +/* Define to 1 if you have the <pthread.h> header file. */ #define HAVE_PTHREAD_H 1 -/* Define if you have the <semaphore.h> header file. */ +/* Define to 1 if you have the <semaphore.h> header file. */ #define HAVE_SEMAPHORE_H 1 -/* Define if you have the <stdint.h> header file. */ +/* Define to 1 if you have the <stdint.h> header file. */ #define HAVE_STDINT_H 1 -/* Define if you have the <stdlib.h> header file. */ +/* Define to 1 if you have the <stdlib.h> header file. */ #define HAVE_STDLIB_H 1 -/* Define if you have the <strings.h> header file. */ +/* Define to 1 if you have the <strings.h> header file. */ #define HAVE_STRINGS_H 1 -/* Define if you have the <string.h> header file. */ +/* Define to 1 if you have the <string.h> header file. */ #define HAVE_STRING_H 1 -/* Define if you have the <synch.h> header file. */ +/* Define to 1 if you have the <synch.h> header file. */ /* #undef HAVE_SYNCH_H */ -/* Define if you have the <sys/audioio.h> header file. */ +/* Define to 1 if you have the <sys/audioio.h> header file. */ /* #undef HAVE_SYS_AUDIOIO_H */ -/* Define if you have the <sys/ioctl.h> header file. */ +/* Define to 1 if you have the <sys/ioctl.h> header file. */ #define HAVE_SYS_IOCTL_H 1 -/* Define if you have the <sys/soundcard.h> header file. */ +/* Define to 1 if you have the <sys/soundcard.h> header file. */ #define HAVE_SYS_SOUNDCARD_H 1 -/* Define if you have the <sys/stat.h> header file. */ +/* Define to 1 if you have the <sys/stat.h> header file. */ #define HAVE_SYS_STAT_H 1 -/* Define if you have the <sys/time.h> header file. */ +/* Define to 1 if you have the <sys/time.h> header file. */ #define HAVE_SYS_TIME_H 1 -/* Define if you have the <sys/types.h> header file. */ +/* Define to 1 if you have the <sys/types.h> header file. */ #define HAVE_SYS_TYPES_H 1 -/* Define if you have the <termios.h> header file. */ +/* Define to 1 if you have the <termios.h> header file. */ #define HAVE_TERMIOS_H 1 -/* Define if you have the <termio.h> header file. */ +/* Define to 1 if you have the <termio.h> header file. */ #define HAVE_TERMIO_H 1 -/* Define if you have the <thread.h> header file. */ +/* Define to 1 if you have the <thread.h> header file. */ /* #undef HAVE_THREAD_H */ -/* Define if you have the <time.h> header file. */ +/* Define to 1 if you have the <time.h> header file. */ #define HAVE_TIME_H 1 -/* Define if you have the <unistd.h> header file. */ +/* Define to 1 if you have the <unistd.h> header file. */ #define HAVE_UNISTD_H 1 /* Name of package */ #define PACKAGE "beecrypt" +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" + /* The size of a `char', as computed by sizeof. */ #define SIZEOF_CHAR 1 @@ -242,14 +257,14 @@ /* The size of a `unsigned short', as computed by sizeof. */ #define SIZEOF_UNSIGNED_SHORT 2 -/* Define if you have the ANSI C header files. */ +/* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ #define VERSION "2.2.0" -/* Define if your processor stores words with the most significant byte first - (like Motorola and SPARC, unlike Intel and VAX). */ +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ /* #undef WORDS_BIGENDIAN */ /* Define to empty if `const' does not conform to ANSI C. */ diff --git a/beecrypt/config.h.in b/beecrypt/config.h.in index 8bd2412fd..82c97fc9c 100644 --- a/beecrypt/config.h.in +++ b/beecrypt/config.h.in @@ -1,4 +1,4 @@ -/* config.h.in. Generated automatically from configure.in by autoheader. */ +/* config.h.in. Generated from configure.in by autoheader. */ /* * acconfig.h * @@ -115,96 +115,111 @@ #undef inline #endif -/* Define if you have the <aio.h> header file. */ +/* Define to 1 if you have the <aio.h> header file. */ #undef HAVE_AIO_H -/* Define if you have the <ctype.h> header file. */ +/* Define to 1 if you have the <ctype.h> header file. */ #undef HAVE_CTYPE_H -/* Define if you have the <dlfcn.h> header file. */ +/* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H -/* Define if you have the <errno.h> header file. */ +/* Define to 1 if you have the <errno.h> header file. */ #undef HAVE_ERRNO_H -/* Define if you have the <fcntl.h> header file. */ +/* Define to 1 if you have the <fcntl.h> header file. */ #undef HAVE_FCNTL_H -/* Define if you have the <inttypes.h> header file. */ +/* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H -/* Define if you have the `mtmalloc' library (-lmtmalloc). */ +/* Define to 1 if you have the `mtmalloc' library (-lmtmalloc). */ #undef HAVE_LIBMTMALLOC -/* Define if you have the `pthread' library (-lpthread). */ +/* Define to 1 if you have the `pthread' library (-lpthread). */ #undef HAVE_LIBPTHREAD -/* Define if you have the `thread' library (-lthread). */ +/* Define to 1 if you have the `thread' library (-lthread). */ #undef HAVE_LIBTHREAD -/* Define if you have the <memory.h> header file. */ +/* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H -/* Define if you have the <mtmalloc.h> header file. */ +/* Define to 1 if you have the <mtmalloc.h> header file. */ #undef HAVE_MTMALLOC_H -/* Define if you have the <pthread.h> header file. */ +/* Define to 1 if you have the <pthread.h> header file. */ #undef HAVE_PTHREAD_H -/* Define if you have the <semaphore.h> header file. */ +/* Define to 1 if you have the <semaphore.h> header file. */ #undef HAVE_SEMAPHORE_H -/* Define if you have the <stdint.h> header file. */ +/* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H -/* Define if you have the <stdlib.h> header file. */ +/* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define if you have the <strings.h> header file. */ +/* Define to 1 if you have the <strings.h> header file. */ #undef HAVE_STRINGS_H -/* Define if you have the <string.h> header file. */ +/* Define to 1 if you have the <string.h> header file. */ #undef HAVE_STRING_H -/* Define if you have the <synch.h> header file. */ +/* Define to 1 if you have the <synch.h> header file. */ #undef HAVE_SYNCH_H -/* Define if you have the <sys/audioio.h> header file. */ +/* Define to 1 if you have the <sys/audioio.h> header file. */ #undef HAVE_SYS_AUDIOIO_H -/* Define if you have the <sys/ioctl.h> header file. */ +/* Define to 1 if you have the <sys/ioctl.h> header file. */ #undef HAVE_SYS_IOCTL_H -/* Define if you have the <sys/soundcard.h> header file. */ +/* Define to 1 if you have the <sys/soundcard.h> header file. */ #undef HAVE_SYS_SOUNDCARD_H -/* Define if you have the <sys/stat.h> header file. */ +/* Define to 1 if you have the <sys/stat.h> header file. */ #undef HAVE_SYS_STAT_H -/* Define if you have the <sys/time.h> header file. */ +/* Define to 1 if you have the <sys/time.h> header file. */ #undef HAVE_SYS_TIME_H -/* Define if you have the <sys/types.h> header file. */ +/* Define to 1 if you have the <sys/types.h> header file. */ #undef HAVE_SYS_TYPES_H -/* Define if you have the <termios.h> header file. */ +/* Define to 1 if you have the <termios.h> header file. */ #undef HAVE_TERMIOS_H -/* Define if you have the <termio.h> header file. */ +/* Define to 1 if you have the <termio.h> header file. */ #undef HAVE_TERMIO_H -/* Define if you have the <thread.h> header file. */ +/* Define to 1 if you have the <thread.h> header file. */ #undef HAVE_THREAD_H -/* Define if you have the <time.h> header file. */ +/* Define to 1 if you have the <time.h> header file. */ #undef HAVE_TIME_H -/* Define if you have the <unistd.h> header file. */ +/* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H /* Name of package */ #undef PACKAGE +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + /* The size of a `char', as computed by sizeof. */ #undef SIZEOF_CHAR @@ -241,14 +256,14 @@ /* The size of a `unsigned short', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_SHORT -/* Define if you have the ANSI C header files. */ +/* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS /* Version number of package */ #undef VERSION -/* Define if your processor stores words with the most significant byte first - (like Motorola and SPARC, unlike Intel and VAX). */ +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ #undef WORDS_BIGENDIAN /* Define to empty if `const' does not conform to ANSI C. */ diff --git a/beecrypt/configure.in b/beecrypt/configure.in index 36b1e986a..8a74c2e63 100644 --- a/beecrypt/configure.in +++ b/beecrypt/configure.in @@ -3,6 +3,7 @@ dnl Process this file with autoconf to produce a configure script dnl Initialization AC_INIT(beecrypt.c) AC_CANONICAL_SYSTEM +AC_CONFIG_HEADERS AM_INIT_AUTOMAKE(beecrypt, 2.2.0) AM_CONFIG_HEADER(config.h) diff --git a/beecrypt/docs/Makefile.in b/beecrypt/docs/Makefile.in index 0597f5c03..f287a9bdc 100644 --- a/beecrypt/docs/Makefile.in +++ b/beecrypt/docs/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -34,7 +35,6 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # - SHELL = @SHELL@ srcdir = @srcdir@ @@ -65,9 +65,12 @@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -83,6 +86,10 @@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ AS = @AS@ AWK = @AWK@ @@ -91,14 +98,12 @@ CPP = @CPP@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ -EXEEXT = @EXEEXT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LN_S = @LN_S@ OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ STRIP = @STRIP@ @@ -128,11 +133,17 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = depcomp = +am__depfiles_maybe = DIST_SOURCES = DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu docs/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) mostlyclean-libtool: -rm -f *.lo @@ -142,18 +153,10 @@ clean-libtool: distclean-libtool: -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu docs/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status uninstall-info-am: tags: TAGS TAGS: - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. @@ -161,14 +164,19 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -192,6 +200,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: diff --git a/beecrypt/gas/Makefile.in b/beecrypt/gas/Makefile.in index 311198cdf..2f827f331 100644 --- a/beecrypt/gas/Makefile.in +++ b/beecrypt/gas/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -34,7 +35,6 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # - SHELL = @SHELL@ srcdir = @srcdir@ @@ -65,9 +65,12 @@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -83,6 +86,10 @@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ AS = @AS@ AWK = @AWK@ @@ -91,14 +98,12 @@ CPP = @CPP@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ -EXEEXT = @EXEEXT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LN_S = @LN_S@ OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ STRIP = @STRIP@ @@ -128,11 +133,17 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = depcomp = +am__depfiles_maybe = DIST_SOURCES = DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gas/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) mostlyclean-libtool: -rm -f *.lo @@ -142,18 +153,10 @@ clean-libtool: distclean-libtool: -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu gas/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status uninstall-info-am: tags: TAGS TAGS: - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. @@ -161,14 +164,19 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -192,6 +200,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: diff --git a/beecrypt/install-sh b/beecrypt/install-sh index e9de23842..398a88e14 100755 --- a/beecrypt/install-sh +++ b/beecrypt/install-sh @@ -109,7 +109,7 @@ then echo "install: no input file specified" exit 1 else - true + : fi if [ x"$dir_arg" != x ]; then @@ -120,7 +120,7 @@ if [ x"$dir_arg" != x ]; then instcmd=: chmodcmd="" else - instcmd=mkdir + instcmd=$mkdirprog fi else @@ -130,7 +130,7 @@ else if [ -f $src -o -d $src ] then - true + : else echo "install: $src does not exist" exit 1 @@ -141,7 +141,7 @@ else echo "install: no destination specified" exit 1 else - true + : fi # If destination is a directory, append the input filename; if your system @@ -151,7 +151,7 @@ else then dst="$dst"/`basename $src` else - true + : fi fi @@ -163,8 +163,8 @@ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` # Skip lots of stat calls in the usual case. if [ ! -d "$dstdir" ]; then -defaultIFS=' -' +defaultIFS=' + ' IFS="${IFS-${defaultIFS}}" oIFS="${IFS}" @@ -183,7 +183,7 @@ while [ $# -ne 0 ] ; do then $mkdirprog "${pathcomp}" else - true + : fi pathcomp="${pathcomp}/" @@ -194,10 +194,10 @@ if [ x"$dir_arg" != x ] then $doit $instcmd $dst && - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi && + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi && + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi && + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi else # If we're going to rename the final executable, determine the name now. @@ -216,7 +216,7 @@ else then dstfile=`basename $dst` else - true + : fi # Make a temp file name in the proper directory. @@ -235,10 +235,10 @@ else # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $instcmd $src $dsttmp" command. - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi && + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi && + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi && + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi && # Now rename the file to the real destination. diff --git a/beecrypt/masm/Makefile.in b/beecrypt/masm/Makefile.in index 5c485006b..273e92c87 100644 --- a/beecrypt/masm/Makefile.in +++ b/beecrypt/masm/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -34,7 +35,6 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # - SHELL = @SHELL@ srcdir = @srcdir@ @@ -65,9 +65,12 @@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -83,6 +86,10 @@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ AS = @AS@ AWK = @AWK@ @@ -91,14 +98,12 @@ CPP = @CPP@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ -EXEEXT = @EXEEXT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LN_S = @LN_S@ OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ STRIP = @STRIP@ @@ -128,11 +133,17 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = depcomp = +am__depfiles_maybe = DIST_SOURCES = DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu masm/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) mostlyclean-libtool: -rm -f *.lo @@ -142,18 +153,10 @@ clean-libtool: distclean-libtool: -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu masm/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status uninstall-info-am: tags: TAGS TAGS: - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. @@ -161,14 +164,19 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -192,6 +200,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: diff --git a/beecrypt/missing b/beecrypt/missing index 7789652e8..dd583709f 100755 --- a/beecrypt/missing +++ b/beecrypt/missing @@ -1,7 +1,7 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997 Free Software Foundation, Inc. -# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996. +# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc. +# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,11 +18,37 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. +# 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. + if test $# -eq 0; then echo 1>&2 "Try \`$0 --help' for more information" exit 1 fi +run=: + +# 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 +--run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 + ;; +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) @@ -35,6 +61,7 @@ error status if there is no known handling for PROGRAM. 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' @@ -43,13 +70,15 @@ Supported PROGRAM values: 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 + tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch]" ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing - GNU libit 0.0" + echo "missing 0.4 - GNU automake" ;; -*) @@ -58,31 +87,46 @@ Supported PROGRAM values: exit 1 ;; - aclocal) + aclocal*) + 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 - you modified \`acinclude.m4' or \`configure.in'. You might want + 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) + 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 - you modified \`configure.in'. You might want to install the + 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) + 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 - you modified \`acconfig.h' or \`configure.in'. You might want + 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.in` + 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 @@ -95,10 +139,15 @@ WARNING: \`$1' is missing on your system. You should only need it if touch $touch_files ;; - automake) + 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 - you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'. + 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 | @@ -106,6 +155,34 @@ WARNING: \`$1' is missing on your system. You should only need it if while read f; do touch "$f"; done ;; + 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 + proper tools for further handling them. + You can get \`$1Help2man' 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'` + 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' is missing on your system. You should only need it if @@ -159,7 +236,37 @@ WARNING: \`$1' is missing on your system. You should only need it if 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 + 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 + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" + exit 1 + fi + ;; + 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 you modified a \`.texi' or \`.texinfo' file, or any other file @@ -175,6 +282,45 @@ WARNING: \`$1' is missing on your system. You should only need it if 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 + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar ${1+"$@"} && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar ${1+"$@"} && exit 0 + fi + firstarg="$1" + if shift; then + case "$firstarg" in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" ${1+"$@"} && exit 0 + ;; + esac + case "$firstarg" in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" ${1+"$@"} && exit 0 + ;; + esac + fi + + echo 1>&2 "\ +WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + *) echo 1>&2 "\ WARNING: \`$1' is needed, and you do not seem to have it handy on your diff --git a/beecrypt/mwerks/Makefile.in b/beecrypt/mwerks/Makefile.in index 75a3ccdcc..108aa771a 100644 --- a/beecrypt/mwerks/Makefile.in +++ b/beecrypt/mwerks/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -34,7 +35,6 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # - SHELL = @SHELL@ srcdir = @srcdir@ @@ -65,9 +65,12 @@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -83,6 +86,10 @@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ AS = @AS@ AWK = @AWK@ @@ -91,14 +98,12 @@ CPP = @CPP@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ -EXEEXT = @EXEEXT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LN_S = @LN_S@ OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ STRIP = @STRIP@ @@ -128,11 +133,17 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = depcomp = +am__depfiles_maybe = DIST_SOURCES = DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu mwerks/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) mostlyclean-libtool: -rm -f *.lo @@ -142,18 +153,10 @@ clean-libtool: distclean-libtool: -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu mwerks/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status uninstall-info-am: tags: TAGS TAGS: - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. @@ -161,14 +164,19 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -192,6 +200,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: diff --git a/beecrypt/tests/Makefile.in b/beecrypt/tests/Makefile.in index 66bbd17cc..25b645b9b 100644 --- a/beecrypt/tests/Makefile.in +++ b/beecrypt/tests/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -34,7 +35,6 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # - SHELL = @SHELL@ srcdir = @srcdir@ @@ -65,9 +65,12 @@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -83,6 +86,10 @@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ AS = @AS@ AWK = @AWK@ @@ -91,14 +98,12 @@ CPP = @CPP@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ -EXEEXT = @EXEEXT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LN_S = @LN_S@ OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ STRIP = @STRIP@ @@ -152,6 +157,7 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = +am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ @@ -168,22 +174,11 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu tests/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) beetest$(EXEEXT): $(beetest_OBJECTS) $(beetest_DEPENDENCIES) @rm -f beetest$(EXEEXT) $(LINK) $(beetest_LDFLAGS) $(beetest_OBJECTS) $(beetest_LDADD) $(LIBS) @@ -198,47 +193,59 @@ distclean-compile: -rm -f *.tab.c .c.o: - $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< + $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: $(COMPILE) -c `cygpath -w $<` .c.lo: - $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool uninstall-info-am: +ETAGS = etags +ETAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - mkid -fID $$unique $(LISP) + mkid -fID $$unique TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique GTAGS: - here=`CDPATH=: && cd $(top_builddir) && pwd` \ + here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. @@ -246,14 +253,19 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -277,6 +289,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: diff --git a/configure.in b/configure.in index 38f827bc4..14d09d5fa 100644 --- a/configure.in +++ b/configure.in @@ -7,6 +7,7 @@ dnl it, why check it? AC_INIT(rpmqv.c) AC_CANONICAL_SYSTEM AC_PREREQ(2.12) dnl Minimum Autoconf version required. +AC_CONFIG_HEADERS AM_INIT_AUTOMAKE(rpm, 4.1) AM_CONFIG_HEADER(config.h) @@ -37,8 +38,6 @@ echo " " sleep 10 -LIBOBJS= - dnl Checks for programs. AC_PROG_CC AC_AIX @@ -76,7 +75,8 @@ AC_CACHE_VAL(ac_cv_valistisarray, [ac_cv_valistisarray=false])]) if test "$ac_cv_valistisarray" = true ; then - AC_DEFINE(HAVE_VA_LIST_AS_ARRAY) + AC_DEFINE(HAVE_VA_LIST_AS_ARRAY, 1, + [Define as 1 if your va_list type is an array]) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -190,7 +190,9 @@ fi dnl dnl substitute this into config.h, so the C source picks it up. dnl -AC_DEFINE_UNQUOTED(MKDIR_P, "${MKDIR_P}") +AC_DEFINE_UNQUOTED(MKDIR_P, "${MKDIR_P}", +[A full path to a program, possibly with arguments, that will create a + directory and all necessary parent directories, ala `mkdir -p']) AC_SUBST(MKDIR_P) AC_ISC_POSIX @@ -252,7 +254,8 @@ dnl XXX Watchout for square brackets fed to m4. PATCHVERSION=`patch --version 2>&1` if test "$PATCHVERSION" = "Patch version 2.1"; then - AC_DEFINE(HAVE_OLDPATCH_21) + AC_DEFINE(HAVE_OLDPATCH_21, 1, + [Define if the patch call you'll be using is 2.1 or older]) AC_MSG_RESULT(patch older then 2.2 found) else AC_MSG_RESULT(patch later then 2.2 found) @@ -292,7 +295,7 @@ if test -d zlib ; then WITH_ZLIB_INCLUDE="-I\${top_srcdir}/${WITH_ZLIB_SUBDIR}" INCPATH="$INCPATH -I\${top_srcdir}/${WITH_ZLIB_SUBDIR}" WITH_ZLIB_LIB="\${top_builddir}/${WITH_ZLIB_SUBDIR}/libz.la" - AC_DEFINE(HAVE_GZSEEK) + AC_DEFINE(HAVE_GZSEEK, 1, [Define as 1 if your zlib has gzseek()]) fi AC_SUBST(WITH_ZLIB_SUBDIR) AC_SUBST(WITH_ZLIB_INCLUDE) @@ -350,15 +353,6 @@ dnl dnl Check for features dnl -dnl ### use option --enable-v5-packages to turn on support for rpm-5.x packages -dnl AC_MSG_CHECKING(if you want experimental rpm-5.0 packages) -dnl AC_ARG_ENABLE(v5-packages, -dnl [ --enable-v5-packages[=no] [experimental] support for rpm-5.x packages], -dnl [with_v5_packages=$enableval], -dnl [with_v5_packages=no]) -dnl AC_MSG_RESULT($with_v5_packages) -dnl test "$with_v5_packages" = yes && AC_DEFINE(ENABLE_V5_PACKAGES) - dnl Checks for libraries. AC_CHECK_FUNC(setreuid, [], [ @@ -444,7 +438,7 @@ fi else dnl ------------------ with internal db - AC_DEFINE(HAVE_DB3_DB_H) + AC_DEFINE(HAVE_DB3_DB_H, 1, [Define if you have the <db3/db.h> header file]) WITH_DB_SUBDIR=db3 WITH_INTERNAL_DB=1 DBLIBSRCS="db3.c" @@ -466,22 +460,18 @@ AC_SUBST(libdb3a) for dbi in $DBLIBSRCS; do case $dbi in - db3.c) AC_DEFINE(USE_DB3) ;; - db1.c) AC_DEFINE(USE_DB1) ;; + db3.c) AC_DEFINE(USE_DB3, 1, [Use the Berkeley db3 API?]) ;; + db1.c) AC_DEFINE(USE_DB1, 1, [Use the Berkeley db1 retrofit to db3 API?]) ;; esac done -AC_CHECK_FUNC(fork, [], [echo "using vfork() instead of fork()"; - LIBOBJS=fakefork.o]) - dnl AmigaOS and IXEmul have a fork() dummy - case "$target" in - m68k-*-amigaos ) - echo "Building for AmigaOS: using vfork() instead of fork()"; - CFLAGS="$CFLAGS -Dfork=vfork" - ;; -esac - + case "$target" in + m68k-*-amigaos ) + echo "Building for AmigaOS: using vfork() instead of fork()"; + CFLAGS="$CFLAGS -Dfork=vfork" + ;; + esac if test -z "${WITH_ZLIB_LIB}" ; then for zlib in z gz ; do @@ -494,26 +484,17 @@ for zlib in z gz ; do done dnl zlib-1.0.4 has not gzseek -AC_CHECK_LIB(${zlib}, gzseek, [AC_DEFINE(HAVE_GZSEEK)]) +AC_CHECK_LIB(${zlib}, gzseek, [AC_DEFINE(HAVE_GZSEEK, 1, [Define as 1 if your zlib has gzseek()])]) fi AC_CHECK_LIB(bz2, bzread, [LIBS="$LIBS -lbz2"], AC_CHECK_LIB(bz2, BZ2_bzread, [ WITH_BZIP2=1 LIBS="$LIBS -lbz2" - AC_DEFINE(HAVE_BZ2_1_0) ], + AC_DEFINE(HAVE_BZ2_1_0, 1, [Define as 1 if you bzip2 1.0]) ], WITH_BZIP2=0)) AC_SUBST(WITH_BZIP2) -dnl Red Hat 4.x has not personality -AC_CHECK_FUNCS(personality) - -dnl XXX these are needed only by rpmgettext right now -AM_FUNC_ERROR_AT_LINE - -dnl ==> AM_GNU_GETTEXT does this (and more) -dnl AC_CHECK_HEADERS(unistd.h limits.h locale.h malloc.h string.h sys/param.h) - AM_GNU_GETTEXT dnl TVM: dnl horrible *temporary* hack to make sure that if we found gettext() in @@ -568,7 +549,8 @@ AC_TRY_COMPILE([ #include <sys/statvfs.h> ], [struct statvfs sfs;], [AC_MSG_RESULT(in sys/statvfs.h) - AC_DEFINE(STATFS_IN_SYS_STATVFS) + AC_DEFINE(STATFS_IN_SYS_STATVFS, 1, + [statfs in <sys/statvfs.h> (for solaris 2.6+ systems)]) found_struct_statfs=yes], ) fi @@ -582,7 +564,7 @@ AC_TRY_COMPILE([ #include <sys/vfs.h> ], [struct statfs sfs;], [AC_MSG_RESULT(in sys/vfs.h) - AC_DEFINE(STATFS_IN_SYS_VFS) + AC_DEFINE(STATFS_IN_SYS_VFS, 1, [statfs in <sys/vfs.h> (for linux systems)]) found_struct_statfs=yes], ) fi @@ -599,7 +581,7 @@ AC_TRY_COMPILE([ #include <sys/mount.h> ], [struct statfs sfs;], [AC_MSG_RESULT(in sys/mount.h) - AC_DEFINE(STATFS_IN_SYS_MOUNT) + AC_DEFINE(STATFS_IN_SYS_MOUNT, 1, [statfs in <sys/mount.h> (for Digital Unix 4.0D systems)]) found_struct_statfs=yes], ) fi @@ -613,7 +595,7 @@ AC_TRY_COMPILE([ #include <sys/statfs.h> ], [struct statfs sfs;], [AC_MSG_RESULT(in sys/statfs.h) - AC_DEFINE(STATFS_IN_SYS_STATFS) + AC_DEFINE(STATFS_IN_SYS_STATFS, 1, [statfs in <sys/statfs.h> (for Irix 6.4 systems)]) found_struct_statfs=yes], ) fi @@ -649,7 +631,7 @@ AC_TRY_COMPILE([ [STATFS_t sfs; sfs.f_bavail = 0;], [AC_MSG_RESULT(yes) - AC_DEFINE(STATFS_HAS_F_BAVAIL)], + AC_DEFINE(STATFS_HAS_F_BAVAIL, 1, [Define if struct statfs has the f_bavail member])], [AC_MSG_RESULT(no)] ) fi @@ -677,7 +659,7 @@ main() { } ], [AC_MSG_RESULT(yes) - AC_DEFINE(STAT_STATFS4)], + AC_DEFINE(STAT_STATFS4, 1, [Define if the statfs() call takes 4 arguments])], [AC_MSG_RESULT(no)], [AC_MSG_RESULT(no)] ) @@ -691,7 +673,7 @@ AC_MSG_CHECKING(if <netdb.h> defines h_errno) AC_TRY_LINK([#include <netdb.h>],printf("%d",h_errno),PROVIDES_ERRNO=yes) AC_MSG_RESULT($PROVIDES_ERRNO) if test $PROVIDES_ERRNO = yes; then - AC_DEFINE(HAVE_HERRNO) + AC_DEFINE(HAVE_HERRNO, 1, [ Define as 1 if <netdb.h> defines h_errno]) fi dnl If a system doesn't have S_IFSOCK, define it as 0 which will @@ -701,7 +683,7 @@ AC_TRY_LINK([#include <sys/stat.h>],printf("%d", S_IFSOCK), HAS_S_IFSOCK=yes,HAS_S_IFSOCK=no) AC_MSG_RESULT($HAS_S_IFSOCK) if test $HAS_S_IFSOCK = yes; then - AC_DEFINE(HAVE_S_IFSOCK) + AC_DEFINE(HAVE_S_IFSOCK, 1, [Define as 1 if <sys/stat.h> defines S_IFSOCK]) fi dnl Some Unix's are missing S_ISLNK, S_ISSOCK @@ -710,7 +692,7 @@ AC_TRY_LINK([#include <sys/stat.h>],printf("%d", S_ISLNK(0755)), HAS_S_ISLNK=yes,HAS_S_ISLNK=no) AC_MSG_RESULT($HAS_S_ISLNK) if test $HAS_S_ISLNK = yes; then - AC_DEFINE(HAVE_S_ISLNK) + AC_DEFINE(HAVE_S_ISLNK, 1, [Define as 1 if <sys/stat.h> defines S_ISLNK]) fi AC_MSG_CHECKING(if <sys/stat.h> defines S_ISSOCK) @@ -718,7 +700,7 @@ AC_TRY_LINK([#include <sys/stat.h>],printf("%d", S_ISSOCK(0755)), HAS_S_ISSOCK=yes,HAS_S_ISSOCK=no) AC_MSG_RESULT($HAS_S_ISSOCK) if test $HAS_S_ISSOCK = yes; then - AC_DEFINE(HAVE_S_ISSOCK) + AC_DEFINE(HAVE_S_ISSOCK, 1, [Define as 1 if <sys/stat.h> defines S_ISSOCK]) fi AC_MSG_CHECKING(if timezone is defined) @@ -734,13 +716,6 @@ dnl Checks for library functions. AC_FUNC_ALLOCA AC_FUNC_VPRINTF -AC_FUNC_FNMATCH -if test $ac_cv_func_fnmatch_works = no; then - LIBOBJS="$LIBOBJS fnmatch.o" -dnl XXX no expansion needed -dnl AC_DEFINE_UNQUOTED(fnmatch, rpl_fnmatch) -fi - dnl XXX AC_FUNC_MEMCMP dnl XXX AC_FUNC_MMAP dnl XXX AC_TYPE_SIGNAL @@ -780,8 +755,8 @@ dnl fi dnl fi dnl dnl if test $rpm_cv_regex = yes; then -dnl AC_DEFINE(USE_GNU_REGEX) -dnl LIBOBJS="$LIBOBJS regex.o" +dnl AC_DEFINE(USE_GNU_REGEX, 1) +dnl AC_LIBOBJ(regex) dnl fi dnl @@ -819,8 +794,9 @@ main() { fi if test "$rpm_cv_glob" = yes; then - AC_DEFINE(USE_GNU_GLOB) - LIBOBJS="$LIBOBJS glob.o fnmatch.o" + AC_DEFINE(USE_GNU_GLOB, 1, [Use the included glob.c?]) + AC_LIBOBJ(glob) + AC_LIBOBJ(fnmatch) fi dnl dnl Auto-detect which python bindings should be built. @@ -894,7 +870,7 @@ AC_SUBST(WITH_APIDOCS) withval=no AC_ARG_WITH(dmalloc, [ --with-dmalloc build with dmalloc debugging support ]) if test $withval = yes ; then - AC_DEFINE(DMALLOC) + AC_DEFINE(DMALLOC, 1, [Build with dmalloc support?]) LIBS="$LIBS -ldmalloc" fi @@ -903,18 +879,18 @@ AC_CHECK_FUNCS(setlocale) dnl XXX Solaris <= 2.6 only permits 8 chars in password. AC_CHECK_FUNCS(getpassphrase) -AC_CHECK_FUNC(getmntent, AC_DEFINE(HAVE_GETMNTENT), [ - AC_CHECK_FUNC(mntctl, AC_DEFINE(HAVE_MNTCTL),[ - AC_CHECK_FUNC(getmntinfo_r, AC_DEFINE(HAVE_GETMNTINFO_R), [ +AC_CHECK_FUNC(getmntent, AC_DEFINE(HAVE_GETMNTENT, 1, [Define if you have the getmntent() function]), [ + AC_CHECK_FUNC(mntctl, AC_DEFINE(HAVE_MNTCTL, 1, [Define as 1 if you have mntctl() (only aix?)]),[ + AC_CHECK_FUNC(getmntinfo_r, AC_DEFINE(HAVE_GETMNTINFO_R, 1, [Define as 1 if you have getmntinfo_r() (only osf?)]), [ AC_CHECK_LIB(c_r, getmntinfo_r, [LIBS="$LIBS -lc_r"; - AC_DEFINE(HAVE_GETMNTINFO_R)], [ + AC_DEFINE(HAVE_GETMNTINFO_R, 1, [Define as 1 if you have getmntinfo_r() (only osf?)])], [ AC_DEFINE([USE_GETMNTENT], 1, [Defined if getmntent replacement is used]) - LIBOBJS="$LIBOBJS getmntent.o"])])])]) + AC_LIBOBJ(getmntent)])])])]) AC_CHECK_FUNC(lchown, [__CHOWN_RHF="%{__chown} -Rhf" __CHGRP_RHF="%{__chgrp} -Rhf" - AC_DEFINE(HAVE_LCHOWN)], + AC_DEFINE(HAVE_LCHOWN, 1, [Define as 1 if you have lchown()])], [__CHOWN_RHF="%{__chown} -Rf" __CHGRP_RHF="%{__chgrp} -Rf" dnl Does chown() follow symlinks? This should be a good enough test. @@ -947,7 +923,7 @@ AC_CHECK_FUNC(lchown, AC_MSG_RESULT($result) if test $result = yes; then - AC_DEFINE(CHOWN_FOLLOWS_SYMLINK) + AC_DEFINE(CHOWN_FOLLOWS_SYMLINK, 1, [Define as 1 if chown() follows symlinks and you don't have lchown()]) fi]) AC_SUBST(__CHOWN_RHF) AC_SUBST(__CHGRP_RHF) @@ -1017,14 +993,15 @@ AC_SUBST(tmpdir) if echo "$build_os" | grep sco > /dev/null; then echo "hacking things up for sco" - AC_DEFINE(NEED_STRINGS_H) - AC_DEFINE(HAVE_STRUCT_MNTTAB) + AC_DEFINE(NEED_STRINGS_H, 1, [Define as one if we need to include <strings.h> (along with <string.h>)]) + AC_DEFINE(HAVE_STRUCT_MNTTAB, 1, + [Define as 1 if you have "struct mnttab" (only sco?)]) elif echo "$build_os" | grep sunos > /dev/null; then echo "hacking things up for sunos" CFLAGS="$CFLAGS -D__USE_FIXED_PROTOTYPES__" - AC_DEFINE(NEED_STRINGS_H) - AC_DEFINE(NEED_MYREALLOC) - LIBOBJS="$LIBOBJS myrealloc.o" + AC_DEFINE(NEED_STRINGS_H, 1, [Define as one if we need to include <strings.h> (along with <string.h>)]) + AC_DEFINE(NEED_MYREALLOC, 1, [Define as 1 if we need myrealloc]) + AC_LIBOBJ(myrealloc) fi # @@ -1114,56 +1091,56 @@ AC_SUBST(RPMCANONARCH) AC_SUBST(RPMCANONVENDOR) AC_SUBST(RPMCANONOS) -if test -n "$LIBOBJS" ; then - LIBMISC='$(top_builddir)/misc/libmisc.a' -fi -AC_SUBST(LIBOBJS) -AC_SUBST(LIBMISC) - if test X"$prefix" = XNONE ; then usrprefix="$ac_default_prefix" else usrprefix=$prefix fi LOCALEDIR="`echo ${usrprefix}/share/locale`" -AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR") +AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR", + [Full path to rpm locale directory (usually /usr/share/locale)]) AC_SUBST(LOCALEDIR) LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`" AC_SUBST(LIBDIR) RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" -AC_DEFINE_UNQUOTED(RPMCONFIGDIR, "$RPMCONFIGDIR") +AC_DEFINE_UNQUOTED(RPMCONFIGDIR, "$RPMCONFIGDIR", + [Full path to rpm global configuration directory (usually /usr/lib/rpm)]) AC_SUBST(RPMCONFIGDIR) SYSCONFIGDIR="`echo /etc/rpm`" -AC_DEFINE_UNQUOTED(SYSCONFIGDIR, "$SYSCONFIGDIR") +AC_DEFINE_UNQUOTED(SYSCONFIGDIR, "$SYSCONFIGDIR", + [Full path to rpm system configuration directory (usually /etc/rpm)]) AC_SUBST(SYSCONFIGDIR) MACROFILES="${RPMCONFIGDIR}/macros:${RPMCONFIGDIR}/%{_target_platform}/macros:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/macros.specspo:${SYSCONFIGDIR}/macros.db1:${SYSCONFIGDIR}/%{_target_platform}/macros:~/.rpmmacros" -AC_DEFINE_UNQUOTED(MACROFILES, "$MACROFILES") +AC_DEFINE_UNQUOTED(MACROFILES, "$MACROFILES", + [Colon separated paths of macro files to read.]) AC_SUBST(MACROFILES) LIBRPMRC_FILENAME="${RPMCONFIGDIR}/rpmrc" -AC_DEFINE_UNQUOTED(LIBRPMRC_FILENAME, "$LIBRPMRC_FILENAME") +AC_DEFINE_UNQUOTED(LIBRPMRC_FILENAME, "$LIBRPMRC_FILENAME", + [Full path to rpmrc configuration file (usually /usr/lib/rpm/rpmrc)]) AC_SUBST(LIBRPMRC_FILENAME) LIBRPMALIAS_FILENAME="${RPMCONFIGDIR}/rpmpopt-${VERSION}" -AC_DEFINE_UNQUOTED(LIBRPMALIAS_FILENAME, "$LIBRPMALIAS_FILENAME") +AC_DEFINE_UNQUOTED(LIBRPMALIAS_FILENAME, "$LIBRPMALIAS_FILENAME", + [Full path to rpmpopt configuration file (usually /usr/lib/rpm/rpmpopt)]) AC_SUBST(LIBRPMALIAS_FILENAME) FINDREQUIRES="${RPMCONFIGDIR}/find-requires" -AC_DEFINE_UNQUOTED(FINDREQUIRES, "$FINDREQUIRES") +AC_DEFINE_UNQUOTED(FINDREQUIRES, "$FINDREQUIRES", + [Full path to find-requires script (usually /usr/lib/rpm/find-requires)]) AC_SUBST(FINDREQUIRES) FINDPROVIDES="${RPMCONFIGDIR}/find-provides" -AC_DEFINE_UNQUOTED(FINDPROVIDES, "$FINDPROVIDES") +AC_DEFINE_UNQUOTED(FINDPROVIDES, "$FINDPROVIDES", + [Full path to find-provides script (usually /usr/lib/rpm/find-provides)]) AC_SUBST(FINDPROVIDES) testdir="`pwd`/tests" dnl AC_DEFINE_UNQUOTED(testdir, "$testdir") AC_SUBST(testdir) -if test -n "$LIBOBJS"; then - INCPATH="-I\$(top_builddir)/misc $INCPATH" -fi AC_SUBST(INCPATH) +AC_SUBST(LIBMISC) AC_SUBST(RPM) diff --git a/depcomp b/depcomp deleted file mode 100755 index 65899658e..000000000 --- a/depcomp +++ /dev/null @@ -1,411 +0,0 @@ -#! /bin/sh - -# depcomp - compile a program generating dependencies as side-effects -# Copyright 1999, 2000 Free Software Foundation, Inc. - -# 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, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# 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. - -# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>. - -if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -fi -# `libtool' can also be set to `yes' or `no'. - -depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`} -tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} - -rm -f "$tmpdepfile" - -# Some modes work just like other modes, but use different flags. We -# parameterize here, but still list the modes in the big case below, -# to make depend.m4 easier to write. Note that we *cannot* use a case -# here, because this file can only contain one case statement. -if test "$depmode" = hp; then - # HP compiler uses -M and no extra arg. - gccflag=-M - depmode=gcc -fi - -if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout -fi - -case "$depmode" in -gcc3) -## gcc 3 implements dependency tracking that does exactly what -## we want. Yay! Note: for some reason libtool 1.4 doesn't like -## it if -MD -MP comes after the -MF stuff. Hmm. - "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## There are various ways to get dependency output from gcc. Here's -## why we pick this rather obscure method: -## - Don't want to use -MD because we'd like the dependencies to end -## up in a subdir. Having to rename by hand is ugly. -## (We might end up doing this anyway to support other compilers.) -## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). -## - Using -M directly means running the compiler twice (even worse -## than renaming). - if test -z "$gccflag"; then - gccflag=-MD, - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. -## The problem is that when a header file which appears in a .P file -## is deleted, the dependency causes make to die (because there is -## typically no way to rebuild the header). We avoid this by adding -## dummy dependencies for each header file. Too bad gcc doesn't do -## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory -## that the space means something, we add a space to the output as -## well. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -sgi) - if test "$libtool" = yes; then - "$@" "-Wp,-MDupdate,$tmpdepfile" - else - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" - - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the - # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> $depfile - echo >> $depfile - - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -aix) - # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. This file always lives in the current directory. - # Also, the AIX compiler puts `$object:' at the start of each line; - # $object doesn't have directory information. - stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'` - tmpdepfile="$stripped.u" - outname="$stripped.o" - if test "$libtool" = yes; then - "$@" -Wc,-M - else - "$@" -M - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" - sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -tru64) - # The Tru64 AIX compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - - tmpdepfile1="$object.d" - tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` - if test "$libtool" = yes; then - "$@" -Wc,-MD - else - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" - exit $stat - fi - - if test -f "$tmpdepfile1"; then - tmpdepfile="$tmpdepfile1" - else - tmpdepfile="$tmpdepfile2" - fi - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a space and a tab in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -#nosideeffect) - # This comment above is used by automake to tell side-effect - # dependency tracking mechanisms from slower ones. - -dashmstdout) - # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - test -z "$dashmflag" && dashmflag=-M - ( IFS=" " - case " $* " in - *" --mode=compile "*) # this is libtool, let us make it quiet - for arg - do # cycle over the arguments - case "$arg" in - "--mode=compile") - # insert --quiet before "--mode=compile" - set fnord "$@" --quiet - shift # fnord - ;; - esac - set fnord "$@" "$arg" - shift # fnord - shift # "$arg" - done - ;; - esac - "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -dashXmstdout) - # This case only exists to satisfy depend.m4. It is never actually - # run, as this mode is specially recognized in the preamble. - exit 1 - ;; - -makedepend) - # X makedepend - ( - shift - cleared=no - for arg in "$@"; do - case $cleared in no) - set ""; shift - cleared=yes - esac - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift;; - -*) - ;; - *) - set fnord "$@" "$arg"; shift;; - esac - done - obj_suffix="`echo $object | sed 's/^.*\././'`" - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tail +3 "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" "$tmpdepfile".bak - ;; - -cpp) - # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - ( IFS=" " - case " $* " in - *" --mode=compile "*) - for arg - do # cycle over the arguments - case $arg in - "--mode=compile") - # insert --quiet before "--mode=compile" - set fnord "$@" --quiet - shift # fnord - ;; - esac - set fnord "$@" "$arg" - shift # fnord - shift # "$arg" - done - ;; - esac - "$@" -E | - sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - cat < "$tmpdepfile" >> "$depfile" - sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvisualcpp) - # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - ( IFS=" " - case " $* " in - *" --mode=compile "*) - for arg - do # cycle over the arguments - case $arg in - "--mode=compile") - # insert --quiet before "--mode=compile" - set fnord "$@" --quiet - shift # fnord - ;; - esac - set fnord "$@" "$arg" - shift # fnord - shift # "$arg" - done - ;; - esac - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -none) - exec "$@" - ;; - -*) - echo "Unknown depmode $depmode" 1>&2 - exit 1 - ;; -esac - -exit 0 diff --git a/install-sh b/install-sh deleted file mode 100755 index e9de23842..000000000 --- a/install-sh +++ /dev/null @@ -1,251 +0,0 @@ -#!/bin/sh -# -# install - install a program, script, or datafile -# This comes from X11R5 (mit/util/scripts/install.sh). -# -# Copyright 1991 by the Massachusetts Institute of Technology -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of M.I.T. not be used in advertising or -# publicity pertaining to distribution of the software without specific, -# written prior permission. M.I.T. makes no representations about the -# suitability of this software for any purpose. It is provided "as is" -# without express or implied warranty. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. - - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -transformbasename="" -transform_arg="" -instcmd="$mvprog" -chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd="$cpprog" - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd="$stripprog" - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done - -if [ x"$src" = x ] -then - echo "install: no input file specified" - exit 1 -else - true -fi - -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d $dst ]; then - instcmd=: - chmodcmd="" - else - instcmd=mkdir - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f $src -o -d $src ] - then - true - else - echo "install: $src does not exist" - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "install: no destination specified" - exit 1 - else - true - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d $dst ] - then - dst="$dst"/`basename $src` - else - true - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' -' -IFS="${IFS-${defaultIFS}}" - -oIFS="${IFS}" -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS="${oIFS}" - -pathcomp='' - -while [ $# -ne 0 ] ; do - pathcomp="${pathcomp}${1}" - shift - - if [ ! -d "${pathcomp}" ] ; - then - $mkdirprog "${pathcomp}" - else - true - fi - - pathcomp="${pathcomp}/" -done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd $dst && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi -else - -# If we're going to rename the final executable, determine the name now. - - if [ x"$transformarg" = x ] - then - dstfile=`basename $dst` - else - dstfile=`basename $dst $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename $dst` - else - true - fi - -# Make a temp file name in the proper directory. - - dsttmp=$dstdir/#inst.$$# - -# Move or copy the file name to the temp name - - $doit $instcmd $src $dsttmp && - - trap "rm -f ${dsttmp}" 0 && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && - -# Now rename the file to the real destination. - - $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile - -fi && - - -exit 0 diff --git a/lib/depends.c b/lib/depends.c index 5cf50c4ab..f11ef50fa 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -318,23 +318,25 @@ int rpmtransRemovePackage(rpmTransactionSet ts, Header h, int dboffset) } /** - * Check key for an unsatisfied dependency. + * Check dep for an unsatisfied dependency. * @todo Eliminate rpmrc provides. * @param ts transaction set - * @param key dependency + * @param dep dependency * @return 0 if satisfied, 1 if not satisfied, 2 if error */ -static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet key) +static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet dep) /*@globals _cacheDependsRC, fileSystem @*/ /*@modifies ts, _cacheDependsRC, fileSystem @*/ { + DBT * key = alloca(sizeof(*key)); + DBT * data = alloca(sizeof(*data)); rpmdbMatchIterator mi; const char * Name; Header h; int rc; int xx; - if ((Name = dsiGetN(key)) == NULL) + if ((Name = dsiGetN(dep)) == NULL) return 0; /* XXX can't happen */ /* @@ -349,22 +351,33 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet key) const char * DNEVR; rc = -1; - if ((DNEVR = dsiGetDNEVR(key)) != NULL) { + if ((DNEVR = dsiGetDNEVR(dep)) != NULL) { DBC * dbcursor = NULL; void * datap = NULL; size_t datalen = 0; size_t DNEVRlen = strlen(DNEVR); - xx = dbiCopen(dbi, &dbcursor, 0); - xx = dbiGet(dbi, dbcursor, (void **)&DNEVR, &DNEVRlen, - &datap, &datalen, 0); + xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, 0); + + memset(key, 0, sizeof(*key)); + key->data = (void *) DNEVR; + key->size = DNEVRlen; + memset(data, 0, sizeof(*data)); + data->data = datap; + data->size = datalen; + xx = dbiGet(dbi, dbcursor, key, data); + DNEVR = key->data; + DNEVRlen = key->size; + datap = data->data; + datalen = data->size; + if (xx == 0 && datap && datalen == 4) memcpy(&rc, datap, datalen); xx = dbiCclose(dbi, dbcursor, 0); } if (rc >= 0) { - dsiNotify(key, _("(cached)"), rc); + dsiNotify(dep, _("(cached)"), rc); return rc; } } @@ -375,7 +388,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet key) #if defined(DYING) || defined(__LCLINT__) { static /*@observer@*/ const char noProvidesString[] = "nada"; static /*@observer@*/ const char * rcProvidesString = noProvidesString; - int_32 Flags = dsiGetFlags(key); + int_32 Flags = dsiGetFlags(dep); const char * start; int i; @@ -389,7 +402,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet key) while ((start = strstr(rcProvidesString, Name))) { /*@=observertrans =mayaliasunique@*/ if (xisspace(start[i]) || start[i] == '\0' || start[i] == ',') { - dsiNotify(key, _("(rpmrc provides)"), rc); + dsiNotify(dep, _("(rpmrc provides)"), rc); goto exit; } rcProvidesString = start + 1; @@ -404,21 +417,21 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet key) * Check those dependencies now. */ if (!strncmp(Name, "rpmlib(", sizeof("rpmlib(")-1)) { - if (rpmCheckRpmlibProvides(key)) { - dsiNotify(key, _("(rpmlib provides)"), rc); + if (rpmCheckRpmlibProvides(dep)) { + dsiNotify(dep, _("(rpmlib provides)"), rc); goto exit; } goto unsatisfied; } /* Search added packages for the dependency. */ - if (alSatisfiesDepend(ts->addedPackages, key, NULL) != NULL) + if (alSatisfiesDepend(ts->addedPackages, dep, NULL) != NULL) goto exit; /* XXX only the installer does not have the database open here. */ if (ts->rpmdb != NULL) { if (Name[0] == '/') { - /* keyFlags better be 0! */ + /* depFlags better be 0! */ mi = rpmtsInitIterator(ts, RPMTAG_BASENAMES, Name, 0); @@ -426,7 +439,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet key) ts->removedPackages, ts->numRemovedPackages, 1); while ((h = rpmdbNextIterator(mi)) != NULL) { - dsiNotify(key, _("(db files)"), rc); + dsiNotify(dep, _("(db files)"), rc); mi = rpmdbFreeIterator(mi); goto exit; } @@ -437,8 +450,8 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet key) (void) rpmdbPruneIterator(mi, ts->removedPackages, ts->numRemovedPackages, 1); while ((h = rpmdbNextIterator(mi)) != NULL) { - if (rangeMatchesDepFlags(h, key)) { - dsiNotify(key, _("(db provides)"), rc); + if (rangeMatchesDepFlags(h, dep)) { + dsiNotify(dep, _("(db provides)"), rc); mi = rpmdbFreeIterator(mi); goto exit; } @@ -450,8 +463,8 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet key) (void) rpmdbPruneIterator(mi, ts->removedPackages, ts->numRemovedPackages, 1); while ((h = rpmdbNextIterator(mi)) != NULL) { - if (rangeMatchesDepFlags(h, key)) { - dsiNotify(key, _("(db package)"), rc); + if (rangeMatchesDepFlags(h, dep)) { + dsiNotify(dep, _("(db package)"), rc); mi = rpmdbFreeIterator(mi); goto exit; } @@ -465,11 +478,11 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet key) * Search for an unsatisfied dependency. */ if (!(ts->transFlags & RPMTRANS_FLAG_NOSUGGESTS) && ts->solve != NULL) - xx = (*ts->solve) (ts, key); + xx = (*ts->solve) (ts, dep); unsatisfied: rc = 1; /* dependency is unsatisfied */ - dsiNotify(key, NULL, rc); + dsiNotify(dep, NULL, rc); exit: /* @@ -483,12 +496,20 @@ exit: } else { const char * DNEVR; xx = 0; - if ((DNEVR = dsiGetDNEVR(key)) != NULL) { + if ((DNEVR = dsiGetDNEVR(dep)) != NULL) { DBC * dbcursor = NULL; size_t DNEVRlen = strlen(DNEVR); - xx = dbiCopen(dbi, &dbcursor, DBI_WRITECURSOR); - xx = dbiPut(dbi, dbcursor, DNEVR, DNEVRlen, - &rc, sizeof(rc), 0); + + xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, DBI_WRITECURSOR); + + memset(key, 0, sizeof(*key)); + key->data = (void *) DNEVR; + key->size = DNEVRlen; + memset(data, 0, sizeof(*data)); + data->data = &rc; + data->size = sizeof(rc); + + xx = dbiPut(dbi, dbcursor, key, data); xx = dbiCclose(dbi, dbcursor, DBI_WRITECURSOR); } if (xx) @@ -504,13 +525,13 @@ exit: * @param pkgNEVR package name-version-release * @param requires Requires: dependencies (or NULL) * @param conflicts Conflicts: dependencies (or NULL) - * @param keyName dependency name to filter (or NULL) + * @param depName dependency name to filter (or NULL) * @param multiLib skip multilib colored dependencies? * @return 0 no problems found */ static int checkPackageDeps(rpmTransactionSet ts, const char * pkgNEVR, /*@null@*/ rpmDepSet requires, /*@null@*/ rpmDepSet conflicts, - /*@null@*/ const char * keyName, uint_32 multiLib) + /*@null@*/ const char * depName, uint_32 multiLib) /*@globals fileSystem @*/ /*@modifies ts, requires, conflicts, fileSystem */ { @@ -527,7 +548,7 @@ static int checkPackageDeps(rpmTransactionSet ts, const char * pkgNEVR, continue; /* XXX can't happen */ /* Filter out requires that came along for the ride. */ - if (keyName != NULL && strcmp(keyName, Name)) + if (depName != NULL && strcmp(depName, Name)) continue; Flags = dsiGetFlags(requires); @@ -571,7 +592,7 @@ static int checkPackageDeps(rpmTransactionSet ts, const char * pkgNEVR, continue; /* XXX can't happen */ /* Filter out conflicts that came along for the ride. */ - if (keyName != NULL && strcmp(keyName, Name)) + if (depName != NULL && strcmp(depName, Name)) continue; Flags = dsiGetFlags(conflicts); @@ -602,15 +623,15 @@ static int checkPackageDeps(rpmTransactionSet ts, const char * pkgNEVR, /** * Check dependency against installed packages. - * Adding: check name/provides key against each conflict match, - * Erasing: check name/provides/filename key against each requiredby match. + * Adding: check name/provides dep against each conflict match, + * Erasing: check name/provides/filename dep against each requiredby match. * @param ts transaction set - * @param key dependency name + * @param dep dependency name * @param mi rpm database iterator * @return 0 no problems found */ static int checkPackageSet(rpmTransactionSet ts, - const char * key, /*@only@*/ /*@null@*/ rpmdbMatchIterator mi) + const char * dep, /*@only@*/ /*@null@*/ rpmdbMatchIterator mi) /*@globals fileSystem @*/ /*@modifies ts, mi, fileSystem @*/ { @@ -628,7 +649,7 @@ static int checkPackageSet(rpmTransactionSet ts, pkgNEVR = hGetNEVR(h, NULL); requires = dsNew(h, RPMTAG_REQUIRENAME, scareMem); conflicts = dsNew(h, RPMTAG_CONFLICTNAME, scareMem); - rc = checkPackageDeps(ts, pkgNEVR, requires, conflicts, key, 0); + rc = checkPackageDeps(ts, pkgNEVR, requires, conflicts, dep, 0); conflicts = dsFree(conflicts); requires = dsFree(requires); pkgNEVR = _free(pkgNEVR); @@ -644,27 +665,27 @@ static int checkPackageSet(rpmTransactionSet ts, } /** - * Erasing: check name/provides/filename key against requiredby matches. + * Erasing: check name/provides/filename dep against requiredby matches. * @param ts transaction set - * @param key requires name + * @param dep requires name * @return 0 no problems found */ -static int checkDependentPackages(rpmTransactionSet ts, const char * key) +static int checkDependentPackages(rpmTransactionSet ts, const char * dep) /*@globals fileSystem @*/ /*@modifies ts, fileSystem @*/ { rpmdbMatchIterator mi; - mi = rpmtsInitIterator(ts, RPMTAG_REQUIRENAME, key, 0); - return checkPackageSet(ts, key, mi); + mi = rpmtsInitIterator(ts, RPMTAG_REQUIRENAME, dep, 0); + return checkPackageSet(ts, dep, mi); } /** - * Adding: check name/provides key against conflicts matches. + * Adding: check name/provides dep against conflicts matches. * @param ts transaction set - * @param key conflicts name + * @param dep conflicts name * @return 0 no problems found */ -static int checkDependentConflicts(rpmTransactionSet ts, const char * key) +static int checkDependentConflicts(rpmTransactionSet ts, const char * dep) /*@globals fileSystem @*/ /*@modifies ts, fileSystem @*/ { @@ -672,8 +693,8 @@ static int checkDependentConflicts(rpmTransactionSet ts, const char * key) if (ts->rpmdb != NULL) { /* XXX is this necessary? */ rpmdbMatchIterator mi; - mi = rpmtsInitIterator(ts, RPMTAG_CONFLICTNAME, key, 0); - rc = checkPackageSet(ts, key, mi); + mi = rpmtsInitIterator(ts, RPMTAG_CONFLICTNAME, dep, 0); + rc = checkPackageSet(ts, dep, mi); } return rc; @@ -686,7 +707,7 @@ struct badDeps_s { const char * qname; }; -#ifdef DYING +#ifdef REFERENCE static struct badDeps_s { /*@observer@*/ /*@null@*/ const char * pname; /*@observer@*/ /*@null@*/ const char * qname; diff --git a/lib/poptI.c b/lib/poptI.c index ae14b6c7c..aefb80d1c 100644 --- a/lib/poptI.c +++ b/lib/poptI.c @@ -40,10 +40,6 @@ static void installArgCallback( /*@unused@*/ poptContext con, { struct rpmInstallArguments_s * ia = &rpmIArgs; -#if 0 -fprintf(stderr, "*** opt %s %c info 0x%x arg %p val 0x%x arg %p %s\n", opt->longName, opt->shortName, opt->argInfo, opt->arg, opt->val, arg, arg); -#endif - /* XXX avoid accidental collisions with POPT_BIT_SET for flags */ /*@-branchstate@*/ if (opt->arg == NULL) diff --git a/lib/query.c b/lib/query.c index 5b7d429de..146d468e3 100644 --- a/lib/query.c +++ b/lib/query.c @@ -117,7 +117,7 @@ static void printFileInfo(char * te, const char * name, static inline /*@null@*/ const char * queryHeader(Header h, const char * qfmt) /*@*/ { - const char * errstr; + const char * errstr = "(unkown error)"; const char * str; str = headerSprintf(h, qfmt, rpmTagTable, rpmHeaderFormats, &errstr); @@ -458,6 +458,7 @@ printNewSpecfile(Spec spec) (void) stpcpy( stpcpy( stpcpy( fmt, "%{"), tn), "}"); msgstr = _free(msgstr); + /* XXX this should use queryHeader(), but prints out tn as well. */ msgstr = headerSprintf(h, fmt, rpmTagTable, rpmHeaderFormats, &errstr); if (msgstr == NULL) { rpmError(RPMERR_QFMT, _("can't query %s: %s\n"), tn, errstr); diff --git a/lib/rpmrc.c b/lib/rpmrc.c index 7a5aa0ea6..507cbf1c3 100644 --- a/lib/rpmrc.c +++ b/lib/rpmrc.c @@ -1083,7 +1083,7 @@ static void defaultMachine(/*@out@*/ const char ** arch, } # endif /* hpux */ -# if HAVE_PERSONALITY && defined(__linux__) && defined(__sparc__) +# if defined(__linux__) && defined(__sparc__) if (!strcmp(un.machine, "sparc")) { #define PERS_LINUX 0x00000000 #define PERS_LINUX_32BIT 0x00800000 diff --git a/lib/signature.c b/lib/signature.c index 3b9696734..491b337b0 100644 --- a/lib/signature.c +++ b/lib/signature.c @@ -113,6 +113,7 @@ static inline rpmRC checkSize(FD_t fd, int siglen, int pad, int datalen) /*@modifies fileSystem @*/ { struct stat st; + int delta; rpmRC rc; if (fstat(Fileno(fd), &st)) @@ -125,15 +126,24 @@ static inline rpmRC checkSize(FD_t fd, int siglen, int pad, int datalen) } /*@-sizeoftype@*/ - rc = (((sizeof(struct rpmlead) + siglen + pad + datalen) - st.st_size) - ? RPMRC_BADSIZE : RPMRC_OK); + delta = (sizeof(struct rpmlead) + siglen + pad + datalen) - st.st_size; + switch (delta) { + case -32: /* XXX rpm-4.0 packages */ + case 32: /* XXX Legacy headers have a HEADER_IMAGE tag added. */ + case 0: + rc = RPMRC_OK; + break; + default: + rc = RPMRC_BADSIZE; + break; + } - rpmMessage((rc == RPMRC_OK ? RPMMESS_DEBUG : RPMMESS_DEBUG), + rpmMessage((rc == RPMRC_OK ? RPMMESS_DEBUG : RPMMESS_WARNING), _("Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"), (int)sizeof(struct rpmlead)+siglen+pad+datalen, (int)sizeof(struct rpmlead), siglen, pad, datalen); /*@=sizeoftype@*/ - rpmMessage((rc == RPMRC_OK ? RPMMESS_DEBUG : RPMMESS_DEBUG), + rpmMessage((rc == RPMRC_OK ? RPMMESS_DEBUG : RPMMESS_WARNING), _(" Actual size: %12d\n"), (int)st.st_size); return rc; @@ -181,10 +191,6 @@ rpmRC rpmReadSignature(FD_t fd, Header * headerp, sigType sig_type) rc = RPMRC_OK; sigSize = headerSizeof(h, HEADER_MAGIC_YES); - /* XXX Legacy headers have a HEADER_IMAGE tag added. */ - if (headerIsEntry(h, RPMTAG_HEADERIMAGE)) - sigSize -= (16 + 16); - pad = (8 - (sigSize % 8)) % 8; /* 8-byte pad */ if (sig_type == RPMSIGTYPE_HEADERSIG) { if (! headerGetEntry(h, RPMSIGTAG_SIZE, &type, @@ -199,7 +205,7 @@ rpmRC rpmReadSignature(FD_t fd, Header * headerp, sigType sig_type) break; } - if (headerp && rc == 0) + if (headerp && rc == RPMRC_OK) *headerp = headerLink(h, NULL); h = headerFree(h, NULL); diff --git a/missing b/missing deleted file mode 100755 index 0a7fb5a2a..000000000 --- a/missing +++ /dev/null @@ -1,283 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. -# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# 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, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# 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. - -if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 -fi - -run=: - -# 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 ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - ;; -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 "\ -$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. - -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' - 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 - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch]" - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.3 - GNU automake" - ;; - - -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 - ;; - - aclocal) - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. 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 missing on your system. 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 missing on your system. 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 - ;; - - automake) - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. 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 - ;; - - bison|yacc) - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. 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 - eval LASTARG="\${$#}" - case "$LASTARG" in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if [ ! -f y.tab.h ]; then - echo >y.tab.h - fi - if [ ! -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 - 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 - eval LASTARG="\${$#}" - case "$LASTARG" in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if [ ! -f lex.yy.c ]; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man) - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. 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 - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit 1 - fi - ;; - - 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 - 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'` - if test -z "$file"; then - file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` - fi - 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 - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar ${1+"$@"} && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar ${1+"$@"} && exit 0 - fi - firstarg="$1" - if shift; then - case "$firstarg" in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" ${1+"$@"} && exit 0 - ;; - esac - case "$firstarg" in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" ${1+"$@"} && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - 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 - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequirements 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 - -exit 0 @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-14 17:43-0400\n" +"POT-Creation-Date: 2002-05-01 18:05-0400\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n" "Language-Team: Czech <cs@li.org>\n" @@ -114,7 +114,7 @@ msgstr "<pøík>" msgid "use <dir> as the top level directory" msgstr "pou¾ít <adr> jako adresáø nejvy¹¹í úrovnì" -#: rpmqv.c:125 lib/poptI.c:219 +#: rpmqv.c:125 lib/poptI.c:215 msgid "<dir>" msgstr "<adresáø>" @@ -1439,52 +1439,52 @@ msgstr "selhal - " msgid "package %s was already added, replacing with %s\n" msgstr "balíèek %s je ji¾ nainstalován" -#: lib/depends.c:367 +#: lib/depends.c:380 msgid "(cached)" msgstr "" -#: lib/depends.c:392 +#: lib/depends.c:405 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s ANO (rpmrc poskytuje)\n" -#: lib/depends.c:408 +#: lib/depends.c:421 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s ANO (rpmlib poskytuje)\n" -#: lib/depends.c:429 +#: lib/depends.c:442 #, fuzzy msgid "(db files)" msgstr "¹patný db soubor %s\n" -#: lib/depends.c:441 +#: lib/depends.c:454 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s ANO (db poskytuje)\n" -#: lib/depends.c:454 +#: lib/depends.c:467 #, fuzzy msgid "(db package)" msgstr "¾ádné balíèky\n" -#: lib/depends.c:762 +#: lib/depends.c:783 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:903 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1171 msgid "========== recording tsort relations\n" msgstr "========== ukládání tsort relací\n" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1277 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1492,26 +1492,26 @@ msgid "" msgstr "" "========== tsorting balíèkù (poøadí, #pøedchùdce, #následovník, hloubka)\n" -#: lib/depends.c:1349 +#: lib/depends.c:1370 msgid "========== successors only (presentation order)\n" msgstr "========== pouze úspì¹né (poøadí dle prezentace)\n" -#: lib/depends.c:1419 +#: lib/depends.c:1440 msgid "LOOP:\n" msgstr "SMYÈKA:\n" -#: lib/depends.c:1454 +#: lib/depends.c:1475 msgid "========== continuing tsort ...\n" msgstr "========== pokraèuje tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1480 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2978 rpmdb/header.c:2999 rpmdb/header.c:3021 +#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 msgid "(not a number)" msgstr "(není èíslo)" @@ -1648,37 +1648,37 @@ msgstr "" msgid "%s: Fread failed: %s\n" msgstr "%s: Fread selhalo: %s\n" -#: lib/poptI.c:53 +#: lib/poptI.c:49 msgid "exclude paths must begin with a /" msgstr "vynechané cesty musí zaèínat znakem /" -#: lib/poptI.c:65 +#: lib/poptI.c:61 msgid "relocations must begin with a /" msgstr "pøemístìní musejí zaèínat znakem /" -#: lib/poptI.c:67 +#: lib/poptI.c:63 msgid "relocations must contain a =" msgstr "pøemístìní musejí obsahovat =" -#: lib/poptI.c:70 +#: lib/poptI.c:66 msgid "relocations must have a / following the =" msgstr "pøemístìní musejí mít za znakem = znak /" -#: lib/poptI.c:84 +#: lib/poptI.c:80 msgid "rollback takes a time/date stamp argument" msgstr "" -#: lib/poptI.c:91 +#: lib/poptI.c:87 #, fuzzy msgid "malformed rollback time/date stamp argument" msgstr "poru¹ený rollback èas" -#: lib/poptI.c:110 +#: lib/poptI.c:106 msgid "install all files, even configurations which might otherwise be skipped" msgstr "" "nainstalovat v¹echny soubory i konfigurace, které by se jinak mohly vynechat" -#: lib/poptI.c:114 +#: lib/poptI.c:110 msgid "" "remove all packages which match <package> (normally an error is generated if " "<package> specified multiple packages)" @@ -1686,146 +1686,146 @@ msgstr "" "odstranit v¹echny balíèky odpovídající <balíèku> (obvykle se generuje chyba, " "specifikuje-li <balíèek> více balíèkù)" -#: lib/poptI.c:120 lib/poptI.c:175 +#: lib/poptI.c:116 lib/poptI.c:171 msgid "do not execute package scriptlet(s)" msgstr "nespou¹tìt ¾ádné skripty urèené pro balíèky" -#: lib/poptI.c:124 +#: lib/poptI.c:120 msgid "relocate files in non-relocateable package" msgstr "pøemístìní souborù v nepøemístitelném balíèku" -#: lib/poptI.c:127 +#: lib/poptI.c:123 msgid "save erased package files by renaming into sub-directory" msgstr "uchovat smazané soubory pøesunem do podadresáøe" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "erase (uninstall) package" msgstr "smazat (deinstalovat) balíèek" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "<package>+" msgstr "<balíèek>" -#: lib/poptI.c:133 +#: lib/poptI.c:129 msgid "do not install documentation" msgstr "neinstalovat dokumentaci" -#: lib/poptI.c:135 +#: lib/poptI.c:131 msgid "skip files with leading component <path> " msgstr "pøeskoèit soubory s úvodní cestou <cesta> " -#: lib/poptI.c:136 +#: lib/poptI.c:132 msgid "<path>" msgstr "<cesta>" -#: lib/poptI.c:139 +#: lib/poptI.c:135 msgid "short hand for --replacepkgs --replacefiles" msgstr "zkratka pro --replacepkgs --replacefiles" -#: lib/poptI.c:142 +#: lib/poptI.c:138 msgid "upgrade package(s) if already installed" msgstr "aktualizace balíèku jestli¾e je ji¾ nainstalován" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 +#: lib/poptI.c:139 lib/poptI.c:155 lib/poptI.c:236 msgid "<packagefile>+" msgstr "<soubor_balíèku>+" -#: lib/poptI.c:145 +#: lib/poptI.c:141 msgid "print hash marks as package installs (good with -v)" msgstr "bìhem instalace balíèku zobrazit dvojité køí¾ky (dobré s -v)" -#: lib/poptI.c:148 +#: lib/poptI.c:144 msgid "don't verify package architecture" msgstr "nekontrolovat architekturu balíèku" -#: lib/poptI.c:151 +#: lib/poptI.c:147 msgid "don't verify package operating system" msgstr "nekontrolovat operaèní systém balíèku" -#: lib/poptI.c:154 +#: lib/poptI.c:150 msgid "don't check disk space before installing" msgstr "nekontrolovat volné místo na disku pøed instalací" -#: lib/poptI.c:156 +#: lib/poptI.c:152 msgid "install documentation" msgstr "nainstalovat dokumentaci" -#: lib/poptI.c:159 +#: lib/poptI.c:155 #, fuzzy msgid "install package(s)" msgstr "nainstalovat balíèek" -#: lib/poptI.c:161 +#: lib/poptI.c:157 msgid "update the database, but do not modify the filesystem" msgstr "upravit databázi, ale neupravovat systém souborovù" -#: lib/poptI.c:163 +#: lib/poptI.c:159 msgid "do not verify package dependencies" msgstr "nekontrolovat závislosti balíèkù" -#: lib/poptI.c:166 +#: lib/poptI.c:162 msgid "do not reorder package installation to satisfy dependencies" msgstr "pro vyøe¹ení závislostí nemìnit poøadí instalace balíèkù" -#: lib/poptI.c:171 +#: lib/poptI.c:167 msgid "do not suggest missing dependency resolution(s)" msgstr "" -#: lib/poptI.c:178 +#: lib/poptI.c:174 #, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "nespou¹tìt ¾ádné skripty (jsou-li nìjaké)" -#: lib/poptI.c:181 +#: lib/poptI.c:177 #, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "nespou¹tìt ¾ádné skripty (jsou-li nìjaké)" -#: lib/poptI.c:184 +#: lib/poptI.c:180 #, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "nespou¹tìt ¾ádné skripty (jsou-li nìjaké)" -#: lib/poptI.c:187 +#: lib/poptI.c:183 #, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "nespou¹tìt ¾ádné skripty (jsou-li nìjaké)" -#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy msgid "don't verify package digest(s)" msgstr "nekontrolovat MD5 souborù v balíèku" -#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy msgid "don't verify package signature(s)" msgstr "ovìøit podpis v balíèku" -#: lib/poptI.c:196 +#: lib/poptI.c:192 msgid "do not execute any scriptlet(s) triggered by this package" msgstr "nespou¹tìt ¾ádné skripty aktivované tímto balíèkem" -#: lib/poptI.c:199 +#: lib/poptI.c:195 #, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "nespou¹tìt ¾ádné skripty urèené pro balíèky" -#: lib/poptI.c:202 +#: lib/poptI.c:198 #, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "nespou¹tìt ¾ádné instalaèní skripty" -#: lib/poptI.c:205 +#: lib/poptI.c:201 #, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "nespou¹tìt ¾ádné instalaèní skripty" -#: lib/poptI.c:208 +#: lib/poptI.c:204 #, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "nespou¹tìt ¾ádné instalaèní skripty" -#: lib/poptI.c:212 +#: lib/poptI.c:208 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1833,48 +1833,48 @@ msgstr "" "aktualizovat na starou verzi balíèku (--force to dìlá pøi aktualizacích " "automaticky)" -#: lib/poptI.c:216 +#: lib/poptI.c:212 msgid "print percentages as package installs" msgstr "bìhem instalace balíèku zobrazit procenta" -#: lib/poptI.c:218 +#: lib/poptI.c:214 msgid "relocate the package to <dir>, if relocatable" msgstr "pøemístit soubory do <adr>, jsou-li pøemístitelné" -#: lib/poptI.c:221 +#: lib/poptI.c:217 msgid "relocate files from path <old> to <new>" msgstr "pøemístit soubory ze <staré_cesty> do <nové_cesty>" -#: lib/poptI.c:222 +#: lib/poptI.c:218 msgid "<old>=<new>" msgstr "<stará_cesta>=<nová_cesta>" -#: lib/poptI.c:225 +#: lib/poptI.c:221 msgid "save erased package files by repackaging" msgstr "uchovat smazané soubory pomocí pøebalení" -#: lib/poptI.c:228 +#: lib/poptI.c:224 msgid "install even if the package replaces installed files" msgstr "instalovat, i kdy¾ balíèek pøepí¹e existující soubory" -#: lib/poptI.c:231 +#: lib/poptI.c:227 msgid "reinstall if the package is already present" msgstr "pøeinstalovat, i kdy¾ je ji¾ balíèek pøítomen" -#: lib/poptI.c:233 +#: lib/poptI.c:229 #, fuzzy msgid "deinstall new, reinstall old, package(s), back to <date>" msgstr "odinstalovat nové balíèky, reinstalovat staré balíèky zpìt do data" -#: lib/poptI.c:234 +#: lib/poptI.c:230 msgid "<date>" msgstr "<datum>" -#: lib/poptI.c:236 +#: lib/poptI.c:232 msgid "don't install, but tell if it would work or not" msgstr "neinstalovat ale sdìlit, zda-li by to fungovalo èi nikoli" -#: lib/poptI.c:239 +#: lib/poptI.c:235 msgid "upgrade package(s)" msgstr "aktualizace balíèku" @@ -2268,96 +2268,96 @@ msgstr "(chybí stav) " msgid "package has neither file owner or id lists\n" msgstr "balíèek nemá vlastníka souboru ani seznamy id\n" -#: lib/query.c:463 +#: lib/query.c:464 #, c-format msgid "can't query %s: %s\n" msgstr "nemohu provést dotaz %s: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/query.c:618 lib/query.c:656 lib/rpminstall.c:352 lib/rpminstall.c:494 #: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "otevøení %s selhalo: %s\n" -#: lib/query.c:633 +#: lib/query.c:634 #, c-format msgid "query of %s failed\n" msgstr "dotaz na %s se nezdaøil\n" -#: lib/query.c:639 +#: lib/query.c:640 msgid "old format source packages cannot be queried\n" msgstr "nelze provést dotaz na zdrojové balíèky starého formátu\n" -#: lib/query.c:665 lib/rpminstall.c:507 +#: lib/query.c:666 lib/rpminstall.c:507 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: Fread selhalo: %s\n" -#: lib/query.c:709 +#: lib/query.c:710 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "dotaz na spec soubor %s selhal, nemohu parsovat\n" -#: lib/query.c:730 +#: lib/query.c:731 msgid "no packages\n" msgstr "¾ádné balíèky\n" -#: lib/query.c:750 +#: lib/query.c:751 #, c-format msgid "group %s does not contain any packages\n" msgstr "skupina %s neobsahuje ¾ádné balíèky\n" -#: lib/query.c:760 +#: lib/query.c:761 #, c-format msgid "no package triggers %s\n" msgstr "¾ádný balíèek neaktivuje %s\n" -#: lib/query.c:774 lib/query.c:796 lib/query.c:817 lib/query.c:852 +#: lib/query.c:775 lib/query.c:797 lib/query.c:818 lib/query.c:853 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "Nemohu èíst %s: %s.\n" -#: lib/query.c:784 lib/query.c:802 lib/query.c:827 lib/query.c:857 +#: lib/query.c:785 lib/query.c:803 lib/query.c:828 lib/query.c:858 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "¾ádný balíèek neaktivuje %s\n" -#: lib/query.c:868 +#: lib/query.c:869 #, c-format msgid "no package requires %s\n" msgstr "¾ádný balíèek nevy¾aduje %s\n" -#: lib/query.c:879 +#: lib/query.c:880 #, c-format msgid "no package provides %s\n" msgstr "¾ádný balíèek neposkytuje %s\n" -#: lib/query.c:913 +#: lib/query.c:914 #, c-format msgid "file %s: %s\n" msgstr "soubor %s: %s\n" -#: lib/query.c:917 +#: lib/query.c:918 #, c-format msgid "file %s is not owned by any package\n" msgstr "soubor %s nevlastní ¾ádný balíèek\n" -#: lib/query.c:944 +#: lib/query.c:945 #, c-format msgid "invalid package number: %s\n" msgstr "neplatné èíslo balíèku: %s\n" -#: lib/query.c:947 +#: lib/query.c:948 #, c-format msgid "package record number: %u\n" msgstr "záznam balíèku èíslo: %u\n" -#: lib/query.c:952 +#: lib/query.c:953 #, c-format msgid "record %u could not be read\n" msgstr "záznam %d nelze pøeèíst\n" -#: lib/query.c:963 lib/rpminstall.c:675 +#: lib/query.c:964 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "balíèek %s není nainstalován\n" @@ -2666,141 +2666,141 @@ msgstr "Nemohu otevøít %s pro ètení: %s.\n" msgid "cannot open Packages database in %s\n" msgstr "nemohu otevøít databázi balíèkù v %s\n" -#: lib/signature.c:123 +#: lib/signature.c:124 msgid "file is not regular -- skipping size check\n" msgstr "není obyèejný soubor -- pøeskakuji kontrolu velikosti\n" -#: lib/signature.c:132 +#: lib/signature.c:142 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" "Pøedpokl. délka: %12d = hlavièka(%d)+signatura(%d)+výplò(%d)+data(%d)\n" -#: lib/signature.c:137 +#: lib/signature.c:147 #, c-format msgid " Actual size: %12d\n" msgstr "Aktuální délka: %12d\n" -#: lib/signature.c:157 +#: lib/signature.c:167 msgid "No signature\n" msgstr "Chybí podpis\n" -#: lib/signature.c:161 +#: lib/signature.c:171 msgid "Old PGP signature\n" msgstr "Starý PGP podpis\n" -#: lib/signature.c:172 +#: lib/signature.c:182 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "Starý (pouze interní) podpis! Jak jste to získali!?\n" -#: lib/signature.c:226 +#: lib/signature.c:232 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "Podpisu: velikost(%d)+vata(%d)\n" -#: lib/signature.c:305 lib/signature.c:402 lib/signature.c:669 -#: lib/signature.c:702 +#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675 +#: lib/signature.c:708 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Nemohu spustit %s: %s\n" -#: lib/signature.c:321 +#: lib/signature.c:327 msgid "pgp failed\n" msgstr "pgp selhalo\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:328 +#: lib/signature.c:334 msgid "pgp failed to write signature\n" msgstr "pgp selhalo pøi zápisu podpisu\n" -#: lib/signature.c:333 +#: lib/signature.c:339 #, c-format msgid "PGP sig size: %d\n" msgstr "Velikost podpisu PGP: %d\n" -#: lib/signature.c:347 lib/signature.c:445 +#: lib/signature.c:353 lib/signature.c:451 msgid "unable to read the signature\n" msgstr "nemohu èíst podpis\n" -#: lib/signature.c:352 +#: lib/signature.c:358 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "Pøeèteno %d bajtù PGP podpisu\n" -#: lib/signature.c:419 +#: lib/signature.c:425 msgid "gpg failed\n" msgstr "gpg selhalo\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:426 +#: lib/signature.c:432 msgid "gpg failed to write signature\n" msgstr "gpg selhalo pøi zápisu podpisu\n" -#: lib/signature.c:431 +#: lib/signature.c:437 #, c-format msgid "GPG sig size: %d\n" msgstr "Velikost GPG podpisu: %d\n" -#: lib/signature.c:450 +#: lib/signature.c:456 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "Pøeèteno %d bajtù GPG podpisu\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:707 lib/signature.c:758 +#: lib/signature.c:713 lib/signature.c:764 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "©patná %%_signature spec v souboru maker\n" -#: lib/signature.c:737 +#: lib/signature.c:743 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "Musíte nastavit \"%%_gpg_name\" ve svém makro souboru\n" -#: lib/signature.c:750 +#: lib/signature.c:756 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "Musíte nastavit \"%%_pgp_name\" ve svém makro souboru\n" -#: lib/signature.c:794 +#: lib/signature.c:800 #, fuzzy msgid "Header+Payload size: " msgstr "Velikost hlavièky je pøili¹ velká" -#: lib/signature.c:830 +#: lib/signature.c:836 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:879 +#: lib/signature.c:885 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1066 +#: lib/signature.c:1072 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "vynechat pøípadné MD5 souèty" -#: lib/signature.c:1176 +#: lib/signature.c:1182 msgid "Header " msgstr "" -#: lib/signature.c:1177 +#: lib/signature.c:1183 #, fuzzy msgid "V3 DSA signature: " msgstr "Chybí podpis\n" -#: lib/signature.c:1252 +#: lib/signature.c:1258 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1279 +#: lib/signature.c:1285 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1283 +#: lib/signature.c:1289 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Podpisu: velikost(%d)+vata(%d)\n" @@ -2835,12 +2835,12 @@ msgstr "Nevyøe¹ené závislosti pro %s-%s-%s: " msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "%s-%s-%s: kontrola digestu v hlavièce selhala\n" -#: rpmdb/db1.c:98 rpmdb/db3.c:100 +#: rpmdb/db1.c:98 rpmdb/db3.c:98 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "db%d chyba (%d) z %s: %s\n" -#: rpmdb/db1.c:101 rpmdb/db3.c:103 +#: rpmdb/db1.c:101 rpmdb/db3.c:101 #, c-format msgid "db%d error(%d): %s\n" msgstr "db%d chyba (%d): %s\n" @@ -2884,70 +2884,70 @@ msgstr "otevírám db soubor %s mode 0x%x\n" msgid "cannot get %s lock on database\n" msgstr "nemohu vytvoøit zámek %s na databázi\n" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "exclusive" msgstr "výhradní" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "shared" msgstr "sdílený" -#: rpmdb/db3.c:129 +#: rpmdb/db3.c:127 #, c-format msgid "closed db environment %s/%s\n" msgstr "uzavøeno DB prostøedí %s/%s\n" -#: rpmdb/db3.c:147 +#: rpmdb/db3.c:145 #, c-format msgid "removed db environment %s/%s\n" msgstr "odstranìno db prostøedí %s/%s\n" -#: rpmdb/db3.c:187 +#: rpmdb/db3.c:185 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "otevírám db environment %s/%s %s\n" -#: rpmdb/db3.c:711 +#: rpmdb/db3.c:614 #, c-format msgid "closed db index %s/%s\n" msgstr "uzavøen db index %s/%s\n" -#: rpmdb/db3.c:778 +#: rpmdb/db3.c:681 #, c-format msgid "verified db index %s/%s\n" msgstr "uzavøen db index %s/%s\n" -#: rpmdb/db3.c:1001 +#: rpmdb/db3.c:903 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "otevírám db index %s/%s %s mode=0x%x\n" -#: rpmdb/db3.c:1226 +#: rpmdb/db3.c:1119 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "nemohu zamknout databázi zámkem %s v %s/%s\n" -#: rpmdb/db3.c:1232 +#: rpmdb/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "uzamèen db index %s/%s\n" -#: rpmdb/dbconfig.c:404 +#: rpmdb/dbconfig.c:400 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "neznámá db volba: \"%s\" ignorována\n" -#: rpmdb/dbconfig.c:442 +#: rpmdb/dbconfig.c:438 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s má neplatnou numerickou hodnotu, pøeskoèeno\n" -#: rpmdb/dbconfig.c:451 +#: rpmdb/dbconfig.c:447 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s má moc velkou nebo moc malou long hodnotu, pøeskoèeno\n" -#: rpmdb/dbconfig.c:460 +#: rpmdb/dbconfig.c:456 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "%s má pøíli¹ velkou nebo moc malou celoèíselnou hodnotu, pøeskoèeno\n" @@ -3059,157 +3059,150 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "generovat hlavièky kompatibilní RPM verze 2 a 3" #. @-modfilesys@ -#: rpmdb/rpmdb.c:163 +#: rpmdb/rpmdb.c:165 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: neznámá znaèka: \"%s\" ignorována\n" -#: rpmdb/rpmdb.c:440 +#: rpmdb/rpmdb.c:258 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "nemohu otevøít index %s pøi pou¾ívání db%d - %s (%d)\n" -#: rpmdb/rpmdb.c:462 +#: rpmdb/rpmdb.c:280 #, c-format msgid "cannot open %s index\n" msgstr "nemohu otevøít index %s\n" -#: rpmdb/rpmdb.c:554 +#: rpmdb/rpmdb.c:379 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "chyba(%d) pøi získávání záznamu \"%s\" z indexu %s\n" -#: rpmdb/rpmdb.c:685 +#: rpmdb/rpmdb.c:516 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "chyba(%d) pøi ukládání záznamu %s do %s\n" -#: rpmdb/rpmdb.c:695 +#: rpmdb/rpmdb.c:529 #, c-format msgid "error(%d) removing record %s from %s\n" msgstr "chyba(%d) pøi odstraòování záznamu %s z %s\n" -#: rpmdb/rpmdb.c:954 +#: rpmdb/rpmdb.c:788 msgid "no dbpath has been set\n" msgstr "nebyla nastavena dbpath\n" -#: rpmdb/rpmdb.c:1102 -msgid "" -"old format database is present; use --rebuilddb to generate a new format " -"database\n" -msgstr "" -"databáze je ve starém formátu; pou¾ijte --rebuilddb pro pøevod do nového\n" - #. error -#: rpmdb/rpmdb.c:1367 +#: rpmdb/rpmdb.c:1174 #, c-format msgid "error(%d) counting packages\n" msgstr "chyba(%d) pøi poèítání balíèkù\n" -#: rpmdb/rpmdb.c:2146 rpmdb/rpmdb.c:3507 +#: rpmdb/rpmdb.c:1971 rpmdb/rpmdb.c:3357 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "záznam èíslo %d v databázi je chybný -- vynechávám.\n" -#: rpmdb/rpmdb.c:2199 +#: rpmdb/rpmdb.c:2034 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "rpmdb: poru¹ená polo¾ka hlavièky #%u, pøeskakuji.\n" -#: rpmdb/rpmdb.c:2478 +#: rpmdb/rpmdb.c:2306 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: nemohu èíst hlavièku na adrese 0x%x\n" -#: rpmdb/rpmdb.c:2639 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstraòuji \"%s\" z indexu %s.\n" -#: rpmdb/rpmdb.c:2643 +#: rpmdb/rpmdb.c:2476 #, c-format msgid "removing %d entries from %s index.\n" msgstr "odstraòuji %d polo¾ek z indexu %s.\n" -#: rpmdb/rpmdb.c:2813 +#: rpmdb/rpmdb.c:2663 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "chyba(%d) pøi alokaci nové instance balíèku\n" -#: rpmdb/rpmdb.c:3008 +#: rpmdb/rpmdb.c:2858 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "pøidávám \"%s\" do indexu %s\n" -#: rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:2862 #, c-format msgid "adding %d entries to %s index.\n" msgstr "pøidávám %d polo¾ek do indexu %s.\n" -#: rpmdb/rpmdb.c:3393 +#: rpmdb/rpmdb.c:3243 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "odstraòuji %s po úspì¹ném znovusestavení db3.\n" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3276 msgid "no dbpath has been set" msgstr "nebyla nastavena dbpath" -#: rpmdb/rpmdb.c:3453 +#: rpmdb/rpmdb.c:3303 #, c-format msgid "rebuilding database %s into %s\n" msgstr "databázi %s pøevádím do %s\n" -#: rpmdb/rpmdb.c:3457 +#: rpmdb/rpmdb.c:3307 #, c-format msgid "temporary database %s already exists\n" msgstr "doèasná databáze %s ji¾ existuje\n" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3313 #, c-format msgid "creating directory %s\n" msgstr "vytváøím adresáø %s\n" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3315 #, c-format msgid "creating directory %s: %s\n" msgstr "vytváøím adresáø %s: %s\n" -#: rpmdb/rpmdb.c:3472 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "opening old database with dbapi %d\n" msgstr "otevírám starou databázi s dbapi %d\n" -#: rpmdb/rpmdb.c:3483 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "opening new database with dbapi %d\n" msgstr "otevírám novou databázi s dbapi %d\n" -#: rpmdb/rpmdb.c:3547 +#: rpmdb/rpmdb.c:3397 #, c-format msgid "cannot add record originally at %u\n" msgstr "nemohu pøidat záznam - pùvodnì u %d\n" -#: rpmdb/rpmdb.c:3565 +#: rpmdb/rpmdb.c:3415 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "databázi nelze zvovu vytvoøit; pùvodní databáze zùstává na svém místì\n" -#: rpmdb/rpmdb.c:3573 +#: rpmdb/rpmdb.c:3423 msgid "failed to replace old database with new database!\n" msgstr "starou databázi nelze nahradit novou databází!\n" -#: rpmdb/rpmdb.c:3575 +#: rpmdb/rpmdb.c:3425 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "pro obnovení nahraïte soubory v %s soubory z %s" -#: rpmdb/rpmdb.c:3585 +#: rpmdb/rpmdb.c:3435 #, c-format msgid "removing directory %s\n" msgstr "ma¾u adresáø %s\n" -#: rpmdb/rpmdb.c:3587 +#: rpmdb/rpmdb.c:3437 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "nemohu odstranit adresáø %s: %s\n" @@ -3421,6 +3414,12 @@ msgstr "url port musí být èíslo\n" msgid "failed to create %s: %s\n" msgstr "nemohu vytvoøit %s: %s\n" +#~ msgid "" +#~ "old format database is present; use --rebuilddb to generate a new format " +#~ "database\n" +#~ msgstr "" +#~ "databáze je ve starém formátu; pou¾ijte --rebuilddb pro pøevod do nového\n" + #, fuzzy #~ msgid "don't verify signature(s)" #~ msgstr "nekontrolovat cesty symbolických linek" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-14 17:43-0400\n" +"POT-Creation-Date: 2002-05-01 18:05-0400\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n" "Language-Team: Danish <dansk@klid.dk>\n" @@ -115,7 +115,7 @@ msgstr "<kmd>" msgid "use <dir> as the top level directory" msgstr "brug <katalog> som topniveau-katalog" -#: rpmqv.c:125 lib/poptI.c:219 +#: rpmqv.c:125 lib/poptI.c:215 msgid "<dir>" msgstr "<katalog>" @@ -1440,77 +1440,77 @@ msgstr " mislykkedes - " msgid "package %s was already added, replacing with %s\n" msgstr "pakken %s er allerede installeret" -#: lib/depends.c:367 +#: lib/depends.c:380 msgid "(cached)" msgstr "" -#: lib/depends.c:392 +#: lib/depends.c:405 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s JA (rpmrc tilfører)\n" -#: lib/depends.c:408 +#: lib/depends.c:421 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s JA (rpmlib tilfører)\n" -#: lib/depends.c:429 +#: lib/depends.c:442 #, fuzzy msgid "(db files)" msgstr "ugyldig db-fil %s\n" -#: lib/depends.c:441 +#: lib/depends.c:454 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s JA (db tilfører)\n" -#: lib/depends.c:454 +#: lib/depends.c:467 #, fuzzy msgid "(db package)" msgstr "ingen pakker\n" -#: lib/depends.c:762 +#: lib/depends.c:783 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:903 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "fjerne %s-%s-%s \"%s\" fra tsort-relationer.\n" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1171 msgid "========== recording tsort relations\n" msgstr "========== gemmer tsort-relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1277 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1370 msgid "========== successors only (presentation order)\n" msgstr "========== kun efterfølgere (præsentationsrækkefølge)\n" -#: lib/depends.c:1419 +#: lib/depends.c:1440 msgid "LOOP:\n" msgstr "LØKKE:\n" -#: lib/depends.c:1454 +#: lib/depends.c:1475 msgid "========== continuing tsort ...\n" msgstr "========== fortsætter tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1480 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2978 rpmdb/header.c:2999 rpmdb/header.c:3021 +#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 msgid "(not a number)" msgstr "(ikke et tal)" @@ -1647,37 +1647,37 @@ msgstr "" msgid "%s: Fread failed: %s\n" msgstr "%s: Fread mislykkedes: %s\n" -#: lib/poptI.c:53 +#: lib/poptI.c:49 msgid "exclude paths must begin with a /" msgstr "udeladte stier skal begynde med et /" -#: lib/poptI.c:65 +#: lib/poptI.c:61 msgid "relocations must begin with a /" msgstr "omrokeringer skal starte med et /" -#: lib/poptI.c:67 +#: lib/poptI.c:63 msgid "relocations must contain a =" msgstr "omrokeringer skal indeholde et =" -#: lib/poptI.c:70 +#: lib/poptI.c:66 msgid "relocations must have a / following the =" msgstr "i omrokeringer skal = efterfølges af /" -#: lib/poptI.c:84 +#: lib/poptI.c:80 msgid "rollback takes a time/date stamp argument" msgstr "" -#: lib/poptI.c:91 +#: lib/poptI.c:87 msgid "malformed rollback time/date stamp argument" msgstr "" -#: lib/poptI.c:110 +#: lib/poptI.c:106 msgid "install all files, even configurations which might otherwise be skipped" msgstr "" "installér alle filer -- også konfigurationsfiler, der ellers skulle " "overspringes" -#: lib/poptI.c:114 +#: lib/poptI.c:110 msgid "" "remove all packages which match <package> (normally an error is generated if " "<package> specified multiple packages)" @@ -1685,151 +1685,151 @@ msgstr "" "fjern alle pakker, som passer med <pakke> (normalt ville det medføre en " "fejl, hvis <pakke> angav flere pakker)" -#: lib/poptI.c:120 lib/poptI.c:175 +#: lib/poptI.c:116 lib/poptI.c:171 #, fuzzy msgid "do not execute package scriptlet(s)" msgstr "udfør ingen pakkespecifikke skripter" -#: lib/poptI.c:124 +#: lib/poptI.c:120 msgid "relocate files in non-relocateable package" msgstr "omdirigér filer i ikke-omdirigérbar pakke" -#: lib/poptI.c:127 +#: lib/poptI.c:123 msgid "save erased package files by renaming into sub-directory" msgstr "" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "erase (uninstall) package" msgstr "slet (afinstallér) pakke" -#: lib/poptI.c:130 +#: lib/poptI.c:126 #, fuzzy msgid "<package>+" msgstr "<pakke>" -#: lib/poptI.c:133 +#: lib/poptI.c:129 msgid "do not install documentation" msgstr "installér ikke dokumentation" -#: lib/poptI.c:135 +#: lib/poptI.c:131 msgid "skip files with leading component <path> " msgstr "overspring filer med foranstillet komponent <sti> " -#: lib/poptI.c:136 +#: lib/poptI.c:132 msgid "<path>" msgstr "" -#: lib/poptI.c:139 +#: lib/poptI.c:135 msgid "short hand for --replacepkgs --replacefiles" msgstr "forkortelse for --replacepkgs --replacefiles" -#: lib/poptI.c:142 +#: lib/poptI.c:138 #, fuzzy msgid "upgrade package(s) if already installed" msgstr "opgradér pakke, hvis den allerede er installeret" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 +#: lib/poptI.c:139 lib/poptI.c:155 lib/poptI.c:236 msgid "<packagefile>+" msgstr "<pakkefil>+" -#: lib/poptI.c:145 +#: lib/poptI.c:141 msgid "print hash marks as package installs (good with -v)" msgstr "udlæs #'er efterhånden som pakken installeres (virker sammen med -v)" -#: lib/poptI.c:148 +#: lib/poptI.c:144 msgid "don't verify package architecture" msgstr "tjek ikke pakkens arkitektur" -#: lib/poptI.c:151 +#: lib/poptI.c:147 msgid "don't verify package operating system" msgstr "tjek ikke pakkens operativsystem" -#: lib/poptI.c:154 +#: lib/poptI.c:150 msgid "don't check disk space before installing" msgstr "tjek ikke om der er diskplads, før der installeres" -#: lib/poptI.c:156 +#: lib/poptI.c:152 msgid "install documentation" msgstr "installér dokumentation" -#: lib/poptI.c:159 +#: lib/poptI.c:155 #, fuzzy msgid "install package(s)" msgstr "installér pakke" -#: lib/poptI.c:161 +#: lib/poptI.c:157 msgid "update the database, but do not modify the filesystem" msgstr "opdatér databasen, men rør ikke filsystemet" -#: lib/poptI.c:163 +#: lib/poptI.c:159 msgid "do not verify package dependencies" msgstr "undlad at tjekke pakkers afhængighedskrav" -#: lib/poptI.c:166 +#: lib/poptI.c:162 msgid "do not reorder package installation to satisfy dependencies" msgstr "" "ændr ikke pakkernes installationsrækkefølge for at opfylde afhængigheder" -#: lib/poptI.c:171 +#: lib/poptI.c:167 msgid "do not suggest missing dependency resolution(s)" msgstr "" -#: lib/poptI.c:178 +#: lib/poptI.c:174 #, fuzzy, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "udfør ikke eventuelle skripter" -#: lib/poptI.c:181 +#: lib/poptI.c:177 #, fuzzy, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "udfør ikke eventuelle skripter" -#: lib/poptI.c:184 +#: lib/poptI.c:180 #, fuzzy, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "udfør ikke eventuelle skripter" -#: lib/poptI.c:187 +#: lib/poptI.c:183 #, fuzzy, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "udfør ikke eventuelle skripter" -#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy msgid "don't verify package digest(s)" msgstr "verificér ikke filerne i pakke" -#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy msgid "don't verify package signature(s)" msgstr "verificér pakkesignatur" -#: lib/poptI.c:196 +#: lib/poptI.c:192 #, fuzzy msgid "do not execute any scriptlet(s) triggered by this package" msgstr "udfør ikke småskripter, der måtte udløses af denne pakke" -#: lib/poptI.c:199 +#: lib/poptI.c:195 #, fuzzy, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "udfør ingen pakkespecifikke skripter" -#: lib/poptI.c:202 +#: lib/poptI.c:198 #, fuzzy, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "udfør ingen installations-småskripter" -#: lib/poptI.c:205 +#: lib/poptI.c:201 #, fuzzy, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "udfør ingen installations-småskripter" -#: lib/poptI.c:208 +#: lib/poptI.c:204 #, fuzzy, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "udfør ingen installations-småskripter" -#: lib/poptI.c:212 +#: lib/poptI.c:208 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1837,49 +1837,49 @@ msgstr "" "opgradér til en ældre version af pakken (--force gør ikke dette automatisk " "ved opgraderinger)" -#: lib/poptI.c:216 +#: lib/poptI.c:212 msgid "print percentages as package installs" msgstr "vis procenter efterhånden som pakken installeres" -#: lib/poptI.c:218 +#: lib/poptI.c:214 msgid "relocate the package to <dir>, if relocatable" msgstr "omdirigér pakken til <katalog>, hvis omdirigérbar" -#: lib/poptI.c:221 +#: lib/poptI.c:217 #, fuzzy msgid "relocate files from path <old> to <new>" msgstr "omdirigér filer fra <gammelsti> til <nysti>" -#: lib/poptI.c:222 +#: lib/poptI.c:218 #, fuzzy msgid "<old>=<new>" msgstr "<gammelsti>=<nysti>" -#: lib/poptI.c:225 +#: lib/poptI.c:221 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:228 +#: lib/poptI.c:224 msgid "install even if the package replaces installed files" msgstr "intallér selvom pakken erstatter installerede filer" -#: lib/poptI.c:231 +#: lib/poptI.c:227 msgid "reinstall if the package is already present" msgstr "geninstallér hvis pakken allerede er installeret" -#: lib/poptI.c:233 +#: lib/poptI.c:229 msgid "deinstall new, reinstall old, package(s), back to <date>" msgstr "" -#: lib/poptI.c:234 +#: lib/poptI.c:230 msgid "<date>" msgstr "" -#: lib/poptI.c:236 +#: lib/poptI.c:232 msgid "don't install, but tell if it would work or not" msgstr "installér ikke, men fortæl om det ville lykkes eller ej" -#: lib/poptI.c:239 +#: lib/poptI.c:235 #, fuzzy msgid "upgrade package(s)" msgstr "opgradér pakke" @@ -2285,96 +2285,96 @@ msgstr "(ingen status)" msgid "package has neither file owner or id lists\n" msgstr "pakke har hverken filejerskabs- eller id-lister\n" -#: lib/query.c:463 +#: lib/query.c:464 #, c-format msgid "can't query %s: %s\n" msgstr "kunne ikke forespørge %s: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/query.c:618 lib/query.c:656 lib/rpminstall.c:352 lib/rpminstall.c:494 #: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "åbning af %s mislykkedes %s\n" -#: lib/query.c:633 +#: lib/query.c:634 #, c-format msgid "query of %s failed\n" msgstr "forespørgsel af %s mislykkedes\n" -#: lib/query.c:639 +#: lib/query.c:640 msgid "old format source packages cannot be queried\n" msgstr "pakke med gammelt kildeformat kan ikke forespørges\n" -#: lib/query.c:665 lib/rpminstall.c:507 +#: lib/query.c:666 lib/rpminstall.c:507 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: læs manifest mislykkedes: %s\n" -#: lib/query.c:709 +#: lib/query.c:710 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "forespørgsel af spec-fil %s mislykkedes, kunne ikke tolkes\n" -#: lib/query.c:730 +#: lib/query.c:731 msgid "no packages\n" msgstr "ingen pakker\n" -#: lib/query.c:750 +#: lib/query.c:751 #, c-format msgid "group %s does not contain any packages\n" msgstr "gruppe %s indeholder ingen pakker\n" -#: lib/query.c:760 +#: lib/query.c:761 #, c-format msgid "no package triggers %s\n" msgstr "ingen pakker udløser %s\n" -#: lib/query.c:774 lib/query.c:796 lib/query.c:817 lib/query.c:852 +#: lib/query.c:775 lib/query.c:797 lib/query.c:818 lib/query.c:853 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "Kunne ikke læse %s: %s.\n" -#: lib/query.c:784 lib/query.c:802 lib/query.c:827 lib/query.c:857 +#: lib/query.c:785 lib/query.c:803 lib/query.c:828 lib/query.c:858 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "ingen pakker udløser %s\n" -#: lib/query.c:868 +#: lib/query.c:869 #, c-format msgid "no package requires %s\n" msgstr "ingen pakker kræver %s\n" -#: lib/query.c:879 +#: lib/query.c:880 #, c-format msgid "no package provides %s\n" msgstr "ingen pakker tilfører %s\n" -#: lib/query.c:913 +#: lib/query.c:914 #, c-format msgid "file %s: %s\n" msgstr "fil %s: %s\n" -#: lib/query.c:917 +#: lib/query.c:918 #, c-format msgid "file %s is not owned by any package\n" msgstr "filen %s tilhører ingen pakke\n" -#: lib/query.c:944 +#: lib/query.c:945 #, c-format msgid "invalid package number: %s\n" msgstr "ugyldigt pakkenummer: %s\n" -#: lib/query.c:947 +#: lib/query.c:948 #, c-format msgid "package record number: %u\n" msgstr "pakkens post-nummer: %u\n" -#: lib/query.c:952 +#: lib/query.c:953 #, fuzzy, c-format msgid "record %u could not be read\n" msgstr "post %d kunne ikke læses\n" -#: lib/query.c:963 lib/rpminstall.c:675 +#: lib/query.c:964 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "pakken %s er ikke installeret\n" @@ -2686,140 +2686,140 @@ msgstr "Kunne ikke åbne %s for læsning: %s.\n" msgid "cannot open Packages database in %s\n" msgstr "kunne ikke åbne Packages-database i %s\n" -#: lib/signature.c:123 +#: lib/signature.c:124 msgid "file is not regular -- skipping size check\n" msgstr "filen er ikke regulær -- overspringer størrelsestjek\n" -#: lib/signature.c:132 +#: lib/signature.c:142 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "Forventet størrelse: %12d = indled(%d)+sign(%d)+fyld(%d)+data(%d)\n" -#: lib/signature.c:137 +#: lib/signature.c:147 #, c-format msgid " Actual size: %12d\n" msgstr " Faktisk størrelse: %12d\n" -#: lib/signature.c:157 +#: lib/signature.c:167 msgid "No signature\n" msgstr "Ingen signatur\n" -#: lib/signature.c:161 +#: lib/signature.c:171 msgid "Old PGP signature\n" msgstr "Gammel PGP-signatur\n" -#: lib/signature.c:172 +#: lib/signature.c:182 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "Gammel (internt brug) signatur! Hvordan fik du fingre i den!?\n" -#: lib/signature.c:226 +#: lib/signature.c:232 #, fuzzy, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "Signaturstørrelse: %d\n" -#: lib/signature.c:305 lib/signature.c:402 lib/signature.c:669 -#: lib/signature.c:702 +#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675 +#: lib/signature.c:708 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Kunne ikke udføre %s: %s\n" -#: lib/signature.c:321 +#: lib/signature.c:327 msgid "pgp failed\n" msgstr "pgp fejlede\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:328 +#: lib/signature.c:334 msgid "pgp failed to write signature\n" msgstr "pgp kunne ikke skrive signatur\n" -#: lib/signature.c:333 +#: lib/signature.c:339 #, c-format msgid "PGP sig size: %d\n" msgstr "PGP-signaturstørrelse: %d\n" -#: lib/signature.c:347 lib/signature.c:445 +#: lib/signature.c:353 lib/signature.c:451 msgid "unable to read the signature\n" msgstr "kunne ikke læse signaturen\n" -#: lib/signature.c:352 +#: lib/signature.c:358 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "Fik %d byte af PGP-signatur\n" -#: lib/signature.c:419 +#: lib/signature.c:425 msgid "gpg failed\n" msgstr "gpg fejlede\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:426 +#: lib/signature.c:432 msgid "gpg failed to write signature\n" msgstr "gpg kunne ikke skrive signaturen\n" -#: lib/signature.c:431 +#: lib/signature.c:437 #, c-format msgid "GPG sig size: %d\n" msgstr "GPG-signaturstørrelse: %d\n" -#: lib/signature.c:450 +#: lib/signature.c:456 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "Fik %d byte GPG-signatur\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:707 lib/signature.c:758 +#: lib/signature.c:713 lib/signature.c:764 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "Ugyldig angivelse af '%%_signature'-spec i makrofil.\n" -#: lib/signature.c:737 +#: lib/signature.c:743 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "Du skal angive \"%%_gpg_name\" i din makrofil\n" -#: lib/signature.c:750 +#: lib/signature.c:756 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "Du skal angive \"%%_pgp_name\" i din makrofil\n" -#: lib/signature.c:794 +#: lib/signature.c:800 #, fuzzy msgid "Header+Payload size: " msgstr "Hovedstørrelse er for stor" -#: lib/signature.c:830 +#: lib/signature.c:836 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:879 +#: lib/signature.c:885 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1066 +#: lib/signature.c:1072 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "overspring eventuelle MD5-signaturer" -#: lib/signature.c:1176 +#: lib/signature.c:1182 msgid "Header " msgstr "" -#: lib/signature.c:1177 +#: lib/signature.c:1183 #, fuzzy msgid "V3 DSA signature: " msgstr "Ingen signatur\n" -#: lib/signature.c:1252 +#: lib/signature.c:1258 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1279 +#: lib/signature.c:1285 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1283 +#: lib/signature.c:1289 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Signaturfyld : %d\n" @@ -2854,12 +2854,12 @@ msgstr "Ikke-tilfredsstillede afhængighedskrav for %s-%s-%s: " msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:100 +#: rpmdb/db1.c:98 rpmdb/db3.c:98 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "db%d fejl(%d) fra %s: %s\n" -#: rpmdb/db1.c:101 rpmdb/db3.c:103 +#: rpmdb/db1.c:101 rpmdb/db3.c:101 #, c-format msgid "db%d error(%d): %s\n" msgstr "db%d fejl(%d): %s\n" @@ -2902,70 +2902,70 @@ msgstr "åbner db-fil %s modus 0x%x\n" msgid "cannot get %s lock on database\n" msgstr "kunne ikke opnå %s lås på database\n" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "exclusive" msgstr "eksklusiv" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "shared" msgstr "delt" -#: rpmdb/db3.c:129 +#: rpmdb/db3.c:127 #, fuzzy, c-format msgid "closed db environment %s/%s\n" msgstr "lukkede db-miljø %s/%s\n" -#: rpmdb/db3.c:147 +#: rpmdb/db3.c:145 #, fuzzy, c-format msgid "removed db environment %s/%s\n" msgstr "fjernede db-miljø %s/%s\n" -#: rpmdb/db3.c:187 +#: rpmdb/db3.c:185 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "åbner db-miljø %s/%s %s\n" -#: rpmdb/db3.c:711 +#: rpmdb/db3.c:614 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "lukkede db-indeks %s/%s\n" -#: rpmdb/db3.c:778 +#: rpmdb/db3.c:681 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "lukkede db-indeks %s/%s\n" -#: rpmdb/db3.c:1001 +#: rpmdb/db3.c:903 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "åbner db-indeks %s/%s %s mode=0x%x\n" -#: rpmdb/db3.c:1226 +#: rpmdb/db3.c:1119 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "kan ikke opnå %s lås på %s/%s\n" -#: rpmdb/db3.c:1232 +#: rpmdb/db3.c:1125 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "låste db-index %s/%s\n" -#: rpmdb/dbconfig.c:404 +#: rpmdb/dbconfig.c:400 #, fuzzy, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "ukendt db-tilvalg: \"%s\" ignoreret\n" -#: rpmdb/dbconfig.c:442 +#: rpmdb/dbconfig.c:438 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s har ugyldig talværdi, overspringes\n" -#: rpmdb/dbconfig.c:451 +#: rpmdb/dbconfig.c:447 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s har for stor eller lille 'long'-værdi, overspringes\n" -#: rpmdb/dbconfig.c:460 +#: rpmdb/dbconfig.c:456 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "%s har for stor eller lille heltalsværdi, overspringes\n" @@ -3080,161 +3080,153 @@ msgstr "" "generér hoveder, der er kompatible med (gamle) rpm[23]-indpakningsversioner" #. @-modfilesys@ -#: rpmdb/rpmdb.c:163 +#: rpmdb/rpmdb.c:165 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: ukendt mærkenavn: \"%s\" ignoreret\n" -#: rpmdb/rpmdb.c:440 +#: rpmdb/rpmdb.c:258 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "kan ikke åbne '%s'-indeks ved brug af db%d - %s (%d)\n" -#: rpmdb/rpmdb.c:462 +#: rpmdb/rpmdb.c:280 #, c-format msgid "cannot open %s index\n" msgstr "kan ikke åbne '%s'-indeks\n" -#: rpmdb/rpmdb.c:554 +#: rpmdb/rpmdb.c:379 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n" -#: rpmdb/rpmdb.c:685 +#: rpmdb/rpmdb.c:516 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "fejl(%d) ved gemning af post %s i %s\n" -#: rpmdb/rpmdb.c:695 +#: rpmdb/rpmdb.c:529 #, c-format msgid "error(%d) removing record %s from %s\n" msgstr "fejl(%d) ved fjernelse af post %s fra %s\n" -#: rpmdb/rpmdb.c:954 +#: rpmdb/rpmdb.c:788 msgid "no dbpath has been set\n" msgstr "der er ikke sat nogen dbpath\n" -#: rpmdb/rpmdb.c:1102 -msgid "" -"old format database is present; use --rebuilddb to generate a new format " -"database\n" -msgstr "" -"gammelt databaseformat til stede; brug --rebuilddb for at oprette en " -"database med det nye format\n" - #. error -#: rpmdb/rpmdb.c:1367 +#: rpmdb/rpmdb.c:1174 #, c-format msgid "error(%d) counting packages\n" msgstr "fejl(%d) ved optælling af pakker\n" -#: rpmdb/rpmdb.c:2146 rpmdb/rpmdb.c:3507 +#: rpmdb/rpmdb.c:1971 rpmdb/rpmdb.c:3357 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "post nummer %d i databasen er fejlbehæftet -- overspringer.\n" -#: rpmdb/rpmdb.c:2199 +#: rpmdb/rpmdb.c:2034 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2478 +#: rpmdb/rpmdb.c:2306 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: kan ikke læse hoved ved 0x%x\n" -#: rpmdb/rpmdb.c:2639 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "fjerner \"%s\" fra %s-indekset.\n" -#: rpmdb/rpmdb.c:2643 +#: rpmdb/rpmdb.c:2476 #, c-format msgid "removing %d entries from %s index.\n" msgstr "fjerne %d indgange fra %s-indekset.\n" -#: rpmdb/rpmdb.c:2813 +#: rpmdb/rpmdb.c:2663 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "fejl(%d) under allokering af ny pakkeinstans\n" -#: rpmdb/rpmdb.c:3008 +#: rpmdb/rpmdb.c:2858 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" "tilføjer \"%s\" til '%s'-indekset.\n" "\n" -#: rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:2862 #, c-format msgid "adding %d entries to %s index.\n" msgstr "tilføjer %d indgange til '%s'-indekset.\n" -#: rpmdb/rpmdb.c:3393 +#: rpmdb/rpmdb.c:3243 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "fjerner %s efter vellykket genopbygning af db3.\n" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3276 msgid "no dbpath has been set" msgstr "der ikke sat nogen dbpath" -#: rpmdb/rpmdb.c:3453 +#: rpmdb/rpmdb.c:3303 #, c-format msgid "rebuilding database %s into %s\n" msgstr "genopbygger database %s over i %s\n" -#: rpmdb/rpmdb.c:3457 +#: rpmdb/rpmdb.c:3307 #, c-format msgid "temporary database %s already exists\n" msgstr "den midlertidige database %s eksisterer allerede\n" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3313 #, c-format msgid "creating directory %s\n" msgstr "" "opretter kataloget %s\n" "\n" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3315 #, c-format msgid "creating directory %s: %s\n" msgstr "opretter kataloget %s: %s\n" -#: rpmdb/rpmdb.c:3472 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "opening old database with dbapi %d\n" msgstr "åbner gammel database med dbapi %d\n" -#: rpmdb/rpmdb.c:3483 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "opening new database with dbapi %d\n" msgstr "åbner ny database med dbapi %d\n" -#: rpmdb/rpmdb.c:3547 +#: rpmdb/rpmdb.c:3397 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "kunne ikke tilføje posten, der tidligere var ved %d\n" -#: rpmdb/rpmdb.c:3565 +#: rpmdb/rpmdb.c:3415 msgid "failed to rebuild database: original database remains in place\n" msgstr "kunne ikke genopbygge database: original-databasen beholdes\n" -#: rpmdb/rpmdb.c:3573 +#: rpmdb/rpmdb.c:3423 msgid "failed to replace old database with new database!\n" msgstr "kunne ikke erstatte gammel database med ny database!\n" -#: rpmdb/rpmdb.c:3575 +#: rpmdb/rpmdb.c:3425 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "erstat filer i %s med filer fra %s for at genoprette" -#: rpmdb/rpmdb.c:3585 +#: rpmdb/rpmdb.c:3435 #, c-format msgid "removing directory %s\n" msgstr "fjerner kataloget %s\n" -#: rpmdb/rpmdb.c:3587 +#: rpmdb/rpmdb.c:3437 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "kunne ikke fjerne katalog %s: %s\n" @@ -3446,6 +3438,13 @@ msgstr "url-port skal være et tal\n" msgid "failed to create %s: %s\n" msgstr "kunne ikke oprette %s: %s\n" +#~ msgid "" +#~ "old format database is present; use --rebuilddb to generate a new format " +#~ "database\n" +#~ msgstr "" +#~ "gammelt databaseformat til stede; brug --rebuilddb for at oprette en " +#~ "database med det nye format\n" + #, fuzzy #~ msgid "don't verify signature(s)" #~ msgstr "verificér ikke filerne i pakke" @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-14 17:43-0400\n" +"POT-Creation-Date: 2002-05-01 18:05-0400\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n" "Language-Team: German <de@li.org>\n" @@ -157,7 +157,7 @@ msgstr "" msgid "use <dir> as the top level directory" msgstr "<VERZ> als Stammverzeichnis benutzen" -#: rpmqv.c:125 lib/poptI.c:219 +#: rpmqv.c:125 lib/poptI.c:215 msgid "<dir>" msgstr "" @@ -1573,79 +1573,79 @@ msgstr "pgp fehlgeschlagen" msgid "package %s was already added, replacing with %s\n" msgstr "Paket %s ist nicht installiert\n" -#: lib/depends.c:367 +#: lib/depends.c:380 msgid "(cached)" msgstr "" -#: lib/depends.c:392 +#: lib/depends.c:405 #, fuzzy msgid "(rpmrc provides)" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:408 +#: lib/depends.c:421 #, fuzzy msgid "(rpmlib provides)" msgstr "die Datei »%s« gehört zu keinem Paket\n" # , c-format -#: lib/depends.c:429 +#: lib/depends.c:442 #, fuzzy msgid "(db files)" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/depends.c:441 +#: lib/depends.c:454 #, fuzzy msgid "(db provides)" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:454 +#: lib/depends.c:467 #, fuzzy msgid "(db package)" msgstr "Anfrage an alle Pakete" -#: lib/depends.c:762 +#: lib/depends.c:783 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" # FIXME -#: lib/depends.c:882 +#: lib/depends.c:903 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1171 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1277 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1370 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1440 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1475 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1480 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2978 rpmdb/header.c:2999 rpmdb/header.c:3021 +#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 msgid "(not a number)" msgstr "(keine Zahl)" @@ -1789,38 +1789,38 @@ msgstr "" msgid "%s: Fread failed: %s\n" msgstr "%s: »readLead« fehlgeschlagen\n" -#: lib/poptI.c:53 +#: lib/poptI.c:49 #, fuzzy msgid "exclude paths must begin with a /" msgstr "Verschiebungen müssen mit einem »/« beginnen" -#: lib/poptI.c:65 +#: lib/poptI.c:61 msgid "relocations must begin with a /" msgstr "Verschiebungen müssen mit einem »/« beginnen" -#: lib/poptI.c:67 +#: lib/poptI.c:63 msgid "relocations must contain a =" msgstr "Verschiebungen müssen ein »=« beinhalten" -#: lib/poptI.c:70 +#: lib/poptI.c:66 msgid "relocations must have a / following the =" msgstr "bei Verschiebungen muss ein »/« dem »=« folgen" -#: lib/poptI.c:84 +#: lib/poptI.c:80 msgid "rollback takes a time/date stamp argument" msgstr "" -#: lib/poptI.c:91 +#: lib/poptI.c:87 msgid "malformed rollback time/date stamp argument" msgstr "" -#: lib/poptI.c:110 +#: lib/poptI.c:106 msgid "install all files, even configurations which might otherwise be skipped" msgstr "" "alle Dateien installieren, auch die config-Dateien, die sonst übergangen " "würden" -#: lib/poptI.c:114 +#: lib/poptI.c:110 msgid "" "remove all packages which match <package> (normally an error is generated if " "<package> specified multiple packages)" @@ -1828,153 +1828,153 @@ msgstr "" "Alle Pakete entfernen, die mit <PAKET> übereinstimmen (normalerweise wird " "ein Fehler angezeigt, wenn <PAKET> mehrere Pakete bezeichnet)" -#: lib/poptI.c:120 lib/poptI.c:175 +#: lib/poptI.c:116 lib/poptI.c:171 #, fuzzy msgid "do not execute package scriptlet(s)" msgstr "Keine paketspezifischen Skripte ausführen" -#: lib/poptI.c:124 +#: lib/poptI.c:120 #, fuzzy msgid "relocate files in non-relocateable package" msgstr "Paket %s ist nicht installiert\n" -#: lib/poptI.c:127 +#: lib/poptI.c:123 msgid "save erased package files by renaming into sub-directory" msgstr "" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "erase (uninstall) package" msgstr "Paket löschen (deinstallieren)" -#: lib/poptI.c:130 +#: lib/poptI.c:126 #, fuzzy msgid "<package>+" msgstr "Anfrage an alle Pakete" -#: lib/poptI.c:133 +#: lib/poptI.c:129 msgid "do not install documentation" msgstr "Dokumentation nicht installieren" -#: lib/poptI.c:135 +#: lib/poptI.c:131 msgid "skip files with leading component <path> " msgstr "" -#: lib/poptI.c:136 +#: lib/poptI.c:132 msgid "<path>" msgstr "" -#: lib/poptI.c:139 +#: lib/poptI.c:135 msgid "short hand for --replacepkgs --replacefiles" msgstr "Abkürzung für --replacepkgs --replacefiles" -#: lib/poptI.c:142 +#: lib/poptI.c:138 #, fuzzy msgid "upgrade package(s) if already installed" msgstr "Paket %s ist nicht installiert\n" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 +#: lib/poptI.c:139 lib/poptI.c:155 lib/poptI.c:236 #, fuzzy msgid "<packagefile>+" msgstr " -b<STUFE> <SPEC> " -#: lib/poptI.c:145 +#: lib/poptI.c:141 msgid "print hash marks as package installs (good with -v)" msgstr "Fortschrittsanzeige bei der Paketinstallation (gut zusammen mit -v)" -#: lib/poptI.c:148 +#: lib/poptI.c:144 msgid "don't verify package architecture" msgstr "Paket-Architektur nicht überprüfen" -#: lib/poptI.c:151 +#: lib/poptI.c:147 msgid "don't verify package operating system" msgstr "Paket-Betriebssystem nicht überprüfen" -#: lib/poptI.c:154 +#: lib/poptI.c:150 msgid "don't check disk space before installing" msgstr "" -#: lib/poptI.c:156 +#: lib/poptI.c:152 msgid "install documentation" msgstr "Dokumentation installieren" -#: lib/poptI.c:159 +#: lib/poptI.c:155 #, fuzzy msgid "install package(s)" msgstr "Paket installieren" -#: lib/poptI.c:161 +#: lib/poptI.c:157 msgid "update the database, but do not modify the filesystem" msgstr "Datenbank erneuern, aber das Dateisystem nicht verändern" -#: lib/poptI.c:163 +#: lib/poptI.c:159 msgid "do not verify package dependencies" msgstr "Dateiabhängigkeiten nicht überprüfen" -#: lib/poptI.c:166 +#: lib/poptI.c:162 msgid "do not reorder package installation to satisfy dependencies" msgstr "" "Paket-Installation nicht neu sortieren, um den Abhängigkeiten zu genügen" -#: lib/poptI.c:171 +#: lib/poptI.c:167 msgid "do not suggest missing dependency resolution(s)" msgstr "" -#: lib/poptI.c:178 +#: lib/poptI.c:174 #, fuzzy, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "Keine Stufen ausführen" -#: lib/poptI.c:181 +#: lib/poptI.c:177 #, fuzzy, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "Keine Stufen ausführen" -#: lib/poptI.c:184 +#: lib/poptI.c:180 #, fuzzy, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "Keine Stufen ausführen" -#: lib/poptI.c:187 +#: lib/poptI.c:183 #, fuzzy, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "Keine Stufen ausführen" -#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy msgid "don't verify package digest(s)" msgstr "Paket installieren" -#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy msgid "don't verify package signature(s)" msgstr "Paketsignatur überprüfen" -#: lib/poptI.c:196 +#: lib/poptI.c:192 #, fuzzy msgid "do not execute any scriptlet(s) triggered by this package" msgstr "kein Skript ausführen, das durch dieses Paket veranlasst wurde" -#: lib/poptI.c:199 +#: lib/poptI.c:195 #, fuzzy, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "Keine paketspezifischen Skripte ausführen" -#: lib/poptI.c:202 +#: lib/poptI.c:198 #, fuzzy, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "Keine Installations-Skripte ausführen" -#: lib/poptI.c:205 +#: lib/poptI.c:201 #, fuzzy, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "Keine Installations-Skripte ausführen" -#: lib/poptI.c:208 +#: lib/poptI.c:204 #, fuzzy, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "Keine Installations-Skripte ausführen" -#: lib/poptI.c:212 +#: lib/poptI.c:208 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1982,50 +1982,50 @@ msgstr "" "Aktualisierung auf eine alte Version des Pakets (--force macht das bei " "Aktualisierungen automatisch)" -#: lib/poptI.c:216 +#: lib/poptI.c:212 msgid "print percentages as package installs" msgstr "Prozentangabe bei der Paketinstallation ausgeben" -#: lib/poptI.c:218 +#: lib/poptI.c:214 msgid "relocate the package to <dir>, if relocatable" msgstr "" "Verschiebe das Paket, wenn es verschiebbar ist, in das Verzeichnis <VERZ>" -#: lib/poptI.c:221 +#: lib/poptI.c:217 #, fuzzy msgid "relocate files from path <old> to <new>" msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>" -#: lib/poptI.c:222 +#: lib/poptI.c:218 #, fuzzy msgid "<old>=<new>" msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>" -#: lib/poptI.c:225 +#: lib/poptI.c:221 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:228 +#: lib/poptI.c:224 msgid "install even if the package replaces installed files" msgstr "Auch dann installieren, wenn das Paket installierte Dateien ersetzt" -#: lib/poptI.c:231 +#: lib/poptI.c:227 msgid "reinstall if the package is already present" msgstr "Neuinstallation, wenn das Paket schon vorhanden ist" -#: lib/poptI.c:233 +#: lib/poptI.c:229 msgid "deinstall new, reinstall old, package(s), back to <date>" msgstr "" -#: lib/poptI.c:234 +#: lib/poptI.c:230 msgid "<date>" msgstr "" -#: lib/poptI.c:236 +#: lib/poptI.c:232 msgid "don't install, but tell if it would work or not" msgstr "Nicht installieren - nur anzeigen, ob es funktionieren würde" -#: lib/poptI.c:239 +#: lib/poptI.c:235 #, fuzzy msgid "upgrade package(s)" msgstr "Paket installieren" @@ -2455,100 +2455,100 @@ msgstr "" msgid "package has neither file owner or id lists\n" msgstr "Paket hat keinen Namen" -#: lib/query.c:463 +#: lib/query.c:464 #, fuzzy, c-format msgid "can't query %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/query.c:618 lib/query.c:656 lib/rpminstall.c:352 lib/rpminstall.c:494 #: lib/rpminstall.c:887 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" -#: lib/query.c:633 +#: lib/query.c:634 #, c-format msgid "query of %s failed\n" msgstr "Anfrage von %s fehlgeschlagen\n" -#: lib/query.c:639 +#: lib/query.c:640 msgid "old format source packages cannot be queried\n" msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n" -#: lib/query.c:665 lib/rpminstall.c:507 +#: lib/query.c:666 lib/rpminstall.c:507 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: »readLead« fehlgeschlagen\n" -#: lib/query.c:709 +#: lib/query.c:710 #, fuzzy, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "Anfrage von %s fehlgeschlagen\n" -#: lib/query.c:730 +#: lib/query.c:731 #, fuzzy msgid "no packages\n" msgstr "Anfrage an alle Pakete" -#: lib/query.c:750 +#: lib/query.c:751 #, c-format msgid "group %s does not contain any packages\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/query.c:760 +#: lib/query.c:761 #, c-format msgid "no package triggers %s\n" msgstr "kein Paket triggert %s\n" # , c-format -#: lib/query.c:774 lib/query.c:796 lib/query.c:817 lib/query.c:852 +#: lib/query.c:775 lib/query.c:797 lib/query.c:818 lib/query.c:853 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "Lesen von %s fehlgeschlagen: %s." -#: lib/query.c:784 lib/query.c:802 lib/query.c:827 lib/query.c:857 +#: lib/query.c:785 lib/query.c:803 lib/query.c:828 lib/query.c:858 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "kein Paket triggert %s\n" -#: lib/query.c:868 +#: lib/query.c:869 #, c-format msgid "no package requires %s\n" msgstr "kein Paket verlangt %s\n" # oder besser: ... listet %s auf? -ke- -#: lib/query.c:879 +#: lib/query.c:880 #, c-format msgid "no package provides %s\n" msgstr "kein Paket stellt %s bereit\n" # , c-format -#: lib/query.c:913 +#: lib/query.c:914 #, fuzzy, c-format msgid "file %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/query.c:917 +#: lib/query.c:918 #, c-format msgid "file %s is not owned by any package\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/query.c:944 +#: lib/query.c:945 #, c-format msgid "invalid package number: %s\n" msgstr "ungültige Paket-Nummer: %s\n" -#: lib/query.c:947 +#: lib/query.c:948 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "ungültige Paket-Nummer: %s\n" -#: lib/query.c:952 +#: lib/query.c:953 #, fuzzy, c-format msgid "record %u could not be read\n" msgstr "Eintrag %d konnte nicht gelesen werden\n" -#: lib/query.c:963 lib/rpminstall.c:675 +#: lib/query.c:964 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "Paket %s ist nicht installiert\n" @@ -2865,147 +2865,147 @@ msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s." msgid "cannot open Packages database in %s\n" msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" -#: lib/signature.c:123 +#: lib/signature.c:124 msgid "file is not regular -- skipping size check\n" msgstr "" -#: lib/signature.c:132 +#: lib/signature.c:142 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:137 +#: lib/signature.c:147 #, c-format msgid " Actual size: %12d\n" msgstr "" -#: lib/signature.c:157 +#: lib/signature.c:167 #, fuzzy msgid "No signature\n" msgstr "%s: Keine Signatur verfügbar\n" -#: lib/signature.c:161 +#: lib/signature.c:171 #, fuzzy msgid "Old PGP signature\n" msgstr "PGP-Signatur generieren" -#: lib/signature.c:172 +#: lib/signature.c:182 #, fuzzy msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "Alte Signatur (nur intern)! Wie bist du daran gekommen!?" -#: lib/signature.c:226 +#: lib/signature.c:232 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "" -#: lib/signature.c:305 lib/signature.c:402 lib/signature.c:669 -#: lib/signature.c:702 +#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675 +#: lib/signature.c:708 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Konnte pgp nicht durchführen" -#: lib/signature.c:321 +#: lib/signature.c:327 #, fuzzy msgid "pgp failed\n" msgstr "pgp fehlgeschlagen" #. PGP failed to write signature #. Just in case -#: lib/signature.c:328 +#: lib/signature.c:334 #, fuzzy msgid "pgp failed to write signature\n" msgstr "pgp fehlgeschlagen beim Schreiben der Signatur" -#: lib/signature.c:333 +#: lib/signature.c:339 #, c-format msgid "PGP sig size: %d\n" msgstr "" -#: lib/signature.c:347 lib/signature.c:445 +#: lib/signature.c:353 lib/signature.c:451 #, fuzzy msgid "unable to read the signature\n" msgstr "nicht möglich, die Signatur zu lesen" -#: lib/signature.c:352 +#: lib/signature.c:358 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:419 +#: lib/signature.c:425 #, fuzzy msgid "gpg failed\n" msgstr "pgp fehlgeschlagen" #. GPG failed to write signature #. Just in case -#: lib/signature.c:426 +#: lib/signature.c:432 #, fuzzy msgid "gpg failed to write signature\n" msgstr "pgp fehlgeschlagen beim Schreiben der Signatur" -#: lib/signature.c:431 +#: lib/signature.c:437 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:450 +#: lib/signature.c:456 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:707 lib/signature.c:758 +#: lib/signature.c:713 lib/signature.c:764 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:737 +#: lib/signature.c:743 #, fuzzy, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein" -#: lib/signature.c:750 +#: lib/signature.c:756 #, fuzzy, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein" -#: lib/signature.c:794 +#: lib/signature.c:800 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:830 +#: lib/signature.c:836 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:879 +#: lib/signature.c:885 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1066 +#: lib/signature.c:1072 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "alle MD5-Signaturen überspringen" -#: lib/signature.c:1176 +#: lib/signature.c:1182 msgid "Header " msgstr "" -#: lib/signature.c:1177 +#: lib/signature.c:1183 #, fuzzy msgid "V3 DSA signature: " msgstr "%s: Keine Signatur verfügbar\n" -#: lib/signature.c:1252 +#: lib/signature.c:1258 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1279 +#: lib/signature.c:1285 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1283 +#: lib/signature.c:1289 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" @@ -3040,12 +3040,12 @@ msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: " msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:100 +#: rpmdb/db1.c:98 rpmdb/db3.c:98 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:103 +#: rpmdb/db1.c:101 rpmdb/db3.c:101 #, c-format msgid "db%d error(%d): %s\n" msgstr "" @@ -3089,70 +3089,70 @@ msgstr "Datenbank aus der vorhandenen neu erstellen" msgid "cannot get %s lock on database\n" msgstr "kann %s lock für die Datenbank nicht bekommen" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "exclusive" msgstr "exklusiv" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "shared" msgstr "geteilt" -#: rpmdb/db3.c:129 +#: rpmdb/db3.c:127 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:147 +#: rpmdb/db3.c:145 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:187 +#: rpmdb/db3.c:185 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/db3.c:711 +#: rpmdb/db3.c:614 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/db3.c:778 +#: rpmdb/db3.c:681 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/db3.c:1001 +#: rpmdb/db3.c:903 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/db3.c:1226 +#: rpmdb/db3.c:1119 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "kann %s lock für die Datenbank nicht bekommen" -#: rpmdb/db3.c:1232 +#: rpmdb/db3.c:1125 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/dbconfig.c:404 +#: rpmdb/dbconfig.c:400 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:442 +#: rpmdb/dbconfig.c:438 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:451 +#: rpmdb/dbconfig.c:447 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:460 +#: rpmdb/dbconfig.c:456 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3265,162 +3265,156 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:163 +#: rpmdb/rpmdb.c:165 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:440 +#: rpmdb/rpmdb.c:258 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "kann Datei %s nicht öffnen: " -#: rpmdb/rpmdb.c:462 +#: rpmdb/rpmdb.c:280 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: rpmdb/rpmdb.c:554 +#: rpmdb/rpmdb.c:379 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "Fehler beim Eintrag %s von %s" -#: rpmdb/rpmdb.c:685 +#: rpmdb/rpmdb.c:516 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "Fehler bei Schreiben des Eintrags %s nach %s" # FIXME -#: rpmdb/rpmdb.c:695 +#: rpmdb/rpmdb.c:529 #, fuzzy, c-format msgid "error(%d) removing record %s from %s\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:954 +#: rpmdb/rpmdb.c:788 #, fuzzy msgid "no dbpath has been set\n" msgstr "»dbpath« ist nicht gesetzt" -#: rpmdb/rpmdb.c:1102 -msgid "" -"old format database is present; use --rebuilddb to generate a new format " -"database\n" -msgstr "" - #. error -#: rpmdb/rpmdb.c:1367 +#: rpmdb/rpmdb.c:1174 #, fuzzy, c-format msgid "error(%d) counting packages\n" msgstr "Fehler beim Suchen nach Paket %s\n" -#: rpmdb/rpmdb.c:2146 rpmdb/rpmdb.c:3507 +#: rpmdb/rpmdb.c:1971 rpmdb/rpmdb.c:3357 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" "Eintrag Nummer %d in der Datenback ist nicht in Ordnung -- wird übersprungen" -#: rpmdb/rpmdb.c:2199 +#: rpmdb/rpmdb.c:2034 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2478 +#: rpmdb/rpmdb.c:2306 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen" # FIXME -#: rpmdb/rpmdb.c:2639 +#: rpmdb/rpmdb.c:2472 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" # FIXME -#: rpmdb/rpmdb.c:2643 +#: rpmdb/rpmdb.c:2476 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:2813 +#: rpmdb/rpmdb.c:2663 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "Fehler beim Suchen nach Paket %s\n" -#: rpmdb/rpmdb.c:3008 +#: rpmdb/rpmdb.c:2858 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" # FIXME -#: rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:2862 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:3393 +#: rpmdb/rpmdb.c:3243 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3276 msgid "no dbpath has been set" msgstr "»dbpath« ist nicht gesetzt" -#: rpmdb/rpmdb.c:3453 +#: rpmdb/rpmdb.c:3303 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3457 +#: rpmdb/rpmdb.c:3307 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "die temporäre Datenbank %s existiert schon" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3313 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3315 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: rpmdb/rpmdb.c:3472 +#: rpmdb/rpmdb.c:3322 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3483 +#: rpmdb/rpmdb.c:3333 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3547 +#: rpmdb/rpmdb.c:3397 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d" -#: rpmdb/rpmdb.c:3565 +#: rpmdb/rpmdb.c:3415 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3573 +#: rpmdb/rpmdb.c:3423 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3575 +#: rpmdb/rpmdb.c:3425 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3585 +#: rpmdb/rpmdb.c:3435 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" # , c-format -#: rpmdb/rpmdb.c:3587 +#: rpmdb/rpmdb.c:3437 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-14 17:43-0400\n" +"POT-Creation-Date: 2002-05-01 18:05-0400\n" "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n" "Language-Team: Finnish <linux@sot.com>\n" "Content-Type: text/plain; charset=\n" @@ -114,7 +114,7 @@ msgstr "" msgid "use <dir> as the top level directory" msgstr "käytä <hakem> ylimpänä hakemistona" -#: rpmqv.c:125 lib/poptI.c:219 +#: rpmqv.c:125 lib/poptI.c:215 msgid "<dir>" msgstr "" @@ -1465,77 +1465,77 @@ msgstr "pgp epäonnistui" msgid "package %s was already added, replacing with %s\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/depends.c:367 +#: lib/depends.c:380 msgid "(cached)" msgstr "" -#: lib/depends.c:392 +#: lib/depends.c:405 #, fuzzy msgid "(rpmrc provides)" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:408 +#: lib/depends.c:421 #, fuzzy msgid "(rpmlib provides)" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:429 +#: lib/depends.c:442 #, fuzzy msgid "(db files)" msgstr "en voinut avata %s: %s" -#: lib/depends.c:441 +#: lib/depends.c:454 #, fuzzy msgid "(db provides)" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:454 +#: lib/depends.c:467 #, fuzzy msgid "(db package)" msgstr "kysele kaikki paketit" -#: lib/depends.c:762 +#: lib/depends.c:783 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:903 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1171 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1277 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1370 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1440 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1475 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1480 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2978 rpmdb/header.c:2999 rpmdb/header.c:3021 +#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 msgid "(not a number)" msgstr "(ei ole luku)" @@ -1675,37 +1675,37 @@ msgstr "" msgid "%s: Fread failed: %s\n" msgstr "%s: readLead epäonnistui\n" -#: lib/poptI.c:53 +#: lib/poptI.c:49 #, fuzzy msgid "exclude paths must begin with a /" msgstr "siirtojen pitää alkaa /-merkillä" -#: lib/poptI.c:65 +#: lib/poptI.c:61 msgid "relocations must begin with a /" msgstr "siirtojen pitää alkaa /-merkillä" -#: lib/poptI.c:67 +#: lib/poptI.c:63 msgid "relocations must contain a =" msgstr "siirroissa pitää olla =-merkki" -#: lib/poptI.c:70 +#: lib/poptI.c:66 msgid "relocations must have a / following the =" msgstr "siirroissa pitää olla / =-merkin jälkeen" -#: lib/poptI.c:84 +#: lib/poptI.c:80 msgid "rollback takes a time/date stamp argument" msgstr "" -#: lib/poptI.c:91 +#: lib/poptI.c:87 msgid "malformed rollback time/date stamp argument" msgstr "" -#: lib/poptI.c:110 +#: lib/poptI.c:106 msgid "install all files, even configurations which might otherwise be skipped" msgstr "" "asenna kaikki tiedostot, myös konfiguraatiot, jotka muuten ehkä ohitettaisiin" -#: lib/poptI.c:114 +#: lib/poptI.c:110 msgid "" "remove all packages which match <package> (normally an error is generated if " "<package> specified multiple packages)" @@ -1713,152 +1713,152 @@ msgstr "" "poista kaikki paketit, joiden nimeä vastaa <paketti> (tavallisesti, jos " "<paketti> määrittää useita paketteja, tulee virhe)" -#: lib/poptI.c:120 lib/poptI.c:175 +#: lib/poptI.c:116 lib/poptI.c:171 #, fuzzy msgid "do not execute package scriptlet(s)" msgstr "älä aja mitään pakettikohtaisia skriptejä" -#: lib/poptI.c:124 +#: lib/poptI.c:120 #, fuzzy msgid "relocate files in non-relocateable package" msgstr "paketti %s ei ole asennettu\n" -#: lib/poptI.c:127 +#: lib/poptI.c:123 msgid "save erased package files by renaming into sub-directory" msgstr "" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "erase (uninstall) package" msgstr "poista paketti" -#: lib/poptI.c:130 +#: lib/poptI.c:126 #, fuzzy msgid "<package>+" msgstr "kysele kaikki paketit" -#: lib/poptI.c:133 +#: lib/poptI.c:129 msgid "do not install documentation" msgstr "älä asenna dokumentointia" -#: lib/poptI.c:135 +#: lib/poptI.c:131 msgid "skip files with leading component <path> " msgstr "" -#: lib/poptI.c:136 +#: lib/poptI.c:132 msgid "<path>" msgstr "" -#: lib/poptI.c:139 +#: lib/poptI.c:135 msgid "short hand for --replacepkgs --replacefiles" msgstr "lyhenne parametreille --replacepkgs --replacefiles" -#: lib/poptI.c:142 +#: lib/poptI.c:138 #, fuzzy msgid "upgrade package(s) if already installed" msgstr "paketti %s ei ole asennettu\n" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 +#: lib/poptI.c:139 lib/poptI.c:155 lib/poptI.c:236 #, fuzzy msgid "<packagefile>+" msgstr " -b<vaihe> <määrittely> " -#: lib/poptI.c:145 +#: lib/poptI.c:141 msgid "print hash marks as package installs (good with -v)" msgstr "tulosta risuaitaa paketin asentuessa (-v:n kanssa hyvä)" -#: lib/poptI.c:148 +#: lib/poptI.c:144 msgid "don't verify package architecture" msgstr "älä tarkista paketin arkkitehtuuria" -#: lib/poptI.c:151 +#: lib/poptI.c:147 msgid "don't verify package operating system" msgstr "älä tarkista paketin käyttöjärjestelmää" -#: lib/poptI.c:154 +#: lib/poptI.c:150 msgid "don't check disk space before installing" msgstr "" -#: lib/poptI.c:156 +#: lib/poptI.c:152 msgid "install documentation" msgstr "asenna dokumentaatio" -#: lib/poptI.c:159 +#: lib/poptI.c:155 #, fuzzy msgid "install package(s)" msgstr "asenna paketti" -#: lib/poptI.c:161 +#: lib/poptI.c:157 msgid "update the database, but do not modify the filesystem" msgstr "päivitä tietokanta, mutta älä muuta tiedostojärjestelmää" -#: lib/poptI.c:163 +#: lib/poptI.c:159 msgid "do not verify package dependencies" msgstr "älä tarkista paketin riippuvuuksia" -#: lib/poptI.c:166 +#: lib/poptI.c:162 msgid "do not reorder package installation to satisfy dependencies" msgstr "älä muuta asennusjärjestystä riippuvuuksien tyydyttämiseksi" -#: lib/poptI.c:171 +#: lib/poptI.c:167 msgid "do not suggest missing dependency resolution(s)" msgstr "" -#: lib/poptI.c:178 +#: lib/poptI.c:174 #, fuzzy, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "älä suorita mitään vaiheita" -#: lib/poptI.c:181 +#: lib/poptI.c:177 #, fuzzy, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "älä suorita mitään vaiheita" -#: lib/poptI.c:184 +#: lib/poptI.c:180 #, fuzzy, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "älä suorita mitään vaiheita" -#: lib/poptI.c:187 +#: lib/poptI.c:183 #, fuzzy, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "älä suorita mitään vaiheita" -#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy msgid "don't verify package digest(s)" msgstr "asenna paketti" -#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy msgid "don't verify package signature(s)" msgstr "tarkista paketin allekirjoitus" -#: lib/poptI.c:196 +#: lib/poptI.c:192 #, fuzzy msgid "do not execute any scriptlet(s) triggered by this package" msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on" -#: lib/poptI.c:199 +#: lib/poptI.c:195 #, fuzzy, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "älä aja mitään pakettikohtaisia skriptejä" -#: lib/poptI.c:202 +#: lib/poptI.c:198 #, fuzzy, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "älä suorita asennusskriptejä" -#: lib/poptI.c:205 +#: lib/poptI.c:201 #, fuzzy, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "älä suorita asennusskriptejä" -#: lib/poptI.c:208 +#: lib/poptI.c:204 #, fuzzy, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "älä suorita asennusskriptejä" -#: lib/poptI.c:212 +#: lib/poptI.c:208 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1866,49 +1866,49 @@ msgstr "" "päivitä vanhempaan versioon (--force päivitettäessä tekee tämän " "automaattisesti)" -#: lib/poptI.c:216 +#: lib/poptI.c:212 msgid "print percentages as package installs" msgstr "tulosta asennuksen eteneminen prosentteina" -#: lib/poptI.c:218 +#: lib/poptI.c:214 msgid "relocate the package to <dir>, if relocatable" msgstr "siirrä paketti hakemistoon <hakem>, jos siirrettävissä" -#: lib/poptI.c:221 +#: lib/poptI.c:217 #, fuzzy msgid "relocate files from path <old> to <new>" msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>" -#: lib/poptI.c:222 +#: lib/poptI.c:218 #, fuzzy msgid "<old>=<new>" msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>" -#: lib/poptI.c:225 +#: lib/poptI.c:221 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:228 +#: lib/poptI.c:224 msgid "install even if the package replaces installed files" msgstr "asenna vaikka paketti korvaisi asennettuja tiedostoja" -#: lib/poptI.c:231 +#: lib/poptI.c:227 msgid "reinstall if the package is already present" msgstr "asenna uudelleen, jos paketti on jo asennettu" -#: lib/poptI.c:233 +#: lib/poptI.c:229 msgid "deinstall new, reinstall old, package(s), back to <date>" msgstr "" -#: lib/poptI.c:234 +#: lib/poptI.c:230 msgid "<date>" msgstr "" -#: lib/poptI.c:236 +#: lib/poptI.c:232 msgid "don't install, but tell if it would work or not" msgstr "älä asenna, mutta kerro onnistuisiko se" -#: lib/poptI.c:239 +#: lib/poptI.c:235 #, fuzzy msgid "upgrade package(s)" msgstr "asenna paketti" @@ -2332,97 +2332,97 @@ msgstr "" msgid "package has neither file owner or id lists\n" msgstr "paketilla ei ole nimeä" -#: lib/query.c:463 +#: lib/query.c:464 #, fuzzy, c-format msgid "can't query %s: %s\n" msgstr "virhe: en voi avata %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/query.c:618 lib/query.c:656 lib/rpminstall.c:352 lib/rpminstall.c:494 #: lib/rpminstall.c:887 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: lib/query.c:633 +#: lib/query.c:634 #, c-format msgid "query of %s failed\n" msgstr "%s:n kysely ei onnistunut\n" -#: lib/query.c:639 +#: lib/query.c:640 msgid "old format source packages cannot be queried\n" msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n" -#: lib/query.c:665 lib/rpminstall.c:507 +#: lib/query.c:666 lib/rpminstall.c:507 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: readLead epäonnistui\n" -#: lib/query.c:709 +#: lib/query.c:710 #, fuzzy, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "%s:n kysely ei onnistunut\n" -#: lib/query.c:730 +#: lib/query.c:731 #, fuzzy msgid "no packages\n" msgstr "kysele kaikki paketit" -#: lib/query.c:750 +#: lib/query.c:751 #, c-format msgid "group %s does not contain any packages\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/query.c:760 +#: lib/query.c:761 #, c-format msgid "no package triggers %s\n" msgstr "mikään paketti ei laukaise %s:a\n" -#: lib/query.c:774 lib/query.c:796 lib/query.c:817 lib/query.c:852 +#: lib/query.c:775 lib/query.c:797 lib/query.c:818 lib/query.c:853 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "En voi lukea %s: %s." -#: lib/query.c:784 lib/query.c:802 lib/query.c:827 lib/query.c:857 +#: lib/query.c:785 lib/query.c:803 lib/query.c:828 lib/query.c:858 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "mikään paketti ei laukaise %s:a\n" -#: lib/query.c:868 +#: lib/query.c:869 #, c-format msgid "no package requires %s\n" msgstr "mikään pakettie ei tarvitse %s:a\n" -#: lib/query.c:879 +#: lib/query.c:880 #, c-format msgid "no package provides %s\n" msgstr "mikään paketti ei tarjoa %s:a\n" -#: lib/query.c:913 +#: lib/query.c:914 #, fuzzy, c-format msgid "file %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/query.c:917 +#: lib/query.c:918 #, c-format msgid "file %s is not owned by any package\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/query.c:944 +#: lib/query.c:945 #, c-format msgid "invalid package number: %s\n" msgstr "virheellinen paketin numero: %s\n" -#: lib/query.c:947 +#: lib/query.c:948 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "virheellinen paketin numero: %s\n" -#: lib/query.c:952 +#: lib/query.c:953 #, fuzzy, c-format msgid "record %u could not be read\n" msgstr "tietuetta %d ei voitu lukea\n" -#: lib/query.c:963 lib/rpminstall.c:675 +#: lib/query.c:964 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "paketti %s ei ole asennettu\n" @@ -2733,147 +2733,147 @@ msgstr "En voi avata %s luettavaksi: %s." msgid "cannot open Packages database in %s\n" msgstr "virhe: en voi avata %s%s/packages.rpm\n" -#: lib/signature.c:123 +#: lib/signature.c:124 msgid "file is not regular -- skipping size check\n" msgstr "" -#: lib/signature.c:132 +#: lib/signature.c:142 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:137 +#: lib/signature.c:147 #, c-format msgid " Actual size: %12d\n" msgstr "" -#: lib/signature.c:157 +#: lib/signature.c:167 #, fuzzy msgid "No signature\n" msgstr "%s: Ei allekirjoitusta saatavilla\n" -#: lib/signature.c:161 +#: lib/signature.c:171 #, fuzzy msgid "Old PGP signature\n" msgstr "generoi PGP-allekirjoitus" -#: lib/signature.c:172 +#: lib/signature.c:182 #, fuzzy msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "Vanha (sisäisen käytön) allekirjoitus! Mistä sait sen!?" -#: lib/signature.c:226 +#: lib/signature.c:232 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "" -#: lib/signature.c:305 lib/signature.c:402 lib/signature.c:669 -#: lib/signature.c:702 +#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675 +#: lib/signature.c:708 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "En voinut ajaa pgp:tä" -#: lib/signature.c:321 +#: lib/signature.c:327 #, fuzzy msgid "pgp failed\n" msgstr "pgp epäonnistui" #. PGP failed to write signature #. Just in case -#: lib/signature.c:328 +#: lib/signature.c:334 #, fuzzy msgid "pgp failed to write signature\n" msgstr "pgp ei voinut kirjoittaa allekirjoitusta" -#: lib/signature.c:333 +#: lib/signature.c:339 #, c-format msgid "PGP sig size: %d\n" msgstr "" -#: lib/signature.c:347 lib/signature.c:445 +#: lib/signature.c:353 lib/signature.c:451 #, fuzzy msgid "unable to read the signature\n" msgstr "en voinut lukea allekirjoitusta" -#: lib/signature.c:352 +#: lib/signature.c:358 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:419 +#: lib/signature.c:425 #, fuzzy msgid "gpg failed\n" msgstr "pgp epäonnistui" #. GPG failed to write signature #. Just in case -#: lib/signature.c:426 +#: lib/signature.c:432 #, fuzzy msgid "gpg failed to write signature\n" msgstr "pgp ei voinut kirjoittaa allekirjoitusta" -#: lib/signature.c:431 +#: lib/signature.c:437 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:450 +#: lib/signature.c:456 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:707 lib/signature.c:758 +#: lib/signature.c:713 lib/signature.c:764 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:737 +#: lib/signature.c:743 #, fuzzy, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa" -#: lib/signature.c:750 +#: lib/signature.c:756 #, fuzzy, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa" -#: lib/signature.c:794 +#: lib/signature.c:800 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:830 +#: lib/signature.c:836 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:879 +#: lib/signature.c:885 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1066 +#: lib/signature.c:1072 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "ohita MD5-allekirjoitukset" -#: lib/signature.c:1176 +#: lib/signature.c:1182 msgid "Header " msgstr "" -#: lib/signature.c:1177 +#: lib/signature.c:1183 #, fuzzy msgid "V3 DSA signature: " msgstr "%s: Ei allekirjoitusta saatavilla\n" -#: lib/signature.c:1252 +#: lib/signature.c:1258 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1279 +#: lib/signature.c:1285 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1283 +#: lib/signature.c:1289 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" @@ -2908,12 +2908,12 @@ msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:" msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:100 +#: rpmdb/db1.c:98 rpmdb/db3.c:98 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:103 +#: rpmdb/db1.c:101 rpmdb/db3.c:101 #, c-format msgid "db%d error(%d): %s\n" msgstr "" @@ -2956,70 +2956,70 @@ msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" msgid "cannot get %s lock on database\n" msgstr "en voi saada %s lukitusta tietokantaan" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "exclusive" msgstr "poissulkevaa" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "shared" msgstr "jaettua" -#: rpmdb/db3.c:129 +#: rpmdb/db3.c:127 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:147 +#: rpmdb/db3.c:145 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:187 +#: rpmdb/db3.c:185 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/db3.c:711 +#: rpmdb/db3.c:614 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/db3.c:778 +#: rpmdb/db3.c:681 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/db3.c:1001 +#: rpmdb/db3.c:903 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/db3.c:1226 +#: rpmdb/db3.c:1119 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "en voi saada %s lukitusta tietokantaan" -#: rpmdb/db3.c:1232 +#: rpmdb/db3.c:1125 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/dbconfig.c:404 +#: rpmdb/dbconfig.c:400 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:442 +#: rpmdb/dbconfig.c:438 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:451 +#: rpmdb/dbconfig.c:447 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:460 +#: rpmdb/dbconfig.c:456 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3131,156 +3131,150 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:163 +#: rpmdb/rpmdb.c:165 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:440 +#: rpmdb/rpmdb.c:258 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "en voinut avata tiedostoa %s: " -#: rpmdb/rpmdb.c:462 +#: rpmdb/rpmdb.c:280 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "virhe: en voi avata %s\n" -#: rpmdb/rpmdb.c:554 +#: rpmdb/rpmdb.c:379 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "virhe luettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:685 +#: rpmdb/rpmdb.c:516 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "virhe talletettaessa tietuetta %s %s:ään" -#: rpmdb/rpmdb.c:695 +#: rpmdb/rpmdb.c:529 #, fuzzy, c-format msgid "error(%d) removing record %s from %s\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:954 +#: rpmdb/rpmdb.c:788 #, fuzzy msgid "no dbpath has been set\n" msgstr "dbpath ei ole asetettu" -#: rpmdb/rpmdb.c:1102 -msgid "" -"old format database is present; use --rebuilddb to generate a new format " -"database\n" -msgstr "" - #. error -#: rpmdb/rpmdb.c:1367 +#: rpmdb/rpmdb.c:1174 #, fuzzy, c-format msgid "error(%d) counting packages\n" msgstr "virhe etsittäessä pakettia %s\n" -#: rpmdb/rpmdb.c:2146 rpmdb/rpmdb.c:3507 +#: rpmdb/rpmdb.c:1971 rpmdb/rpmdb.c:3357 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen" -#: rpmdb/rpmdb.c:2199 +#: rpmdb/rpmdb.c:2034 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2478 +#: rpmdb/rpmdb.c:2306 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "en voi lukea headeria %d:stä päivittäessä" -#: rpmdb/rpmdb.c:2639 +#: rpmdb/rpmdb.c:2472 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2643 +#: rpmdb/rpmdb.c:2476 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2813 +#: rpmdb/rpmdb.c:2663 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "virhe etsittäessä pakettia %s\n" -#: rpmdb/rpmdb.c:3008 +#: rpmdb/rpmdb.c:2858 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:2862 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:3393 +#: rpmdb/rpmdb.c:3243 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3276 msgid "no dbpath has been set" msgstr "dbpath ei ole asetettu" -#: rpmdb/rpmdb.c:3453 +#: rpmdb/rpmdb.c:3303 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3457 +#: rpmdb/rpmdb.c:3307 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "väliaikainen tietokanta %s on jo olemassa" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3313 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3315 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3472 +#: rpmdb/rpmdb.c:3322 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3483 +#: rpmdb/rpmdb.c:3333 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3547 +#: rpmdb/rpmdb.c:3397 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "en voi lisätä tietuetta %d:stä" -#: rpmdb/rpmdb.c:3565 +#: rpmdb/rpmdb.c:3415 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3573 +#: rpmdb/rpmdb.c:3423 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3575 +#: rpmdb/rpmdb.c:3425 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3585 +#: rpmdb/rpmdb.c:3435 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3587 +#: rpmdb/rpmdb.c:3437 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "en voinut avata %s: %s" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-14 17:43-0400\n" +"POT-Creation-Date: 2002-05-01 18:05-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -122,7 +122,7 @@ msgstr "" msgid "use <dir> as the top level directory" msgstr " --root <dir>\t- utilise <dir> comme rpertoire racine" -#: rpmqv.c:125 lib/poptI.c:219 +#: rpmqv.c:125 lib/poptI.c:215 msgid "<dir>" msgstr "" @@ -1496,74 +1496,74 @@ msgstr "La construction a chou.\n" msgid "package %s was already added, replacing with %s\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/depends.c:367 +#: lib/depends.c:380 msgid "(cached)" msgstr "" -#: lib/depends.c:392 +#: lib/depends.c:405 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:408 +#: lib/depends.c:421 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:429 +#: lib/depends.c:442 #, fuzzy msgid "(db files)" msgstr "impossible d'ouvrir: %s\n" -#: lib/depends.c:441 +#: lib/depends.c:454 msgid "(db provides)" msgstr "" -#: lib/depends.c:454 +#: lib/depends.c:467 #, fuzzy msgid "(db package)" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/depends.c:762 +#: lib/depends.c:783 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:903 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "impossible d'ouvrir: %s\n" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1171 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1277 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1370 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1440 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1475 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1480 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2978 rpmdb/header.c:2999 rpmdb/header.c:3021 +#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 msgid "(not a number)" msgstr "" @@ -1697,194 +1697,194 @@ msgstr "" msgid "%s: Fread failed: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/poptI.c:53 +#: lib/poptI.c:49 #, fuzzy msgid "exclude paths must begin with a /" msgstr "les arguments de --root (-r) doivent commencer par un /" -#: lib/poptI.c:65 +#: lib/poptI.c:61 #, fuzzy msgid "relocations must begin with a /" msgstr "les arguments de --root (-r) doivent commencer par un /" -#: lib/poptI.c:67 +#: lib/poptI.c:63 msgid "relocations must contain a =" msgstr "" -#: lib/poptI.c:70 +#: lib/poptI.c:66 msgid "relocations must have a / following the =" msgstr "" -#: lib/poptI.c:84 +#: lib/poptI.c:80 msgid "rollback takes a time/date stamp argument" msgstr "" -#: lib/poptI.c:91 +#: lib/poptI.c:87 msgid "malformed rollback time/date stamp argument" msgstr "" -#: lib/poptI.c:110 +#: lib/poptI.c:106 msgid "install all files, even configurations which might otherwise be skipped" msgstr "" -#: lib/poptI.c:114 +#: lib/poptI.c:110 msgid "" "remove all packages which match <package> (normally an error is generated if " "<package> specified multiple packages)" msgstr "" -#: lib/poptI.c:120 lib/poptI.c:175 +#: lib/poptI.c:116 lib/poptI.c:171 msgid "do not execute package scriptlet(s)" msgstr "" -#: lib/poptI.c:124 +#: lib/poptI.c:120 #, fuzzy msgid "relocate files in non-relocateable package" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/poptI.c:127 +#: lib/poptI.c:123 msgid "save erased package files by renaming into sub-directory" msgstr "" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "erase (uninstall) package" msgstr "" -#: lib/poptI.c:130 +#: lib/poptI.c:126 #, fuzzy msgid "<package>+" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/poptI.c:133 +#: lib/poptI.c:129 msgid "do not install documentation" msgstr "" -#: lib/poptI.c:135 +#: lib/poptI.c:131 msgid "skip files with leading component <path> " msgstr "" -#: lib/poptI.c:136 +#: lib/poptI.c:132 msgid "<path>" msgstr "" -#: lib/poptI.c:139 +#: lib/poptI.c:135 #, fuzzy msgid "short hand for --replacepkgs --replacefiles" msgstr " --force - raccourci pour --replacepkgs --replacefiles" -#: lib/poptI.c:142 +#: lib/poptI.c:138 #, fuzzy msgid "upgrade package(s) if already installed" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 +#: lib/poptI.c:139 lib/poptI.c:155 lib/poptI.c:236 #, fuzzy msgid "<packagefile>+" msgstr " -i <packagefile>\t- installe le package" -#: lib/poptI.c:145 +#: lib/poptI.c:141 #, fuzzy msgid "print hash marks as package installs (good with -v)" msgstr "" " --hash - affiche des '#' pendant l'installation du package " "(utile avec -v)" -#: lib/poptI.c:148 +#: lib/poptI.c:144 msgid "don't verify package architecture" msgstr "" -#: lib/poptI.c:151 +#: lib/poptI.c:147 msgid "don't verify package operating system" msgstr "" -#: lib/poptI.c:154 +#: lib/poptI.c:150 msgid "don't check disk space before installing" msgstr "" -#: lib/poptI.c:156 +#: lib/poptI.c:152 msgid "install documentation" msgstr "" -#: lib/poptI.c:159 +#: lib/poptI.c:155 #, fuzzy msgid "install package(s)" msgstr "" " -p <packagefile>+ - interroge le package (non install) <packagefile>" -#: lib/poptI.c:161 +#: lib/poptI.c:157 msgid "update the database, but do not modify the filesystem" msgstr "" -#: lib/poptI.c:163 +#: lib/poptI.c:159 msgid "do not verify package dependencies" msgstr "" -#: lib/poptI.c:166 +#: lib/poptI.c:162 msgid "do not reorder package installation to satisfy dependencies" msgstr "" -#: lib/poptI.c:171 +#: lib/poptI.c:167 msgid "do not suggest missing dependency resolution(s)" msgstr "" -#: lib/poptI.c:178 +#: lib/poptI.c:174 #, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "" -#: lib/poptI.c:181 +#: lib/poptI.c:177 #, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "" -#: lib/poptI.c:184 +#: lib/poptI.c:180 #, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "" -#: lib/poptI.c:187 +#: lib/poptI.c:183 #, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "" -#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy msgid "don't verify package digest(s)" msgstr "" " -f <file>+ - interroge le package qui appartient <file>" -#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy msgid "don't verify package signature(s)" msgstr " --sign - genre une signature PGP" -#: lib/poptI.c:196 +#: lib/poptI.c:192 #, fuzzy msgid "do not execute any scriptlet(s) triggered by this package" msgstr "" " -f <file>+ - interroge le package qui appartient <file>" -#: lib/poptI.c:199 +#: lib/poptI.c:195 #, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "" -#: lib/poptI.c:202 +#: lib/poptI.c:198 #, fuzzy, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "impossible d'ouvrir: %s\n" -#: lib/poptI.c:205 +#: lib/poptI.c:201 #, fuzzy, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "impossible d'ouvrir: %s\n" -#: lib/poptI.c:208 +#: lib/poptI.c:204 #, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "" -#: lib/poptI.c:212 +#: lib/poptI.c:208 #, fuzzy msgid "" "upgrade to an old version of the package (--force on upgrades does this " @@ -1893,56 +1893,56 @@ msgstr "" " --oldpackage - mise jour par une ancienne version du package (--" "force" -#: lib/poptI.c:216 +#: lib/poptI.c:212 #, fuzzy msgid "print percentages as package installs" msgstr "" " --percent - affiche des '%' pendant l'installation du package" -#: lib/poptI.c:218 +#: lib/poptI.c:214 msgid "relocate the package to <dir>, if relocatable" msgstr "" -#: lib/poptI.c:221 +#: lib/poptI.c:217 msgid "relocate files from path <old> to <new>" msgstr "" -#: lib/poptI.c:222 +#: lib/poptI.c:218 msgid "<old>=<new>" msgstr "" -#: lib/poptI.c:225 +#: lib/poptI.c:221 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:228 +#: lib/poptI.c:224 #, fuzzy msgid "install even if the package replaces installed files" msgstr "" " --replacefiles - installe mme si le package remplace des fichiers " "dj prsents" -#: lib/poptI.c:231 +#: lib/poptI.c:227 #, fuzzy msgid "reinstall if the package is already present" msgstr " --replacepkgs - rinstalle si le package est dj prsent" -#: lib/poptI.c:233 +#: lib/poptI.c:229 msgid "deinstall new, reinstall old, package(s), back to <date>" msgstr "" -#: lib/poptI.c:234 +#: lib/poptI.c:230 msgid "<date>" msgstr "" -#: lib/poptI.c:236 +#: lib/poptI.c:232 #, fuzzy msgid "don't install, but tell if it would work or not" msgstr "" " --test - n'installe pas, mais indique si ca fonctionnerait " "ou pas" -#: lib/poptI.c:239 +#: lib/poptI.c:235 #, fuzzy msgid "upgrade package(s)" msgstr "" @@ -2369,97 +2369,97 @@ msgstr "" msgid "package has neither file owner or id lists\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/query.c:463 +#: lib/query.c:464 #, fuzzy, c-format msgid "can't query %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/query.c:618 lib/query.c:656 lib/rpminstall.c:352 lib/rpminstall.c:494 #: lib/rpminstall.c:887 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "La construction a chou.\n" -#: lib/query.c:633 +#: lib/query.c:634 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:639 +#: lib/query.c:640 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:665 lib/rpminstall.c:507 +#: lib/query.c:666 lib/rpminstall.c:507 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/query.c:709 +#: lib/query.c:710 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:730 +#: lib/query.c:731 #, fuzzy msgid "no packages\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/query.c:750 +#: lib/query.c:751 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:760 +#: lib/query.c:761 #, fuzzy, c-format msgid "no package triggers %s\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/query.c:774 lib/query.c:796 lib/query.c:817 lib/query.c:852 +#: lib/query.c:775 lib/query.c:797 lib/query.c:818 lib/query.c:853 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/query.c:784 lib/query.c:802 lib/query.c:827 lib/query.c:857 +#: lib/query.c:785 lib/query.c:803 lib/query.c:828 lib/query.c:858 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/query.c:868 +#: lib/query.c:869 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:879 +#: lib/query.c:880 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:913 +#: lib/query.c:914 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:917 +#: lib/query.c:918 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:944 +#: lib/query.c:945 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:947 +#: lib/query.c:948 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:952 +#: lib/query.c:953 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:963 lib/rpminstall.c:675 +#: lib/query.c:964 lib/rpminstall.c:675 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "aucun package n'a t spcifi pour l'installation" @@ -2767,144 +2767,144 @@ msgstr "impossible d'ouvrir: %s\n" msgid "cannot open Packages database in %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/signature.c:123 +#: lib/signature.c:124 msgid "file is not regular -- skipping size check\n" msgstr "" -#: lib/signature.c:132 +#: lib/signature.c:142 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:137 +#: lib/signature.c:147 #, c-format msgid " Actual size: %12d\n" msgstr "" -#: lib/signature.c:157 +#: lib/signature.c:167 msgid "No signature\n" msgstr "" -#: lib/signature.c:161 +#: lib/signature.c:171 #, fuzzy msgid "Old PGP signature\n" msgstr " --sign - genre une signature PGP" -#: lib/signature.c:172 +#: lib/signature.c:182 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "" -#: lib/signature.c:226 +#: lib/signature.c:232 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "" -#: lib/signature.c:305 lib/signature.c:402 lib/signature.c:669 -#: lib/signature.c:702 +#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675 +#: lib/signature.c:708 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/signature.c:321 +#: lib/signature.c:327 #, fuzzy msgid "pgp failed\n" msgstr "La construction a chou.\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:328 +#: lib/signature.c:334 #, fuzzy msgid "pgp failed to write signature\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/signature.c:333 +#: lib/signature.c:339 #, c-format msgid "PGP sig size: %d\n" msgstr "" -#: lib/signature.c:347 lib/signature.c:445 +#: lib/signature.c:353 lib/signature.c:451 #, fuzzy msgid "unable to read the signature\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/signature.c:352 +#: lib/signature.c:358 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:419 +#: lib/signature.c:425 #, fuzzy msgid "gpg failed\n" msgstr "La construction a chou.\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:426 +#: lib/signature.c:432 #, fuzzy msgid "gpg failed to write signature\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/signature.c:431 +#: lib/signature.c:437 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:450 +#: lib/signature.c:456 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:707 lib/signature.c:758 +#: lib/signature.c:713 lib/signature.c:764 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:737 +#: lib/signature.c:743 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "" -#: lib/signature.c:750 +#: lib/signature.c:756 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "" -#: lib/signature.c:794 +#: lib/signature.c:800 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:830 +#: lib/signature.c:836 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:879 +#: lib/signature.c:885 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1066 +#: lib/signature.c:1072 msgid "V3 RSA/MD5 signature: " msgstr "" -#: lib/signature.c:1176 +#: lib/signature.c:1182 msgid "Header " msgstr "" -#: lib/signature.c:1177 +#: lib/signature.c:1183 #, fuzzy msgid "V3 DSA signature: " msgstr " --sign - genre une signature PGP" -#: lib/signature.c:1252 +#: lib/signature.c:1258 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1279 +#: lib/signature.c:1285 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1283 +#: lib/signature.c:1289 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" @@ -2939,12 +2939,12 @@ msgstr "impossible d'ouvrir: %s\n" msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:100 +#: rpmdb/db1.c:98 rpmdb/db3.c:98 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:103 +#: rpmdb/db1.c:101 rpmdb/db3.c:101 #, c-format msgid "db%d error(%d): %s\n" msgstr "" @@ -2987,70 +2987,70 @@ msgstr "impossible d'ouvrir: %s\n" msgid "cannot get %s lock on database\n" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "exclusive" msgstr "" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "shared" msgstr "" -#: rpmdb/db3.c:129 +#: rpmdb/db3.c:127 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:147 +#: rpmdb/db3.c:145 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:187 +#: rpmdb/db3.c:185 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/db3.c:711 +#: rpmdb/db3.c:614 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/db3.c:778 +#: rpmdb/db3.c:681 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/db3.c:1001 +#: rpmdb/db3.c:903 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/db3.c:1226 +#: rpmdb/db3.c:1119 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: rpmdb/db3.c:1232 +#: rpmdb/db3.c:1125 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/dbconfig.c:404 +#: rpmdb/dbconfig.c:400 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:442 +#: rpmdb/dbconfig.c:438 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:451 +#: rpmdb/dbconfig.c:447 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:460 +#: rpmdb/dbconfig.c:456 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3162,155 +3162,149 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:163 +#: rpmdb/rpmdb.c:165 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:440 +#: rpmdb/rpmdb.c:258 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:462 +#: rpmdb/rpmdb.c:280 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:554 +#: rpmdb/rpmdb.c:379 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:685 +#: rpmdb/rpmdb.c:516 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:695 +#: rpmdb/rpmdb.c:529 #, fuzzy, c-format msgid "error(%d) removing record %s from %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:954 +#: rpmdb/rpmdb.c:788 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1102 -msgid "" -"old format database is present; use --rebuilddb to generate a new format " -"database\n" -msgstr "" - #. error -#: rpmdb/rpmdb.c:1367 +#: rpmdb/rpmdb.c:1174 #, fuzzy, c-format msgid "error(%d) counting packages\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: rpmdb/rpmdb.c:2146 rpmdb/rpmdb.c:3507 +#: rpmdb/rpmdb.c:1971 rpmdb/rpmdb.c:3357 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2199 +#: rpmdb/rpmdb.c:2034 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2478 +#: rpmdb/rpmdb.c:2306 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: rpmdb/rpmdb.c:2639 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2643 +#: rpmdb/rpmdb.c:2476 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2813 +#: rpmdb/rpmdb.c:2663 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: rpmdb/rpmdb.c:3008 +#: rpmdb/rpmdb.c:2858 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:2862 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3393 +#: rpmdb/rpmdb.c:3243 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3276 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3453 +#: rpmdb/rpmdb.c:3303 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3457 +#: rpmdb/rpmdb.c:3307 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3313 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3315 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3472 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3483 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3547 +#: rpmdb/rpmdb.c:3397 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3565 +#: rpmdb/rpmdb.c:3415 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3573 +#: rpmdb/rpmdb.c:3423 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3575 +#: rpmdb/rpmdb.c:3425 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3585 +#: rpmdb/rpmdb.c:3435 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3587 +#: rpmdb/rpmdb.c:3437 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2002-04-14 17:43-0400\n" +"POT-Creation-Date: 2002-05-01 18:05-0400\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n" "Language-Team: Galician <trasno@ceu.fi.udc.es>\n" @@ -113,7 +113,7 @@ msgstr "" msgid "use <dir> as the top level directory" msgstr "" -#: rpmqv.c:125 lib/poptI.c:219 +#: rpmqv.c:125 lib/poptI.c:215 msgid "<dir>" msgstr "" @@ -1409,72 +1409,72 @@ msgstr "" msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:367 +#: lib/depends.c:380 msgid "(cached)" msgstr "" -#: lib/depends.c:392 +#: lib/depends.c:405 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:408 +#: lib/depends.c:421 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:429 +#: lib/depends.c:442 msgid "(db files)" msgstr "" -#: lib/depends.c:441 +#: lib/depends.c:454 msgid "(db provides)" msgstr "" -#: lib/depends.c:454 +#: lib/depends.c:467 msgid "(db package)" msgstr "" -#: lib/depends.c:762 +#: lib/depends.c:783 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:903 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1171 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1277 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1370 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1440 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1475 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1480 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2978 rpmdb/header.c:2999 rpmdb/header.c:3021 +#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 msgid "(not a number)" msgstr "" @@ -1608,223 +1608,223 @@ msgstr "" msgid "%s: Fread failed: %s\n" msgstr "" -#: lib/poptI.c:53 +#: lib/poptI.c:49 msgid "exclude paths must begin with a /" msgstr "" -#: lib/poptI.c:65 +#: lib/poptI.c:61 msgid "relocations must begin with a /" msgstr "" -#: lib/poptI.c:67 +#: lib/poptI.c:63 msgid "relocations must contain a =" msgstr "" -#: lib/poptI.c:70 +#: lib/poptI.c:66 msgid "relocations must have a / following the =" msgstr "" -#: lib/poptI.c:84 +#: lib/poptI.c:80 msgid "rollback takes a time/date stamp argument" msgstr "" -#: lib/poptI.c:91 +#: lib/poptI.c:87 msgid "malformed rollback time/date stamp argument" msgstr "" -#: lib/poptI.c:110 +#: lib/poptI.c:106 msgid "install all files, even configurations which might otherwise be skipped" msgstr "" -#: lib/poptI.c:114 +#: lib/poptI.c:110 msgid "" "remove all packages which match <package> (normally an error is generated if " "<package> specified multiple packages)" msgstr "" -#: lib/poptI.c:120 lib/poptI.c:175 +#: lib/poptI.c:116 lib/poptI.c:171 msgid "do not execute package scriptlet(s)" msgstr "" -#: lib/poptI.c:124 +#: lib/poptI.c:120 msgid "relocate files in non-relocateable package" msgstr "" -#: lib/poptI.c:127 +#: lib/poptI.c:123 msgid "save erased package files by renaming into sub-directory" msgstr "" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "erase (uninstall) package" msgstr "" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "<package>+" msgstr "" -#: lib/poptI.c:133 +#: lib/poptI.c:129 msgid "do not install documentation" msgstr "" -#: lib/poptI.c:135 +#: lib/poptI.c:131 msgid "skip files with leading component <path> " msgstr "" -#: lib/poptI.c:136 +#: lib/poptI.c:132 msgid "<path>" msgstr "" -#: lib/poptI.c:139 +#: lib/poptI.c:135 msgid "short hand for --replacepkgs --replacefiles" msgstr "" -#: lib/poptI.c:142 +#: lib/poptI.c:138 msgid "upgrade package(s) if already installed" msgstr "" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 +#: lib/poptI.c:139 lib/poptI.c:155 lib/poptI.c:236 msgid "<packagefile>+" msgstr "" -#: lib/poptI.c:145 +#: lib/poptI.c:141 msgid "print hash marks as package installs (good with -v)" msgstr "" -#: lib/poptI.c:148 +#: lib/poptI.c:144 msgid "don't verify package architecture" msgstr "" -#: lib/poptI.c:151 +#: lib/poptI.c:147 msgid "don't verify package operating system" msgstr "" -#: lib/poptI.c:154 +#: lib/poptI.c:150 msgid "don't check disk space before installing" msgstr "" -#: lib/poptI.c:156 +#: lib/poptI.c:152 msgid "install documentation" msgstr "" -#: lib/poptI.c:159 +#: lib/poptI.c:155 msgid "install package(s)" msgstr "" -#: lib/poptI.c:161 +#: lib/poptI.c:157 msgid "update the database, but do not modify the filesystem" msgstr "" -#: lib/poptI.c:163 +#: lib/poptI.c:159 msgid "do not verify package dependencies" msgstr "" -#: lib/poptI.c:166 +#: lib/poptI.c:162 msgid "do not reorder package installation to satisfy dependencies" msgstr "" -#: lib/poptI.c:171 +#: lib/poptI.c:167 msgid "do not suggest missing dependency resolution(s)" msgstr "" -#: lib/poptI.c:178 +#: lib/poptI.c:174 #, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "" -#: lib/poptI.c:181 +#: lib/poptI.c:177 #, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "" -#: lib/poptI.c:184 +#: lib/poptI.c:180 #, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "" -#: lib/poptI.c:187 +#: lib/poptI.c:183 #, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "" -#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 msgid "don't verify package digest(s)" msgstr "" -#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 msgid "don't verify package signature(s)" msgstr "" -#: lib/poptI.c:196 +#: lib/poptI.c:192 msgid "do not execute any scriptlet(s) triggered by this package" msgstr "" -#: lib/poptI.c:199 +#: lib/poptI.c:195 #, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "" -#: lib/poptI.c:202 +#: lib/poptI.c:198 #, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "" -#: lib/poptI.c:205 +#: lib/poptI.c:201 #, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "" -#: lib/poptI.c:208 +#: lib/poptI.c:204 #, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "" -#: lib/poptI.c:212 +#: lib/poptI.c:208 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" msgstr "" -#: lib/poptI.c:216 +#: lib/poptI.c:212 msgid "print percentages as package installs" msgstr "" -#: lib/poptI.c:218 +#: lib/poptI.c:214 msgid "relocate the package to <dir>, if relocatable" msgstr "" -#: lib/poptI.c:221 +#: lib/poptI.c:217 msgid "relocate files from path <old> to <new>" msgstr "" -#: lib/poptI.c:222 +#: lib/poptI.c:218 msgid "<old>=<new>" msgstr "" -#: lib/poptI.c:225 +#: lib/poptI.c:221 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:228 +#: lib/poptI.c:224 msgid "install even if the package replaces installed files" msgstr "" -#: lib/poptI.c:231 +#: lib/poptI.c:227 msgid "reinstall if the package is already present" msgstr "" -#: lib/poptI.c:233 +#: lib/poptI.c:229 msgid "deinstall new, reinstall old, package(s), back to <date>" msgstr "" -#: lib/poptI.c:234 +#: lib/poptI.c:230 msgid "<date>" msgstr "" -#: lib/poptI.c:236 +#: lib/poptI.c:232 msgid "don't install, but tell if it would work or not" msgstr "" -#: lib/poptI.c:239 +#: lib/poptI.c:235 msgid "upgrade package(s)" msgstr "" @@ -2205,96 +2205,96 @@ msgstr "" msgid "package has neither file owner or id lists\n" msgstr "" -#: lib/query.c:463 +#: lib/query.c:464 #, c-format msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/query.c:618 lib/query.c:656 lib/rpminstall.c:352 lib/rpminstall.c:494 #: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:633 +#: lib/query.c:634 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:639 +#: lib/query.c:640 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:665 lib/rpminstall.c:507 +#: lib/query.c:666 lib/rpminstall.c:507 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" -#: lib/query.c:709 +#: lib/query.c:710 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:730 +#: lib/query.c:731 msgid "no packages\n" msgstr "" -#: lib/query.c:750 +#: lib/query.c:751 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:760 +#: lib/query.c:761 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:774 lib/query.c:796 lib/query.c:817 lib/query.c:852 +#: lib/query.c:775 lib/query.c:797 lib/query.c:818 lib/query.c:853 #, c-format msgid "malformed %s: %s\n" msgstr "" -#: lib/query.c:784 lib/query.c:802 lib/query.c:827 lib/query.c:857 +#: lib/query.c:785 lib/query.c:803 lib/query.c:828 lib/query.c:858 #, c-format msgid "no package matches %s: %s\n" msgstr "" -#: lib/query.c:868 +#: lib/query.c:869 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:879 +#: lib/query.c:880 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:913 +#: lib/query.c:914 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:917 +#: lib/query.c:918 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:944 +#: lib/query.c:945 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:947 +#: lib/query.c:948 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:952 +#: lib/query.c:953 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:963 lib/rpminstall.c:675 +#: lib/query.c:964 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2598,137 +2598,137 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/signature.c:123 +#: lib/signature.c:124 msgid "file is not regular -- skipping size check\n" msgstr "" -#: lib/signature.c:132 +#: lib/signature.c:142 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:137 +#: lib/signature.c:147 #, c-format msgid " Actual size: %12d\n" msgstr "" -#: lib/signature.c:157 +#: lib/signature.c:167 msgid "No signature\n" msgstr "" -#: lib/signature.c:161 +#: lib/signature.c:171 msgid "Old PGP signature\n" msgstr "" -#: lib/signature.c:172 +#: lib/signature.c:182 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "" -#: lib/signature.c:226 +#: lib/signature.c:232 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "" -#: lib/signature.c:305 lib/signature.c:402 lib/signature.c:669 -#: lib/signature.c:702 +#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675 +#: lib/signature.c:708 #, c-format msgid "Could not exec %s: %s\n" msgstr "" -#: lib/signature.c:321 +#: lib/signature.c:327 msgid "pgp failed\n" msgstr "" #. PGP failed to write signature #. Just in case -#: lib/signature.c:328 +#: lib/signature.c:334 msgid "pgp failed to write signature\n" msgstr "" -#: lib/signature.c:333 +#: lib/signature.c:339 #, c-format msgid "PGP sig size: %d\n" msgstr "" -#: lib/signature.c:347 lib/signature.c:445 +#: lib/signature.c:353 lib/signature.c:451 msgid "unable to read the signature\n" msgstr "" -#: lib/signature.c:352 +#: lib/signature.c:358 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:419 +#: lib/signature.c:425 msgid "gpg failed\n" msgstr "" #. GPG failed to write signature #. Just in case -#: lib/signature.c:426 +#: lib/signature.c:432 msgid "gpg failed to write signature\n" msgstr "" -#: lib/signature.c:431 +#: lib/signature.c:437 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:450 +#: lib/signature.c:456 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:707 lib/signature.c:758 +#: lib/signature.c:713 lib/signature.c:764 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:737 +#: lib/signature.c:743 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "" -#: lib/signature.c:750 +#: lib/signature.c:756 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "" -#: lib/signature.c:794 +#: lib/signature.c:800 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:830 +#: lib/signature.c:836 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:879 +#: lib/signature.c:885 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1066 +#: lib/signature.c:1072 msgid "V3 RSA/MD5 signature: " msgstr "" -#: lib/signature.c:1176 +#: lib/signature.c:1182 msgid "Header " msgstr "" -#: lib/signature.c:1177 +#: lib/signature.c:1183 msgid "V3 DSA signature: " msgstr "" -#: lib/signature.c:1252 +#: lib/signature.c:1258 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1279 +#: lib/signature.c:1285 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1283 +#: lib/signature.c:1289 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" @@ -2763,12 +2763,12 @@ msgstr "" msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:100 +#: rpmdb/db1.c:98 rpmdb/db3.c:98 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:103 +#: rpmdb/db1.c:101 rpmdb/db3.c:101 #, c-format msgid "db%d error(%d): %s\n" msgstr "" @@ -2811,70 +2811,70 @@ msgstr "" msgid "cannot get %s lock on database\n" msgstr "" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "exclusive" msgstr "" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "shared" msgstr "" -#: rpmdb/db3.c:129 +#: rpmdb/db3.c:127 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:147 +#: rpmdb/db3.c:145 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:187 +#: rpmdb/db3.c:185 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: rpmdb/db3.c:711 +#: rpmdb/db3.c:614 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:778 +#: rpmdb/db3.c:681 #, c-format msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:1001 +#: rpmdb/db3.c:903 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1226 +#: rpmdb/db3.c:1119 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: rpmdb/db3.c:1232 +#: rpmdb/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:404 +#: rpmdb/dbconfig.c:400 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:442 +#: rpmdb/dbconfig.c:438 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:451 +#: rpmdb/dbconfig.c:447 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:460 +#: rpmdb/dbconfig.c:456 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -2982,155 +2982,149 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:163 +#: rpmdb/rpmdb.c:165 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:440 +#: rpmdb/rpmdb.c:258 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: rpmdb/rpmdb.c:462 +#: rpmdb/rpmdb.c:280 #, c-format msgid "cannot open %s index\n" msgstr "" -#: rpmdb/rpmdb.c:554 +#: rpmdb/rpmdb.c:379 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:685 +#: rpmdb/rpmdb.c:516 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:695 +#: rpmdb/rpmdb.c:529 #, c-format msgid "error(%d) removing record %s from %s\n" msgstr "" -#: rpmdb/rpmdb.c:954 +#: rpmdb/rpmdb.c:788 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1102 -msgid "" -"old format database is present; use --rebuilddb to generate a new format " -"database\n" -msgstr "" - #. error -#: rpmdb/rpmdb.c:1367 +#: rpmdb/rpmdb.c:1174 #, c-format msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2146 rpmdb/rpmdb.c:3507 +#: rpmdb/rpmdb.c:1971 rpmdb/rpmdb.c:3357 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2199 +#: rpmdb/rpmdb.c:2034 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2478 +#: rpmdb/rpmdb.c:2306 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2639 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2643 +#: rpmdb/rpmdb.c:2476 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2813 +#: rpmdb/rpmdb.c:2663 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3008 +#: rpmdb/rpmdb.c:2858 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:2862 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3393 +#: rpmdb/rpmdb.c:3243 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3276 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3453 +#: rpmdb/rpmdb.c:3303 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3457 +#: rpmdb/rpmdb.c:3307 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3313 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3315 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3472 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3483 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3547 +#: rpmdb/rpmdb.c:3397 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3565 +#: rpmdb/rpmdb.c:3415 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3573 +#: rpmdb/rpmdb.c:3423 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3575 +#: rpmdb/rpmdb.c:3425 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3585 +#: rpmdb/rpmdb.c:3435 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3587 +#: rpmdb/rpmdb.c:3437 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-14 17:43-0400\n" +"POT-Creation-Date: 2002-05-01 18:05-0400\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen <ra@hp.is>\n" "Language-Team: is <kde-isl@mmedia.is>\n" @@ -114,7 +114,7 @@ msgstr "" msgid "use <dir> as the top level directory" msgstr "" -#: rpmqv.c:125 lib/poptI.c:219 +#: rpmqv.c:125 lib/poptI.c:215 msgid "<dir>" msgstr "" @@ -1416,73 +1416,73 @@ msgstr "" msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:367 +#: lib/depends.c:380 msgid "(cached)" msgstr "" -#: lib/depends.c:392 +#: lib/depends.c:405 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:408 +#: lib/depends.c:421 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:429 +#: lib/depends.c:442 msgid "(db files)" msgstr "" -#: lib/depends.c:441 +#: lib/depends.c:454 msgid "(db provides)" msgstr "" -#: lib/depends.c:454 +#: lib/depends.c:467 #, fuzzy msgid "(db package)" msgstr "uppfæra pakka" -#: lib/depends.c:762 +#: lib/depends.c:783 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:903 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1171 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1277 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1370 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1440 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1475 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1480 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2978 rpmdb/header.c:2999 rpmdb/header.c:3021 +#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 msgid "(not a number)" msgstr "" @@ -1616,226 +1616,226 @@ msgstr "" msgid "%s: Fread failed: %s\n" msgstr "" -#: lib/poptI.c:53 +#: lib/poptI.c:49 msgid "exclude paths must begin with a /" msgstr "" -#: lib/poptI.c:65 +#: lib/poptI.c:61 msgid "relocations must begin with a /" msgstr "" -#: lib/poptI.c:67 +#: lib/poptI.c:63 msgid "relocations must contain a =" msgstr "" -#: lib/poptI.c:70 +#: lib/poptI.c:66 msgid "relocations must have a / following the =" msgstr "" -#: lib/poptI.c:84 +#: lib/poptI.c:80 msgid "rollback takes a time/date stamp argument" msgstr "" -#: lib/poptI.c:91 +#: lib/poptI.c:87 msgid "malformed rollback time/date stamp argument" msgstr "" -#: lib/poptI.c:110 +#: lib/poptI.c:106 msgid "install all files, even configurations which might otherwise be skipped" msgstr "" -#: lib/poptI.c:114 +#: lib/poptI.c:110 msgid "" "remove all packages which match <package> (normally an error is generated if " "<package> specified multiple packages)" msgstr "" -#: lib/poptI.c:120 lib/poptI.c:175 +#: lib/poptI.c:116 lib/poptI.c:171 msgid "do not execute package scriptlet(s)" msgstr "" -#: lib/poptI.c:124 +#: lib/poptI.c:120 msgid "relocate files in non-relocateable package" msgstr "" -#: lib/poptI.c:127 +#: lib/poptI.c:123 msgid "save erased package files by renaming into sub-directory" msgstr "" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "erase (uninstall) package" msgstr "" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "<package>+" msgstr "<pakkaskrá>+" -#: lib/poptI.c:133 +#: lib/poptI.c:129 msgid "do not install documentation" msgstr "" -#: lib/poptI.c:135 +#: lib/poptI.c:131 msgid "skip files with leading component <path> " msgstr "" -#: lib/poptI.c:136 +#: lib/poptI.c:132 msgid "<path>" msgstr "" -#: lib/poptI.c:139 +#: lib/poptI.c:135 msgid "short hand for --replacepkgs --replacefiles" msgstr "" -#: lib/poptI.c:142 +#: lib/poptI.c:138 msgid "upgrade package(s) if already installed" msgstr "" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 +#: lib/poptI.c:139 lib/poptI.c:155 lib/poptI.c:236 msgid "<packagefile>+" msgstr "<pakkaskrá>+" -#: lib/poptI.c:145 +#: lib/poptI.c:141 msgid "print hash marks as package installs (good with -v)" msgstr "" -#: lib/poptI.c:148 +#: lib/poptI.c:144 msgid "don't verify package architecture" msgstr "" -#: lib/poptI.c:151 +#: lib/poptI.c:147 msgid "don't verify package operating system" msgstr "" -#: lib/poptI.c:154 +#: lib/poptI.c:150 msgid "don't check disk space before installing" msgstr "" -#: lib/poptI.c:156 +#: lib/poptI.c:152 msgid "install documentation" msgstr "" -#: lib/poptI.c:159 +#: lib/poptI.c:155 #, fuzzy msgid "install package(s)" msgstr "setja inn pakka" -#: lib/poptI.c:161 +#: lib/poptI.c:157 msgid "update the database, but do not modify the filesystem" msgstr "" -#: lib/poptI.c:163 +#: lib/poptI.c:159 msgid "do not verify package dependencies" msgstr "" -#: lib/poptI.c:166 +#: lib/poptI.c:162 msgid "do not reorder package installation to satisfy dependencies" msgstr "" -#: lib/poptI.c:171 +#: lib/poptI.c:167 msgid "do not suggest missing dependency resolution(s)" msgstr "" -#: lib/poptI.c:178 +#: lib/poptI.c:174 #, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "" -#: lib/poptI.c:181 +#: lib/poptI.c:177 #, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "" -#: lib/poptI.c:184 +#: lib/poptI.c:180 #, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "" -#: lib/poptI.c:187 +#: lib/poptI.c:183 #, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "" -#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy msgid "don't verify package digest(s)" msgstr "ekki yfirfara MD5 undirritun skráa" -#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy msgid "don't verify package signature(s)" msgstr "búa til undirskrift" -#: lib/poptI.c:196 +#: lib/poptI.c:192 msgid "do not execute any scriptlet(s) triggered by this package" msgstr "" -#: lib/poptI.c:199 +#: lib/poptI.c:195 #, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "" -#: lib/poptI.c:202 +#: lib/poptI.c:198 #, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "" -#: lib/poptI.c:205 +#: lib/poptI.c:201 #, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "" -#: lib/poptI.c:208 +#: lib/poptI.c:204 #, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "" -#: lib/poptI.c:212 +#: lib/poptI.c:208 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" msgstr "" -#: lib/poptI.c:216 +#: lib/poptI.c:212 msgid "print percentages as package installs" msgstr "" -#: lib/poptI.c:218 +#: lib/poptI.c:214 msgid "relocate the package to <dir>, if relocatable" msgstr "" -#: lib/poptI.c:221 +#: lib/poptI.c:217 msgid "relocate files from path <old> to <new>" msgstr "" -#: lib/poptI.c:222 +#: lib/poptI.c:218 msgid "<old>=<new>" msgstr "<gömul>=<ný>" -#: lib/poptI.c:225 +#: lib/poptI.c:221 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:228 +#: lib/poptI.c:224 msgid "install even if the package replaces installed files" msgstr "" -#: lib/poptI.c:231 +#: lib/poptI.c:227 msgid "reinstall if the package is already present" msgstr "" -#: lib/poptI.c:233 +#: lib/poptI.c:229 msgid "deinstall new, reinstall old, package(s), back to <date>" msgstr "" -#: lib/poptI.c:234 +#: lib/poptI.c:230 msgid "<date>" msgstr "" -#: lib/poptI.c:236 +#: lib/poptI.c:232 msgid "don't install, but tell if it would work or not" msgstr "" -#: lib/poptI.c:239 +#: lib/poptI.c:235 msgid "upgrade package(s)" msgstr "uppfæra pakka" @@ -2223,96 +2223,96 @@ msgstr "" msgid "package has neither file owner or id lists\n" msgstr "" -#: lib/query.c:463 +#: lib/query.c:464 #, c-format msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/query.c:618 lib/query.c:656 lib/rpminstall.c:352 lib/rpminstall.c:494 #: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:633 +#: lib/query.c:634 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:639 +#: lib/query.c:640 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:665 lib/rpminstall.c:507 +#: lib/query.c:666 lib/rpminstall.c:507 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: gat ekki lesið manifest: %s\n" -#: lib/query.c:709 +#: lib/query.c:710 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:730 +#: lib/query.c:731 msgid "no packages\n" msgstr "" -#: lib/query.c:750 +#: lib/query.c:751 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:760 +#: lib/query.c:761 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:774 lib/query.c:796 lib/query.c:817 lib/query.c:852 +#: lib/query.c:775 lib/query.c:797 lib/query.c:818 lib/query.c:853 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "Get ekki lesið %s: %s.\n" -#: lib/query.c:784 lib/query.c:802 lib/query.c:827 lib/query.c:857 +#: lib/query.c:785 lib/query.c:803 lib/query.c:828 lib/query.c:858 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "gat ekki búið til %%%s %s\n" -#: lib/query.c:868 +#: lib/query.c:869 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:879 +#: lib/query.c:880 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:913 +#: lib/query.c:914 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:917 +#: lib/query.c:918 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:944 +#: lib/query.c:945 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:947 +#: lib/query.c:948 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:952 +#: lib/query.c:953 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:963 lib/rpminstall.c:675 +#: lib/query.c:964 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2617,137 +2617,137 @@ msgstr "Get ekki opnað %s til lesturs: %s.\n" msgid "cannot open Packages database in %s\n" msgstr "get ekki opnað pakka gagnagrunn í\n" -#: lib/signature.c:123 +#: lib/signature.c:124 msgid "file is not regular -- skipping size check\n" msgstr "" -#: lib/signature.c:132 +#: lib/signature.c:142 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:137 +#: lib/signature.c:147 #, c-format msgid " Actual size: %12d\n" msgstr "" -#: lib/signature.c:157 +#: lib/signature.c:167 msgid "No signature\n" msgstr "" -#: lib/signature.c:161 +#: lib/signature.c:171 msgid "Old PGP signature\n" msgstr "" -#: lib/signature.c:172 +#: lib/signature.c:182 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "" -#: lib/signature.c:226 +#: lib/signature.c:232 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "" -#: lib/signature.c:305 lib/signature.c:402 lib/signature.c:669 -#: lib/signature.c:702 +#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675 +#: lib/signature.c:708 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Gat ekki keyrt %s: %s\n" -#: lib/signature.c:321 +#: lib/signature.c:327 msgid "pgp failed\n" msgstr "pgp brást\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:328 +#: lib/signature.c:334 msgid "pgp failed to write signature\n" msgstr "pgp gat ekki lesið undirskriftina\n" -#: lib/signature.c:333 +#: lib/signature.c:339 #, c-format msgid "PGP sig size: %d\n" msgstr "" -#: lib/signature.c:347 lib/signature.c:445 +#: lib/signature.c:353 lib/signature.c:451 msgid "unable to read the signature\n" msgstr "get ekki lesið undirskriftina\n" -#: lib/signature.c:352 +#: lib/signature.c:358 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:419 +#: lib/signature.c:425 msgid "gpg failed\n" msgstr "ggp brást\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:426 +#: lib/signature.c:432 msgid "gpg failed to write signature\n" msgstr "gpg get ekki lesið undirskriftina\n" -#: lib/signature.c:431 +#: lib/signature.c:437 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:450 +#: lib/signature.c:456 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:707 lib/signature.c:758 +#: lib/signature.c:713 lib/signature.c:764 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:737 +#: lib/signature.c:743 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "" -#: lib/signature.c:750 +#: lib/signature.c:756 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "" -#: lib/signature.c:794 +#: lib/signature.c:800 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:830 +#: lib/signature.c:836 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:879 +#: lib/signature.c:885 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1066 +#: lib/signature.c:1072 msgid "V3 RSA/MD5 signature: " msgstr "" -#: lib/signature.c:1176 +#: lib/signature.c:1182 msgid "Header " msgstr "" -#: lib/signature.c:1177 +#: lib/signature.c:1183 msgid "V3 DSA signature: " msgstr "" -#: lib/signature.c:1252 +#: lib/signature.c:1258 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1279 +#: lib/signature.c:1285 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1283 +#: lib/signature.c:1289 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" @@ -2782,12 +2782,12 @@ msgstr "Óuppfyllt pakkaskilyrði fyrir %s-%s-%s: " msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:100 +#: rpmdb/db1.c:98 rpmdb/db3.c:98 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:103 +#: rpmdb/db1.c:101 rpmdb/db3.c:101 #, c-format msgid "db%d error(%d): %s\n" msgstr "" @@ -2830,70 +2830,70 @@ msgstr "" msgid "cannot get %s lock on database\n" msgstr "get ekki fengið %s lás á gagnagrunninn\n" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "exclusive" msgstr "einka" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "shared" msgstr "deildann" -#: rpmdb/db3.c:129 +#: rpmdb/db3.c:127 #, c-format msgid "closed db environment %s/%s\n" msgstr "lokaði gagnagrunnsumhverfi %s/%s\n" -#: rpmdb/db3.c:147 +#: rpmdb/db3.c:145 #, c-format msgid "removed db environment %s/%s\n" msgstr "fjarlægði gagnagrunnsumhverfi %s/%s\n" -#: rpmdb/db3.c:187 +#: rpmdb/db3.c:185 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "opna gagnagrunnsumhverfi %s/%s %s\n" -#: rpmdb/db3.c:711 +#: rpmdb/db3.c:614 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:778 +#: rpmdb/db3.c:681 #, c-format msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:1001 +#: rpmdb/db3.c:903 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1226 +#: rpmdb/db3.c:1119 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: rpmdb/db3.c:1232 +#: rpmdb/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:404 +#: rpmdb/dbconfig.c:400 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:442 +#: rpmdb/dbconfig.c:438 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:451 +#: rpmdb/dbconfig.c:447 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:460 +#: rpmdb/dbconfig.c:456 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3001,155 +3001,149 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:163 +#: rpmdb/rpmdb.c:165 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:440 +#: rpmdb/rpmdb.c:258 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "get ekki opnað %s index með db%d - %s (%d)\n" -#: rpmdb/rpmdb.c:462 +#: rpmdb/rpmdb.c:280 #, c-format msgid "cannot open %s index\n" msgstr "get ekki opnað %s index\n" -#: rpmdb/rpmdb.c:554 +#: rpmdb/rpmdb.c:379 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:685 +#: rpmdb/rpmdb.c:516 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:695 +#: rpmdb/rpmdb.c:529 #, c-format msgid "error(%d) removing record %s from %s\n" msgstr "" -#: rpmdb/rpmdb.c:954 +#: rpmdb/rpmdb.c:788 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1102 -msgid "" -"old format database is present; use --rebuilddb to generate a new format " -"database\n" -msgstr "" - #. error -#: rpmdb/rpmdb.c:1367 +#: rpmdb/rpmdb.c:1174 #, c-format msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2146 rpmdb/rpmdb.c:3507 +#: rpmdb/rpmdb.c:1971 rpmdb/rpmdb.c:3357 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2199 +#: rpmdb/rpmdb.c:2034 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2478 +#: rpmdb/rpmdb.c:2306 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2639 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2643 +#: rpmdb/rpmdb.c:2476 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2813 +#: rpmdb/rpmdb.c:2663 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3008 +#: rpmdb/rpmdb.c:2858 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:2862 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3393 +#: rpmdb/rpmdb.c:3243 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3276 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3453 +#: rpmdb/rpmdb.c:3303 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3457 +#: rpmdb/rpmdb.c:3307 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3313 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3315 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3472 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3483 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3547 +#: rpmdb/rpmdb.c:3397 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3565 +#: rpmdb/rpmdb.c:3415 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3573 +#: rpmdb/rpmdb.c:3423 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3575 +#: rpmdb/rpmdb.c:3425 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3585 +#: rpmdb/rpmdb.c:3435 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3587 +#: rpmdb/rpmdb.c:3437 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-14 17:43-0400\n" +"POT-Creation-Date: 2002-05-01 18:05-0400\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n" "Language-Team: JRPM <jrpm@linux.or.jp>\n" @@ -122,7 +122,7 @@ msgstr "" msgid "use <dir> as the top level directory" msgstr "¥È¥Ã¥×¥Ç¥£¥ì¥¯¥È¥ê¤È¤·¤Æ <dir> ¤ò»ÈÍѤ·¤Þ¤¹" -#: rpmqv.c:125 lib/poptI.c:219 +#: rpmqv.c:125 lib/poptI.c:215 msgid "<dir>" msgstr "" @@ -1488,77 +1488,77 @@ msgstr "¼ºÇÔ - " msgid "package %s was already added, replacing with %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: lib/depends.c:367 +#: lib/depends.c:380 msgid "(cached)" msgstr "" -#: lib/depends.c:392 +#: lib/depends.c:405 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:408 +#: lib/depends.c:421 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:429 +#: lib/depends.c:442 #, fuzzy msgid "(db files)" msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" -#: lib/depends.c:441 +#: lib/depends.c:454 #, fuzzy msgid "(db provides)" msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:454 +#: lib/depends.c:467 #, fuzzy msgid "(db package)" msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Þ¤·¤¿\n" -#: lib/depends.c:762 +#: lib/depends.c:783 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:903 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1171 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1277 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1370 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1440 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1475 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1480 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2978 rpmdb/header.c:2999 rpmdb/header.c:3021 +#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 msgid "(not a number)" msgstr "(¿ô»ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó)" @@ -1698,36 +1698,36 @@ msgstr "" msgid "%s: Fread failed: %s\n" msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: lib/poptI.c:53 +#: lib/poptI.c:49 #, fuzzy msgid "exclude paths must begin with a /" msgstr "½ü³°¤¹¤ë¥Ñ¥¹¤Ï / ¤«¤é»Ï¤Þ¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" -#: lib/poptI.c:65 +#: lib/poptI.c:61 msgid "relocations must begin with a /" msgstr "ºÆÇÛÃÖ¤Ï / ¤«¤é»Ï¤Þ¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" -#: lib/poptI.c:67 +#: lib/poptI.c:63 msgid "relocations must contain a =" msgstr "ºÆÇÛÃÖ¤Ï = ¤ò´Þ¤ó¤Ç¤¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" -#: lib/poptI.c:70 +#: lib/poptI.c:66 msgid "relocations must have a / following the =" msgstr "ºÆÇÛÃÖ¤Ï = ¤Î¼¡¤Ë / ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" -#: lib/poptI.c:84 +#: lib/poptI.c:80 msgid "rollback takes a time/date stamp argument" msgstr "" -#: lib/poptI.c:91 +#: lib/poptI.c:87 msgid "malformed rollback time/date stamp argument" msgstr "" -#: lib/poptI.c:110 +#: lib/poptI.c:106 msgid "install all files, even configurations which might otherwise be skipped" msgstr "ÀßÄê¤ò¥¹¥¥Ã¥×¤·¡¢Á´¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹" -#: lib/poptI.c:114 +#: lib/poptI.c:110 msgid "" "remove all packages which match <package> (normally an error is generated if " "<package> specified multiple packages)" @@ -1735,159 +1735,159 @@ msgstr "" "<package> ¤È°ìÃפ¹¤ë¥Ñ¥Ã¥±¡¼¥¸Á´¤Æ¤òºï½ü¤·¤Þ¤¹(°ìÈÌ\n" "\t\t\t Ū¤ËÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤹ¤ë¤È¥¨¥é¡¼¤Ë¤Ê¤ê¤Þ¤¹)" -#: lib/poptI.c:120 lib/poptI.c:175 +#: lib/poptI.c:116 lib/poptI.c:171 #, fuzzy msgid "do not execute package scriptlet(s)" msgstr "¥Ñ¥Ã¥±¡¼¥¸»ØÄê¤Î¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤»¤ó" -#: lib/poptI.c:124 +#: lib/poptI.c:120 #, fuzzy msgid "relocate files in non-relocateable package" msgstr "¥Ñ¥¹ %s ¤ÏºÆÇÛÃ֤Ǥ¤Þ¤»¤ó(¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤ËÂФ·¤Æ)" -#: lib/poptI.c:127 +#: lib/poptI.c:123 msgid "save erased package files by renaming into sub-directory" msgstr "" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "erase (uninstall) package" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü(¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ë)¤·¤Þ¤¹" -#: lib/poptI.c:130 +#: lib/poptI.c:126 #, fuzzy msgid "<package>+" msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Þ¤·¤¿\n" -#: lib/poptI.c:133 +#: lib/poptI.c:129 msgid "do not install documentation" msgstr "¥É¥¥å¥á¥ó¥È¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤»¤ó" -#: lib/poptI.c:135 +#: lib/poptI.c:131 #, fuzzy msgid "skip files with leading component <path> " msgstr "¥Ñ¥¹ <path> Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥¹¥¥Ã¥×¤·¤Þ¤¹" -#: lib/poptI.c:136 +#: lib/poptI.c:132 msgid "<path>" msgstr "" -#: lib/poptI.c:139 +#: lib/poptI.c:135 msgid "short hand for --replacepkgs --replacefiles" msgstr "--replacepkgs ¤È --replacefiles ¤òû½Ì¤·¤¿¤â¤Î" -#: lib/poptI.c:142 +#: lib/poptI.c:138 #, fuzzy msgid "upgrade package(s) if already installed" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 +#: lib/poptI.c:139 lib/poptI.c:155 lib/poptI.c:236 #, fuzzy msgid "<packagefile>+" msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹" -#: lib/poptI.c:145 +#: lib/poptI.c:141 msgid "print hash marks as package installs (good with -v)" msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëºÝ¤Ë '#' ¤Çɽ¼¨¤·¤Þ¤¹(-v ¤ò»ÈÍѤ¹¤ë¤ÈÎɤ¤)" -#: lib/poptI.c:148 +#: lib/poptI.c:144 msgid "don't verify package architecture" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤ÎÂоݥ¢¡¼¥¥Æ¥¯¥Á¥ã¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" -#: lib/poptI.c:151 +#: lib/poptI.c:147 msgid "don't verify package operating system" msgstr "¥Ñ¥Ã¥±¡¼¥¸ÂоÝOS¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" -#: lib/poptI.c:154 +#: lib/poptI.c:150 msgid "don't check disk space before installing" msgstr "¥¤¥ó¥¹¥È¡¼¥ëÁ°¤Ë¥Ç¥£¥¹¥¯¤ÎÍÆÎÌ¥Á¥§¥Ã¥¯¤ò¤·¤Þ¤»¤ó" -#: lib/poptI.c:156 +#: lib/poptI.c:152 msgid "install documentation" msgstr "¥É¥¥å¥á¥ó¥È¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹" -#: lib/poptI.c:159 +#: lib/poptI.c:155 #, fuzzy msgid "install package(s)" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹" -#: lib/poptI.c:161 +#: lib/poptI.c:157 msgid "update the database, but do not modify the filesystem" msgstr "" "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¹¹¿·¤·¤Þ¤¹¤¬¡¢\n" "¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ÎÊѹ¹¤·¤Þ¤»¤ó" -#: lib/poptI.c:163 +#: lib/poptI.c:159 msgid "do not verify package dependencies" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î°Í¸´Ø·¸¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" -#: lib/poptI.c:166 +#: lib/poptI.c:162 msgid "do not reorder package installation to satisfy dependencies" msgstr "" "°Í¸À¤òËþ¤¿¤¹¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î\n" "¥¤¥ó¥¹¥È¡¼¥ë¤òÍ׵ᤷ¤Þ¤»¤ó" -#: lib/poptI.c:171 +#: lib/poptI.c:167 msgid "do not suggest missing dependency resolution(s)" msgstr "" -#: lib/poptI.c:178 +#: lib/poptI.c:174 #, fuzzy, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "¤É¤ÎÃʳ¬¤â¼Â¹Ô¤·¤Þ¤»¤ó" -#: lib/poptI.c:181 +#: lib/poptI.c:177 #, fuzzy, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "¤É¤ÎÃʳ¬¤â¼Â¹Ô¤·¤Þ¤»¤ó" -#: lib/poptI.c:184 +#: lib/poptI.c:180 #, fuzzy, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "¤É¤ÎÃʳ¬¤â¼Â¹Ô¤·¤Þ¤»¤ó" -#: lib/poptI.c:187 +#: lib/poptI.c:183 #, fuzzy, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "¤É¤ÎÃʳ¬¤â¼Â¹Ô¤·¤Þ¤»¤ó" -#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy msgid "don't verify package digest(s)" msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" -#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy msgid "don't verify package signature(s)" msgstr "½ð̾¤Î¸¡¾Ú¤ò¤·¤Þ¤¹" -#: lib/poptI.c:196 +#: lib/poptI.c:192 #, fuzzy msgid "do not execute any scriptlet(s) triggered by this package" msgstr "" "¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤Æ¥È¥ê¥¬¡¼¤µ¤ì¤ë¥¹¥¯¥ê¥×¥È¤ò\n" "¼Â¹Ô¤·¤Þ¤»¤ó" -#: lib/poptI.c:199 +#: lib/poptI.c:195 #, fuzzy, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "¥Ñ¥Ã¥±¡¼¥¸»ØÄê¤Î¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤»¤ó" -#: lib/poptI.c:202 +#: lib/poptI.c:198 #, fuzzy, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤»¤ó" -#: lib/poptI.c:205 +#: lib/poptI.c:201 #, fuzzy, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤»¤ó" -#: lib/poptI.c:208 +#: lib/poptI.c:204 #, fuzzy, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤»¤ó" -#: lib/poptI.c:212 +#: lib/poptI.c:208 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1895,53 +1895,53 @@ msgstr "" "¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤Þ¤¹\n" "(¥¢¥Ã¥×¥°¥ì¡¼¥É»þ¤Î --force ¤Ï¤³¤ì¤ò¼«Æ°Åª¤Ë¹Ô¤¤¤Þ¤¹)" -#: lib/poptI.c:216 +#: lib/poptI.c:212 msgid "print percentages as package installs" msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëºÝ¤Ë '%' ¤Çɽ¼¨¤·¤Þ¤¹" -#: lib/poptI.c:218 +#: lib/poptI.c:214 msgid "relocate the package to <dir>, if relocatable" msgstr "" "ºÆÇÛÃÖ²Äǽ¤Ê¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ·¡¢¥¤¥ó¥¹¥È¡¼¥ë¥Ñ¥¹\n" "ÀÜƬ¼¤ò <dir> ¤ËÀßÄꤷ¤Þ¤¹" -#: lib/poptI.c:221 +#: lib/poptI.c:217 #, fuzzy msgid "relocate files from path <old> to <new>" msgstr "<oldpath> ¤«¤é <newpath> ¤Ë¥Õ¥¡¥¤¥ë¤òºÆÇÛÃÖ¤µ¤»¤Þ¤¹" -#: lib/poptI.c:222 +#: lib/poptI.c:218 #, fuzzy msgid "<old>=<new>" msgstr "<oldpath> ¤«¤é <newpath> ¤Ë¥Õ¥¡¥¤¥ë¤òºÆÇÛÃÖ¤µ¤»¤Þ¤¹" -#: lib/poptI.c:225 +#: lib/poptI.c:221 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:228 +#: lib/poptI.c:224 msgid "install even if the package replaces installed files" msgstr "" "¥¤¥ó¥¹¥È¡¼¥ë»þ¤ËÃÖ¤´¹¤¨¤é¤ì¤ë¥Õ¥¡¥¤¥ë¤¬\n" "¤¢¤Ã¤Æ¤â¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹" -#: lib/poptI.c:231 +#: lib/poptI.c:227 msgid "reinstall if the package is already present" msgstr "´û¤Ë¸ºß¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ç¤âºÆ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹" -#: lib/poptI.c:233 +#: lib/poptI.c:229 msgid "deinstall new, reinstall old, package(s), back to <date>" msgstr "" -#: lib/poptI.c:234 +#: lib/poptI.c:230 msgid "<date>" msgstr "" -#: lib/poptI.c:236 +#: lib/poptI.c:232 msgid "don't install, but tell if it would work or not" msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤»¤º¤Ë¡¢¥Æ¥¹¥È¤Î¤ß¹Ô¤¤¤Þ¤¹" -#: lib/poptI.c:239 +#: lib/poptI.c:235 #, fuzzy msgid "upgrade package(s)" msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹" @@ -2376,97 +2376,97 @@ msgstr "(²¿¤Î¾õÂ֤⤢¤ê¤Þ¤»¤ó)" msgid "package has neither file owner or id lists\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ï¥Õ¥¡¥¤¥ë½êͼԤä id ¥ê¥¹¥È¤ò¤É¤Á¤é¤â»ý¤Ã¤Æ¤¤¤Þ¤»¤ó" -#: lib/query.c:463 +#: lib/query.c:464 #, fuzzy, c-format msgid "can't query %s: %s\n" msgstr "%s ¤òºï½ü(unlink)¤Ç¤¤Þ¤»¤ó: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/query.c:618 lib/query.c:656 lib/rpminstall.c:352 lib/rpminstall.c:494 #: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n" -#: lib/query.c:633 +#: lib/query.c:634 #, c-format msgid "query of %s failed\n" msgstr "%s ¤Ø¤ÎÌ䤤¹ç¤ï¤»¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: lib/query.c:639 +#: lib/query.c:640 msgid "old format source packages cannot be queried\n" msgstr "µì·Á¼°¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤ë¤³¤È¤Ï¤Ç¤¤Þ¤»¤ó\n" -#: lib/query.c:665 lib/rpminstall.c:507 +#: lib/query.c:666 lib/rpminstall.c:507 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: lib/query.c:709 +#: lib/query.c:710 #, fuzzy, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë %s ¤Ø¤ÎÌ䤤¹ç¤ï¤»¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡¢¥Ñ¡¼¥¹¤Ç¤¤Þ¤»¤ó\n" -#: lib/query.c:730 +#: lib/query.c:731 #, fuzzy msgid "no packages\n" msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Þ¤·¤¿\n" -#: lib/query.c:750 +#: lib/query.c:751 #, c-format msgid "group %s does not contain any packages\n" msgstr "¥°¥ë¡¼¥× %s ¤Ë°¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n" -#: lib/query.c:760 +#: lib/query.c:761 #, c-format msgid "no package triggers %s\n" msgstr "%s ¤ò¥È¥ê¥¬¡¼¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n" -#: lib/query.c:774 lib/query.c:796 lib/query.c:817 lib/query.c:852 +#: lib/query.c:775 lib/query.c:797 lib/query.c:818 lib/query.c:853 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "%s ¤òÆɤà¤Î¤Ë¼ºÇÔ: $s¡£" -#: lib/query.c:784 lib/query.c:802 lib/query.c:827 lib/query.c:857 +#: lib/query.c:785 lib/query.c:803 lib/query.c:828 lib/query.c:858 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "%s ¤ò¥È¥ê¥¬¡¼¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n" -#: lib/query.c:868 +#: lib/query.c:869 #, c-format msgid "no package requires %s\n" msgstr "%s ¤òɬÍפȤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n" -#: lib/query.c:879 +#: lib/query.c:880 #, c-format msgid "no package provides %s\n" msgstr "%s ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n" -#: lib/query.c:913 +#: lib/query.c:914 #, c-format msgid "file %s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s: %s\n" -#: lib/query.c:917 +#: lib/query.c:918 #, c-format msgid "file %s is not owned by any package\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Ï¤É¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤â°¤·¤Æ¤¤¤Þ¤»¤ó\n" -#: lib/query.c:944 +#: lib/query.c:945 #, c-format msgid "invalid package number: %s\n" msgstr "̵¸ú¤Ê¥Ñ¥Ã¥±¡¼¥¸ÈÖ¹æ: %s\n" -#: lib/query.c:947 +#: lib/query.c:948 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ì¥³¡¼¥ÉÈÖ¹æ %d\n" -#: lib/query.c:952 +#: lib/query.c:953 #, fuzzy, c-format msgid "record %u could not be read\n" msgstr "¥ì¥³¡¼¥É %d ¤òÆɤळ¤È¤¬¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿\n" -#: lib/query.c:963 lib/rpminstall.c:675 +#: lib/query.c:964 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" @@ -2778,147 +2778,147 @@ msgstr "Æɤ߹þ¤à¤¿¤á¤Ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó: %s¡£" msgid "cannot open Packages database in %s\n" msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó\n" -#: lib/signature.c:123 +#: lib/signature.c:124 msgid "file is not regular -- skipping size check\n" msgstr "" "¥Õ¥¡¥¤¥ë¤Ï°ìÈ̤Υե¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó -- ¥µ¥¤¥º¥Á¥§¥Ã¥¯¤ò¥¹¥¥Ã¥×¤·¤Þ¤¹\n" -#: lib/signature.c:132 +#: lib/signature.c:142 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:137 +#: lib/signature.c:147 #, fuzzy, c-format msgid " Actual size: %12d\n" msgstr "½ð̾¥µ¥¤¥º: %d\n" -#: lib/signature.c:157 +#: lib/signature.c:167 msgid "No signature\n" msgstr "½ð̾¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: lib/signature.c:161 +#: lib/signature.c:171 msgid "Old PGP signature\n" msgstr "¸Å¤¤ PGP ½ð̾\n" -#: lib/signature.c:172 +#: lib/signature.c:182 #, fuzzy msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "¸Å¤¤(ÆâÉô¤À¤±¤Î)½ð̾! ¤É¤¦¤ä¤Ã¤Æ¤½¤ì¤ò¼ê¤Ë¤¤¤ì¤Þ¤·¤¿¤«!?" -#: lib/signature.c:226 +#: lib/signature.c:232 #, fuzzy, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "½ð̾¥µ¥¤¥º: %d\n" -#: lib/signature.c:305 lib/signature.c:402 lib/signature.c:669 -#: lib/signature.c:702 +#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675 +#: lib/signature.c:708 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "%s ¤ò¼Â¹Ô¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿: %s" -#: lib/signature.c:321 +#: lib/signature.c:327 #, fuzzy msgid "pgp failed\n" msgstr "pgp ¼ºÇÔ" #. PGP failed to write signature #. Just in case -#: lib/signature.c:328 +#: lib/signature.c:334 #, fuzzy msgid "pgp failed to write signature\n" msgstr "pgp ¤¬½ð̾¤ò½ñ¤¹þ¤à¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: lib/signature.c:333 +#: lib/signature.c:339 #, c-format msgid "PGP sig size: %d\n" msgstr "PGP ½ð̾¥µ¥¤¥º: %s\n" -#: lib/signature.c:347 lib/signature.c:445 +#: lib/signature.c:353 lib/signature.c:451 #, fuzzy msgid "unable to read the signature\n" msgstr "½ð̾¤òÆɤळ¤È¤¬¤Ç¤¤Þ¤»¤ó" -#: lib/signature.c:352 +#: lib/signature.c:358 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "PGP ½ð̾¤Î %d ¥Ð¥¤¥È¤ò¼èÆÀ\n" -#: lib/signature.c:419 +#: lib/signature.c:425 #, fuzzy msgid "gpg failed\n" msgstr "gpg ¼ºÇÔ" #. GPG failed to write signature #. Just in case -#: lib/signature.c:426 +#: lib/signature.c:432 #, fuzzy msgid "gpg failed to write signature\n" msgstr "gpg ¤¬½ð̾¤ò½ñ¤¹þ¤à¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: lib/signature.c:431 +#: lib/signature.c:437 #, fuzzy, c-format msgid "GPG sig size: %d\n" msgstr "GPG ½ð̾¥µ¥¤¥º: %s\n" -#: lib/signature.c:450 +#: lib/signature.c:456 #, fuzzy, c-format msgid "Got %d bytes of GPG sig\n" msgstr "GPG ½ð̾¤Î %d ¥Ð¥¤¥È¤ò¼èÆÀ\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:707 lib/signature.c:758 +#: lib/signature.c:713 lib/signature.c:764 #, fuzzy, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "¥Þ¥¯¥í¥Õ¥¡¥¤¥ëÃæ¤Î̵¸ú¤Ê %%_signature ¡£\n" -#: lib/signature.c:737 +#: lib/signature.c:743 #, fuzzy, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "¥Þ¥¯¥í¥Õ¥¡¥¤¥ë¤Ë \"%%_pgp_name\" ¤òÀßÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" -#: lib/signature.c:750 +#: lib/signature.c:756 #, fuzzy, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "¥Þ¥¯¥í¥Õ¥¡¥¤¥ë¤Ë \"%%_pgp_name\" ¤òÀßÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" -#: lib/signature.c:794 +#: lib/signature.c:800 #, fuzzy msgid "Header+Payload size: " msgstr "¥Ø¥Ã¥À¥µ¥¤¥º¤¬Â礤¹¤®¤Þ¤¹" -#: lib/signature.c:830 +#: lib/signature.c:836 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:879 +#: lib/signature.c:885 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1066 +#: lib/signature.c:1072 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "MD5 ½ð̾¤ò¥¹¥¥Ã¥×¤·¤Þ¤¹" -#: lib/signature.c:1176 +#: lib/signature.c:1182 msgid "Header " msgstr "" -#: lib/signature.c:1177 +#: lib/signature.c:1183 #, fuzzy msgid "V3 DSA signature: " msgstr "½ð̾¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: lib/signature.c:1252 +#: lib/signature.c:1258 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1279 +#: lib/signature.c:1285 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1283 +#: lib/signature.c:1289 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "½ð̾¥Ñ¥Ã¥É: %d\n" @@ -2953,12 +2953,12 @@ msgstr "%s-%s-%s ¤Î¤¿¤á¤Î°Í¸À¤òËþ¤¿¤·¤Æ¤¤¤Þ¤»¤ó:" msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:100 +#: rpmdb/db1.c:98 rpmdb/db3.c:98 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:103 +#: rpmdb/db1.c:101 rpmdb/db3.c:101 #, c-format msgid "db%d error(%d): %s\n" msgstr "" @@ -3001,70 +3001,70 @@ msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥â¡¼¥É 0x%x ¤Î¥ª¡¼¥×¥ó (%s)\n" msgid "cannot get %s lock on database\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î %s ¤ò¥í¥Ã¥¯¤Ç¤¤Þ¤»¤ó" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "exclusive" msgstr "½ü³°" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "shared" msgstr "¶¦Í" -#: rpmdb/db3.c:129 +#: rpmdb/db3.c:127 #, fuzzy, c-format msgid "closed db environment %s/%s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/db3.c:147 +#: rpmdb/db3.c:145 #, fuzzy, c-format msgid "removed db environment %s/%s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/db3.c:187 +#: rpmdb/db3.c:185 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/db3.c:711 +#: rpmdb/db3.c:614 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/db3.c:778 +#: rpmdb/db3.c:681 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/db3.c:1001 +#: rpmdb/db3.c:903 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥â¡¼¥É 0x%x ¤Î¥ª¡¼¥×¥ó (%s)\n" -#: rpmdb/db3.c:1226 +#: rpmdb/db3.c:1119 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î %s ¤ò¥í¥Ã¥¯¤Ç¤¤Þ¤»¤ó" -#: rpmdb/db3.c:1232 +#: rpmdb/db3.c:1125 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/dbconfig.c:404 +#: rpmdb/dbconfig.c:400 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:442 +#: rpmdb/dbconfig.c:438 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:451 +#: rpmdb/dbconfig.c:447 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:460 +#: rpmdb/dbconfig.c:456 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3180,158 +3180,152 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:163 +#: rpmdb/rpmdb.c:165 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:440 +#: rpmdb/rpmdb.c:258 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó %s:%d" -#: rpmdb/rpmdb.c:462 +#: rpmdb/rpmdb.c:280 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó\n" -#: rpmdb/rpmdb.c:554 +#: rpmdb/rpmdb.c:379 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)" -#: rpmdb/rpmdb.c:685 +#: rpmdb/rpmdb.c:516 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ " -#: rpmdb/rpmdb.c:695 +#: rpmdb/rpmdb.c:529 #, fuzzy, c-format msgid "error(%d) removing record %s from %s\n" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ëºï½ü¤Ç¥¨¥é¡¼" -#: rpmdb/rpmdb.c:954 +#: rpmdb/rpmdb.c:788 #, fuzzy msgid "no dbpath has been set\n" msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:1102 -msgid "" -"old format database is present; use --rebuilddb to generate a new format " -"database\n" -msgstr "" - #. error -#: rpmdb/rpmdb.c:1367 +#: rpmdb/rpmdb.c:1174 #, fuzzy, c-format msgid "error(%d) counting packages\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n" -#: rpmdb/rpmdb.c:2146 rpmdb/rpmdb.c:3507 +#: rpmdb/rpmdb.c:1971 rpmdb/rpmdb.c:3357 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î¥ì¥³¡¼¥ÉÈÖ¹æ %d ¤ÏÉÔÀµ¤Ç¤¹ -- ¥¹¥¥Ã¥×¤·¤Þ¤¹" -#: rpmdb/rpmdb.c:2199 +#: rpmdb/rpmdb.c:2034 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2478 +#: rpmdb/rpmdb.c:2306 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "¸¡º÷¤Î¤¿¤á¤Î %d ¤Ç ¥Ø¥Ã¥À¤òÆɤळ¤È¤¬¤Ç¤¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:2639 +#: rpmdb/rpmdb.c:2472 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:2643 +#: rpmdb/rpmdb.c:2476 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "name ¥¤¥ó¥Ç¥Ã¥¯¥¹ºï½ü¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:2813 +#: rpmdb/rpmdb.c:2663 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n" -#: rpmdb/rpmdb.c:3008 +#: rpmdb/rpmdb.c:2858 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:2862 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3393 +#: rpmdb/rpmdb.c:3243 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3276 msgid "no dbpath has been set" msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:3453 +#: rpmdb/rpmdb.c:3303 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "rootdir %s Ãæ¤Ç¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3457 +#: rpmdb/rpmdb.c:3307 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "°ì»þŪ¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹ %s ¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3313 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3315 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3472 +#: rpmdb/rpmdb.c:3322 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n" -#: rpmdb/rpmdb.c:3483 +#: rpmdb/rpmdb.c:3333 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n" -#: rpmdb/rpmdb.c:3547 +#: rpmdb/rpmdb.c:3397 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "%d ¤Ë ¥ª¥ê¥¸¥Ê¥ë¤Î¥ì¥³¡¼¥É¤òÉղäǤ¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:3565 +#: rpmdb/rpmdb.c:3415 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "" "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºÆ¹½Ãۤ˼ºÇÔ; ¥ª¥ê¥¸¥Ê¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬¤Þ¤À¤½¤³¤Ë»Ä¤Ã¤Æ¤¤¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3573 +#: rpmdb/rpmdb.c:3423 msgid "failed to replace old database with new database!\n" msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÃÖ¤´¹¤¨¤ë¤Î¤Ë¼ºÇÔ!\n" -#: rpmdb/rpmdb.c:3575 +#: rpmdb/rpmdb.c:3425 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "%s Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥ê¥«¥Ð¡¼¤¹¤ë¤¿¤á¤Ë %s ¤«¤é¥Õ¥¡¥¤¥ë¤ÈÃÖ¤´¹¤¨¤Þ¤¹" -#: rpmdb/rpmdb.c:3585 +#: rpmdb/rpmdb.c:3435 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3587 +#: rpmdb/rpmdb.c:3437 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-14 17:43-0400\n" +"POT-Creation-Date: 2002-05-01 18:05-0400\n" "PO-Revision-Date: 2001-09-07 22:03+0900\n" "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n" "Language-Team: GNU Translation project <ko@li.org>\n" @@ -114,7 +114,7 @@ msgstr "<¸í·É>" msgid "use <dir> as the top level directory" msgstr "<µð·ºÅ丮> ¸¦ ÃÖ»óÀ§ µð·ºÅ丮·Î »ç¿ëÇÕ´Ï´Ù" -#: rpmqv.c:125 lib/poptI.c:219 +#: rpmqv.c:125 lib/poptI.c:215 msgid "<dir>" msgstr "<µð·ºÅ丮>" @@ -1430,52 +1430,52 @@ msgstr " ½ÇÆÐÇÔ - " msgid "package %s was already added, replacing with %s\n" msgstr "%s ÆÐÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/depends.c:367 +#: lib/depends.c:380 msgid "(cached)" msgstr "" -#: lib/depends.c:392 +#: lib/depends.c:405 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s ¿¹ (rpmrcÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:408 +#: lib/depends.c:421 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s ¿¹ (rpmlibÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:429 +#: lib/depends.c:442 #, fuzzy msgid "(db files)" msgstr "À߸øµÈ db ÆÄÀÏ %s\n" -#: lib/depends.c:441 +#: lib/depends.c:454 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n" -#: lib/depends.c:454 +#: lib/depends.c:467 #, fuzzy msgid "(db package)" msgstr "ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n" -#: lib/depends.c:762 +#: lib/depends.c:783 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:903 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort °ü°è¿¡¼ %s-%s-%s \"%s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1171 msgid "========== recording tsort relations\n" msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1277 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1483,26 +1483,26 @@ msgid "" msgstr "" "========== ÆÐÅ°Áö¸¦ tsort ÇÕ´Ï´Ù (¼ø¼, #¼±ÀÓÀÚ, #ÈÄÀÓÀÚ, ±íÀÌ[depth])\n" -#: lib/depends.c:1349 +#: lib/depends.c:1370 msgid "========== successors only (presentation order)\n" msgstr "========== ÈÄÀÓÀÚ [successors only] (Ç¥Çö ¼ø)\n" -#: lib/depends.c:1419 +#: lib/depends.c:1440 msgid "LOOP:\n" msgstr "·çÇÁ(LOOP):\n" -#: lib/depends.c:1454 +#: lib/depends.c:1475 msgid "========== continuing tsort ...\n" msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1480 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2978 rpmdb/header.c:2999 rpmdb/header.c:3021 +#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 msgid "(not a number)" msgstr "(¼ýÀÚ°¡ ¾Æ´Õ´Ï´Ù)" @@ -1640,36 +1640,36 @@ msgstr "" msgid "%s: Fread failed: %s\n" msgstr "%s: Fread¿¡ ½ÇÆÐÇß½À´Ï´Ù: %s\n" -#: lib/poptI.c:53 +#: lib/poptI.c:49 msgid "exclude paths must begin with a /" msgstr "Á¦¿Ü½Ãų °æ·Î´Â ¹Ýµå½Ã '/' ·Î ½ÃÀ۵Ǿî¾ß ÇÕ´Ï´Ù" -#: lib/poptI.c:65 +#: lib/poptI.c:61 msgid "relocations must begin with a /" msgstr "Àç¹èÄ¡½Ã¿¡´Â ¹Ýµå½Ã '/' ·Î ½ÃÀ۵Ǿî¾ß ÇÕ´Ï´Ù" -#: lib/poptI.c:67 +#: lib/poptI.c:63 msgid "relocations must contain a =" msgstr "Àç¹èÄ¡½Ã¿¡´Â ¹Ýµå½Ã '=' ÀÌ Æ÷ÇԵǾî¾ß ÇÕ´Ï´Ù" -#: lib/poptI.c:70 +#: lib/poptI.c:66 msgid "relocations must have a / following the =" msgstr "Àç¹èÄ¡½Ã¿¡´Â ¹Ýµå½Ã '=' µÚ¿¡ '/' °¡ ¿Í¾ß ÇÕ´Ï´Ù" -#: lib/poptI.c:84 +#: lib/poptI.c:80 msgid "rollback takes a time/date stamp argument" msgstr "" -#: lib/poptI.c:91 +#: lib/poptI.c:87 #, fuzzy msgid "malformed rollback time/date stamp argument" msgstr "¿Ã¹Ù¸£Áö ¸øÇÑ ·Ñ¹é(rollback) ½Ã°£" -#: lib/poptI.c:110 +#: lib/poptI.c:106 msgid "install all files, even configurations which might otherwise be skipped" msgstr "¾î¶°ÇÑ ¼³Á¤¿¡ »ó°ü¾øÀÌ ÆÐÅ°Áö ¾ÈÀÇ ¸ðµç ÆÄÀÏÀ» ¼³Ä¡ÇÕ´Ï´Ù" -#: lib/poptI.c:114 +#: lib/poptI.c:110 msgid "" "remove all packages which match <package> (normally an error is generated if " "<package> specified multiple packages)" @@ -1677,148 +1677,148 @@ msgstr "" "<ÆÐÅ°Áö> À̸§°ú ÀÏÄ¡ÇÏ´Â ÆÐÅ°Áö´Â ¸ðµÎ Á¦°ÅÇÕ´Ï´Ù (<ÆÐÅ°Áö> ¿¡ ¿©·¯°³ÀÇ ÆÐÅ°" "Áö¸¦ ÁöÁ¤ÇÏ½Ç °æ¿ì¿¡´Â ¿À·ù°¡ ¹ß»ýµË´Ï´Ù)" -#: lib/poptI.c:120 lib/poptI.c:175 +#: lib/poptI.c:116 lib/poptI.c:171 msgid "do not execute package scriptlet(s)" msgstr "ÆÐÅ°Áö ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptI.c:124 +#: lib/poptI.c:120 msgid "relocate files in non-relocateable package" msgstr "Àç¹èÄ¡ ±â´ÉÀÌ ¾ø´Â ÆÐÅ°ÁöÀÇ ÆÄÀÏÀ» Àç¹èÄ¡ÇÏ¿© ¼³Ä¡ÇÕ´Ï´Ù" -#: lib/poptI.c:127 +#: lib/poptI.c:123 msgid "save erased package files by renaming into sub-directory" msgstr "ÇϺÎ-µð·ºÅ丮·Î À̸§ º¯°æ½Ã »èÁ¦µÈ ÆÐÅ°Áö ÆÄÀÏÀ» ÀúÀåÇÕ´Ï´Ù" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "erase (uninstall) package" msgstr "ÆÐÅ°Áö¸¦ (Á¦°Å) »èÁ¦ÇÕ´Ï´Ù" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "<package>+" msgstr "<ÆÐÅ°Áö>+" -#: lib/poptI.c:133 +#: lib/poptI.c:129 msgid "do not install documentation" msgstr "ÆÐÅ°Áö¿¡ Æ÷ÇÔµÈ ¹®¼ ÆÄÀÏÀ» ¼³Ä¡ÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptI.c:135 +#: lib/poptI.c:131 msgid "skip files with leading component <path> " msgstr "<°æ·Î> ·Î ½ÃÀ۵Ǵ ÆÄÀÏÀº ¼³Ä¡ÇÏÁö ¾Ê½À´Ï´Ù " -#: lib/poptI.c:136 +#: lib/poptI.c:132 msgid "<path>" msgstr "<°æ·Î>" -#: lib/poptI.c:139 +#: lib/poptI.c:135 msgid "short hand for --replacepkgs --replacefiles" msgstr "--replacepkgs ¿Í --replacefiles ¿É¼ÇÀ» µ¿½Ã¿¡ »ç¿ëÇÕ´Ï´Ù" -#: lib/poptI.c:142 +#: lib/poptI.c:138 msgid "upgrade package(s) if already installed" msgstr "±âÁ¸¿¡ ¼³Ä¡µÈ ÆÐÅ°Áö¸¦ ¾÷±×·¹À̵å ÇÕ´Ï´Ù" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 +#: lib/poptI.c:139 lib/poptI.c:155 lib/poptI.c:236 msgid "<packagefile>+" msgstr "<ÆÐÅ°ÁöÆÄÀÏ>+" -#: lib/poptI.c:145 +#: lib/poptI.c:141 msgid "print hash marks as package installs (good with -v)" msgstr "" "ÆÐÅ°Áö ¼³Ä¡¸¦ Çؽø¶Å©(#)·Î Ç¥½ÃÇÕ´Ï´Ù (-v ¿É¼Ç°ú ÇÔ²² »ç¿ëÇÏ´Â °ÍÀÌ ÁÁ½À´Ï" "´Ù)" -#: lib/poptI.c:148 +#: lib/poptI.c:144 msgid "don't verify package architecture" msgstr "ÆÐÅ°ÁöÀÇ ¾ÆÅ°ÅØÃĸ¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptI.c:151 +#: lib/poptI.c:147 msgid "don't verify package operating system" msgstr "ÆÐÅ°ÁöÀÇ ¿î¿µÃ¼Á¦¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptI.c:154 +#: lib/poptI.c:150 msgid "don't check disk space before installing" msgstr "ÆÐÅ°Áö¸¦ ¼³Ä¡Çϱâ Àü¿¡ µð½ºÅ© °ø°£À» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptI.c:156 +#: lib/poptI.c:152 msgid "install documentation" msgstr "ÆÐÅ°Áö¿¡ Æ÷ÇÔµÈ ¹®¼ ÆÄÀÏÀ» ¼³Ä¡ÇÕ´Ï´Ù" -#: lib/poptI.c:159 +#: lib/poptI.c:155 #, fuzzy msgid "install package(s)" msgstr "ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÕ´Ï´Ù" -#: lib/poptI.c:161 +#: lib/poptI.c:157 msgid "update the database, but do not modify the filesystem" msgstr "ÆÄÀϽýºÅÛÀ» º¯°æÇÏÁö ¾Ê°í, µ¥ÀÌÅͺ£À̽º¸¦ °»½ÅÇÕ´Ï´Ù" -#: lib/poptI.c:163 +#: lib/poptI.c:159 msgid "do not verify package dependencies" msgstr "ÆÐÅ°ÁöÀÇ ÀÇÁ¸¼ºÀ» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptI.c:166 +#: lib/poptI.c:162 msgid "do not reorder package installation to satisfy dependencies" msgstr "ÀÇÁ¸¼ºÀÌ ÀÖ´Â ÆÐÅ°Áö¸¦ ¼³Ä¡Çϵµ·Ï Àç¿ä±¸ÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptI.c:171 +#: lib/poptI.c:167 msgid "do not suggest missing dependency resolution(s)" msgstr "" -#: lib/poptI.c:178 +#: lib/poptI.c:174 #, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "%%pre ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù (ÀÖÀ» °æ¿ì)" -#: lib/poptI.c:181 +#: lib/poptI.c:177 #, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "%%post ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù (ÀÖÀ» °æ¿ì)" -#: lib/poptI.c:184 +#: lib/poptI.c:180 #, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "%%preun ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù (ÀÖÀ» °æ¿ì)" -#: lib/poptI.c:187 +#: lib/poptI.c:183 #, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "%%postun ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù (ÀÖÀ» °æ¿ì)" -#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy msgid "don't verify package digest(s)" msgstr "ÆÄÀÏÀÇ MD5 Ãà¾à(digest)À» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy msgid "don't verify package signature(s)" msgstr "ÆÐÅ°ÁöÀÇ ¼¸íÀ» °Ë»çÇÕ´Ï´Ù" -#: lib/poptI.c:196 +#: lib/poptI.c:192 msgid "do not execute any scriptlet(s) triggered by this package" msgstr "ÀÌ ÆÐÅ°Áö¿¡ ÀÇÇØ ¹ß»ýµÇ´Â ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptI.c:199 +#: lib/poptI.c:195 #, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "%%triggerprein ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptI.c:202 +#: lib/poptI.c:198 #, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "%%triggerin ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptI.c:205 +#: lib/poptI.c:201 #, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "%%triggerun ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptI.c:208 +#: lib/poptI.c:204 #, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "%%triggerpostun ½ºÅ©¸³Æ®¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptI.c:212 +#: lib/poptI.c:208 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1826,49 +1826,49 @@ msgstr "" "ÀÌÀü ¹öÀüÀÇ ÆÐÅ°Áö·Î ´Ù¿î±×·¹À̵å ÇÕ´Ï´Ù (--force ¿É¼ÇÀ» »ç¿ë½Ã¿¡´Â ÀÌ ¿É¼Ç" "ÀÌ ÀÚµ¿À¸·Î Àû¿ëµË´Ï´Ù)" -#: lib/poptI.c:216 +#: lib/poptI.c:212 msgid "print percentages as package installs" msgstr "ÆÐÅ°Áö ¼³Ä¡¸¦ ÆÛ¼¾Æ®(%)·Î Ç¥½ÃÇÕ´Ï´Ù" -#: lib/poptI.c:218 +#: lib/poptI.c:214 msgid "relocate the package to <dir>, if relocatable" msgstr "" "Àç¹èÄ¡ ±â´ÉÀÌ ÀÖ´Â ÆÐÅ°ÁöÀÇ °æ¿ì, ÁöÁ¤µÈ <µð·ºÅ丮> ·Î Àç¹èÄ¡ÇÏ¿© ¼³Ä¡ÇÕ´Ï´Ù" -#: lib/poptI.c:221 +#: lib/poptI.c:217 msgid "relocate files from path <old> to <new>" msgstr "<ÀÌÀü°æ·Î> ¿¡¼ <»õ·Î¿î°æ·Î> ·Î ÆÄÀÏÀ» Àç¹èÄ¡ ÇÕ´Ï´Ù" -#: lib/poptI.c:222 +#: lib/poptI.c:218 msgid "<old>=<new>" msgstr "<ÀÌÀü°æ·Î>=<»õ·Î¿î°æ·Î>" -#: lib/poptI.c:225 +#: lib/poptI.c:221 msgid "save erased package files by repackaging" msgstr "ÀçÆÐŰ¡(repackaging)À¸·Î ÀÎÇØ »èÁ¦µÇ´Â ÆÐÅ°Áö ÆÄÀÏÀ» ÀúÀåÇÕ´Ï´Ù" -#: lib/poptI.c:228 +#: lib/poptI.c:224 msgid "install even if the package replaces installed files" msgstr "ÆÐÅ°Áö ¼³Ä¡½Ã ±âÁ¸¿¡ ¼³Ä¡µÇ¾î ÀÖ´Â ÆÄÀÏÀ» µ¤¾î¾¹´Ï´Ù" -#: lib/poptI.c:231 +#: lib/poptI.c:227 msgid "reinstall if the package is already present" msgstr "ÆÐÅ°Áö°¡ ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ´Â °æ¿ì¿¡µµ ¼³Ä¡ÇÕ´Ï´Ù" -#: lib/poptI.c:233 +#: lib/poptI.c:229 #, fuzzy msgid "deinstall new, reinstall old, package(s), back to <date>" msgstr "»õ·Î¿î ÆÐÅ°Áö »èÁ¦, ÀÌÀü ÆÐÅ°Áö À缳ġ, ³¯Â¥ º¹±¸(back to date)" -#: lib/poptI.c:234 +#: lib/poptI.c:230 msgid "<date>" msgstr "<³¯Â¥>" -#: lib/poptI.c:236 +#: lib/poptI.c:232 msgid "don't install, but tell if it would work or not" msgstr "ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÏÁö ¾Ê°í, Á¦´ë·Î ¼³Ä¡µÇ´ÂÁö¸¸ È®ÀÎÇÕ´Ï´Ù" -#: lib/poptI.c:239 +#: lib/poptI.c:235 msgid "upgrade package(s)" msgstr "ÆÐÅ°Áö¸¦ ¾÷±×·¹À̵å ÇÕ´Ï´Ù" @@ -2274,96 +2274,96 @@ msgstr "(»óŸ¦ ¾Ë ¼ö ¾øÀ½) " msgid "package has neither file owner or id lists\n" msgstr "ÆÐÅ°Áö¿¡ ÆÄÀÏ ¼ÒÀ¯ÀÚ ¶Ç´Â id ¸ñ·ÏÀÌ ¾ø½À´Ï´Ù\n" -#: lib/query.c:463 +#: lib/query.c:464 #, c-format msgid "can't query %s: %s\n" msgstr "%s (À»)¸¦ ÁúÀÇÇÒ ¼ö ¾øÀ½: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/query.c:618 lib/query.c:656 lib/rpminstall.c:352 lib/rpminstall.c:494 #: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "%s (À»)¸¦ ¿©´Âµ¥ ½ÇÆÐÇÔ: %s\n" -#: lib/query.c:633 +#: lib/query.c:634 #, c-format msgid "query of %s failed\n" msgstr "%s (À»)¸¦ ÁúÀÇÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù\n" -#: lib/query.c:639 +#: lib/query.c:640 msgid "old format source packages cannot be queried\n" msgstr "ÀÌÀü Çü½ÄÀÇ ¼Ò½º ÆÐÅ°Áö´Â ÁúÀÇÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/query.c:665 lib/rpminstall.c:507 +#: lib/query.c:666 lib/rpminstall.c:507 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: Àдµ¥ ½ÇÆÐÇß½À´Ï´Ù: %s\n" -#: lib/query.c:709 +#: lib/query.c:710 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "%s spec ÆÄÀÏÀ» ÁúÀÇÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù, ÆÄÀÏÀ» ºÐ¼®ÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/query.c:730 +#: lib/query.c:731 msgid "no packages\n" msgstr "ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n" -#: lib/query.c:750 +#: lib/query.c:751 #, c-format msgid "group %s does not contain any packages\n" msgstr "%s ±×·ìÀº ¾î¶² ÆÐÅ°Áö¿¡µµ Æ÷ÇԵǾî ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: lib/query.c:760 +#: lib/query.c:761 #, c-format msgid "no package triggers %s\n" msgstr "%s (À»)¸¦ ¹ß»ý½ÃÅ°´Â ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n" -#: lib/query.c:774 lib/query.c:796 lib/query.c:817 lib/query.c:852 +#: lib/query.c:775 lib/query.c:797 lib/query.c:818 lib/query.c:853 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "%s (À»)¸¦ Àдµ¥ ½ÇÆÐÇÔ: %s.\n" -#: lib/query.c:784 lib/query.c:802 lib/query.c:827 lib/query.c:857 +#: lib/query.c:785 lib/query.c:803 lib/query.c:828 lib/query.c:858 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "%s (À»)¸¦ ¹ß»ý½ÃÅ°´Â ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n" -#: lib/query.c:868 +#: lib/query.c:869 #, c-format msgid "no package requires %s\n" msgstr "%s (À»)¸¦ ÇÊ¿ä·Î ÇÏ´Â ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n" -#: lib/query.c:879 +#: lib/query.c:880 #, c-format msgid "no package provides %s\n" msgstr "%s (À»)¸¦ Á¦°øÇÏ´Â ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n" -#: lib/query.c:913 +#: lib/query.c:914 #, c-format msgid "file %s: %s\n" msgstr "%s ÆÄÀÏ: %s\n" -#: lib/query.c:917 +#: lib/query.c:918 #, c-format msgid "file %s is not owned by any package\n" msgstr "%s ÆÄÀÏÀº ¾î¶² ÆÐÅ°Áö¿¡µµ ¼ÓÇØ ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: lib/query.c:944 +#: lib/query.c:945 #, c-format msgid "invalid package number: %s\n" msgstr "ºÎÀûÇÕÇÑ ÆÐÅ°Áö ¹øÈ£: %s\n" -#: lib/query.c:947 +#: lib/query.c:948 #, c-format msgid "package record number: %u\n" msgstr "ÆÐÅ°Áö ±â·Ï(record) ¹øÈ£: %u\n" -#: lib/query.c:952 +#: lib/query.c:953 #, c-format msgid "record %u could not be read\n" msgstr "±â·Ï(record) ¹øÈ£ %u (Àº)´Â ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: lib/query.c:963 lib/rpminstall.c:675 +#: lib/query.c:964 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "%s ÆÐÅ°Áö´Â ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n" @@ -2672,140 +2672,140 @@ msgstr "%s (À»)¸¦ ¿ ¼ö ¾øÀ½: %s.\n" msgid "cannot open Packages database in %s\n" msgstr "%s ¾ÈÀÇ ÆÐÅ°Áö µ¥ÀÌÅͺ£À̽º¸¦ ¿ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/signature.c:123 +#: lib/signature.c:124 msgid "file is not regular -- skipping size check\n" msgstr "ÆÄÀÏÀÌ ¿Ã¹Ù¸£Áö(regular) ¾Ê½À´Ï´Ù -- ¿ë·® °Ë»ç¸¦ »ý·«ÇÕ´Ï´Ù\n" -#: lib/signature.c:132 +#: lib/signature.c:142 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "¿¹»ó(Expected) ¿ë·®: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" -#: lib/signature.c:137 +#: lib/signature.c:147 #, c-format msgid " Actual size: %12d\n" msgstr " ½ÇÁ¦ ¿ë·®: %12d\n" -#: lib/signature.c:157 +#: lib/signature.c:167 msgid "No signature\n" msgstr "¼¸íÀÌ ¾ø½À´Ï´Ù\n" -#: lib/signature.c:161 +#: lib/signature.c:171 msgid "Old PGP signature\n" msgstr "ÀÌÀü PGP ¼¸í\n" -#: lib/signature.c:172 +#: lib/signature.c:182 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "ÀÌÀü (³»ºÎ-¿ë) ¼¸í! ¾î¶»°Ô ¾òÀ¸¼Ì½À´Ï±î!?\n" -#: lib/signature.c:226 +#: lib/signature.c:232 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "¼¸í: size(%d)+pad(%d)\n" -#: lib/signature.c:305 lib/signature.c:402 lib/signature.c:669 -#: lib/signature.c:702 +#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675 +#: lib/signature.c:708 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "%s (À»)¸¦ ½ÇÇàÇÒ ¼ö ¾øÀ½: %s\n" -#: lib/signature.c:321 +#: lib/signature.c:327 msgid "pgp failed\n" msgstr "pgp¿¡ ½ÇÆÐÇÔ\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:328 +#: lib/signature.c:334 msgid "pgp failed to write signature\n" msgstr "pgp ¼¸íÀ» ÀÛ¼ºÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù\n" -#: lib/signature.c:333 +#: lib/signature.c:339 #, c-format msgid "PGP sig size: %d\n" msgstr "PGP ¼¸í ¿ë·®: %d\n" -#: lib/signature.c:347 lib/signature.c:445 +#: lib/signature.c:353 lib/signature.c:451 msgid "unable to read the signature\n" msgstr "¼¸íÀ» ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: lib/signature.c:352 +#: lib/signature.c:358 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "%d ¹ÙÀÌÆ®ÀÇ PGP ¼¸íÀ» ¾ò¾ú½À´Ï´Ù\n" -#: lib/signature.c:419 +#: lib/signature.c:425 msgid "gpg failed\n" msgstr "gpg¿¡ ½ÇÆÐÇÔ\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:426 +#: lib/signature.c:432 msgid "gpg failed to write signature\n" msgstr "gpg ¼¸íÀ» ÀÛ¼ºÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù\n" -#: lib/signature.c:431 +#: lib/signature.c:437 #, c-format msgid "GPG sig size: %d\n" msgstr "GPG ¼¸í ¿ë·®: %d\n" -#: lib/signature.c:450 +#: lib/signature.c:456 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "%d ¹ÙÀÌÆ®ÀÇ GPG ¼¸íÀ» ¾ò¾ú½À´Ï´Ù\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:707 lib/signature.c:758 +#: lib/signature.c:713 lib/signature.c:764 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "¸ÅÅ©·Î ÆÄÀÏ¿¡ ºÎÀûÇÕÇÑ %%_signatureÀÇ ³»¿ëÀÌ ÀÖ½À´Ï´Ù\n" -#: lib/signature.c:737 +#: lib/signature.c:743 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "¸ÅÅ©·Î ÆÄÀÏ¿¡ \"%%_gpg_name\" À» ¼³Á¤ÇØ ÁÖ¼Å¾ß ÇÕ´Ï´Ù\n" -#: lib/signature.c:750 +#: lib/signature.c:756 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "¸ÅÅ©·Î ÆÄÀÏ¿¡ \"%%_pgp_name\" À» ¼³Á¤ÇØ ÁÖ¼Å¾ß ÇÕ´Ï´Ù\n" -#: lib/signature.c:794 +#: lib/signature.c:800 #, fuzzy msgid "Header+Payload size: " msgstr "Çì´õÀÇ Å©±â°¡ ³Ê¹« Å®´Ï´Ù" -#: lib/signature.c:830 +#: lib/signature.c:836 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:879 +#: lib/signature.c:885 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1066 +#: lib/signature.c:1072 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "MD5 ¼¸íÀº °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/signature.c:1176 +#: lib/signature.c:1182 msgid "Header " msgstr "" -#: lib/signature.c:1177 +#: lib/signature.c:1183 #, fuzzy msgid "V3 DSA signature: " msgstr "¼¸íÀÌ ¾ø½À´Ï´Ù\n" -#: lib/signature.c:1252 +#: lib/signature.c:1258 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1279 +#: lib/signature.c:1285 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1283 +#: lib/signature.c:1289 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "¼¸í: size(%d)+pad(%d)\n" @@ -2841,12 +2841,12 @@ msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" "%s-%s-%s: °íÁ¤ Çì´õ ¿µ¿ª Ãà¾à(immutable header region digest) °Ë»ç¿¡ ½ÇÆÐÇÔ\n" -#: rpmdb/db1.c:98 rpmdb/db3.c:100 +#: rpmdb/db1.c:98 rpmdb/db3.c:98 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "%3$s ÀÇ db%1$d ¿À·ù(%2$d): %4$s\n" -#: rpmdb/db1.c:101 rpmdb/db3.c:103 +#: rpmdb/db1.c:101 rpmdb/db3.c:101 #, c-format msgid "db%d error(%d): %s\n" msgstr "db%d ¿À·ù(%d): %s\n" @@ -2891,70 +2891,70 @@ msgstr "¿¸° db ÆÄÀÏ %s ¸ðµå 0x%x\n" msgid "cannot get %s lock on database\n" msgstr "Àá°ÜÀÖ´Â µ¥ÀÌÅͺ£À̽ºÀÇ %s (À»)¸¦ ¾òÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "exclusive" msgstr "Á¦¿ÜÇÔ(exclusive)" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "shared" msgstr "°øÀ¯µÊ" -#: rpmdb/db3.c:129 +#: rpmdb/db3.c:127 #, c-format msgid "closed db environment %s/%s\n" msgstr "´ÝÈù db ȯ°æ %s/%s\n" -#: rpmdb/db3.c:147 +#: rpmdb/db3.c:145 #, c-format msgid "removed db environment %s/%s\n" msgstr "»èÁ¦µÈ db ȯ°æ %s/%s\n" -#: rpmdb/db3.c:187 +#: rpmdb/db3.c:185 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "¿¸° db ȯ°æ %s/%s\n" -#: rpmdb/db3.c:711 +#: rpmdb/db3.c:614 #, c-format msgid "closed db index %s/%s\n" msgstr "´ÝÈù db À妽º %s/%s\n" -#: rpmdb/db3.c:778 +#: rpmdb/db3.c:681 #, c-format msgid "verified db index %s/%s\n" msgstr "°ËÁõµÈ db À妽º %s/%s\n" -#: rpmdb/db3.c:1001 +#: rpmdb/db3.c:903 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "¿¸° db À妽º %s/%s %s ¸ðµå=0x%x\n" -#: rpmdb/db3.c:1226 +#: rpmdb/db3.c:1119 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "Àá°ÜÀÖ´Â %2$s/%3$s ÀÇ %1$s (À»)¸¦ ¾òÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/db3.c:1232 +#: rpmdb/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "Àá±ä db À妽º %s/%s\n" -#: rpmdb/dbconfig.c:404 +#: rpmdb/dbconfig.c:400 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "ÀÎÁõµÇÁö ¾ÊÀº db ¿É¼Ç: \"%s\" (À»)¸¦ ¹«½ÃÇÕ´Ï´Ù.\n" -#: rpmdb/dbconfig.c:442 +#: rpmdb/dbconfig.c:438 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s (Àº)´Â ºÎÀûÇÕÇÑ ¼öÄ¡ °ªÀÔ´Ï´Ù, »ý·«ÇÕ´Ï´Ù\n" -#: rpmdb/dbconfig.c:451 +#: rpmdb/dbconfig.c:447 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s (Àº)´Â ³Ê¹« Å©°Å³ª ³Ê¹« ÀÛÀº Á¤¼ö(long) °ªÀÔ´Ï´Ù, »ý·«ÇÕ´Ï´Ù\n" -#: rpmdb/dbconfig.c:460 +#: rpmdb/dbconfig.c:456 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "%s (Àº)´Â ³Ê¹« Å©°Å³ª ³Ê¹« ÀÛÀº Á¤¼ö(int) °ªÀÔ´Ï´Ù, »ý·«ÇÕ´Ï´Ù\n" @@ -3068,161 +3068,153 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "(±âÁ¸ÀÇ) rpm[23] ÆÐŰ¡°ú ȣȯÇÏ´Â Çì´õ¸¦ »ý¼ºÇÕ´Ï´Ù" #. @-modfilesys@ -#: rpmdb/rpmdb.c:163 +#: rpmdb/rpmdb.c:165 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" "DB ÅÂ±× ÃʱâÈ[dbiTagsInit]: ÀÎÁõµÇÁö ¾ÊÀº ÅÂ±× À̸§: \"%s\" (Àº)´Â ¹«½ÃµË´Ï" "´Ù\n" -#: rpmdb/rpmdb.c:440 +#: rpmdb/rpmdb.c:258 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "db%2$d (À»)¸¦ ÀÌ¿ëÇÏ¿© %1$s À妽º¸¦ ¿ ¼ö ¾ø½À´Ï´Ù - %3$s (%4$d)\n" -#: rpmdb/rpmdb.c:462 +#: rpmdb/rpmdb.c:280 #, c-format msgid "cannot open %s index\n" msgstr "%s À妽º¸¦ ¿ ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:554 +#: rpmdb/rpmdb.c:379 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" "%3$s À妽º¿¡¼ \"%2$s\" ·¹Äڵ带 ¾ò´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:685 +#: rpmdb/rpmdb.c:516 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "%3$s (À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:695 +#: rpmdb/rpmdb.c:529 #, c-format msgid "error(%d) removing record %s from %s\n" msgstr "%3$s ¿¡¼ %2$s ·¹Äڵ带 »èÁ¦ÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:954 +#: rpmdb/rpmdb.c:788 msgid "no dbpath has been set\n" msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:1102 -msgid "" -"old format database is present; use --rebuilddb to generate a new format " -"database\n" -msgstr "" -"ÀÌÀü Çü½ÄÀÇ µ¥ÀÌÅͺ£À̽º°¡ Á¸ÀçÇÕ´Ï´Ù; »õ·Î¿î Çü½ÄÀÇ µ¥ÀÌÅͺ£À̽º¸¦ »ý¼ºÇϽÃ" -"·Á¸é --rebuilddb ¿É¼ÇÀ» ÀÌ¿ëÇϽʽÿä\n" - #. error -#: rpmdb/rpmdb.c:1367 +#: rpmdb/rpmdb.c:1174 #, c-format msgid "error(%d) counting packages\n" msgstr "ÆÐÅ°ÁöÀÇ ¼ö¸¦ ¼¼´Â µµÁß ¿À·ù(%d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2146 rpmdb/rpmdb.c:3507 +#: rpmdb/rpmdb.c:1971 rpmdb/rpmdb.c:3357 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "µ¥ÀÌÅͺ£À̽ºÀÇ ·¹ÄÚµå ¹øÈ£ %u (ÀÌ)°¡ À߸øµÇ¾ú½À´Ï´Ù -- »ý·«ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2199 +#: rpmdb/rpmdb.c:2034 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "rpmdb: ¼Õ»óµÈ Çì´õ #%u (ÀÌ)°¡ º¹±¸(retrieved)µÇ¾ú½À´Ï´Ù, »ý·«ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2478 +#: rpmdb/rpmdb.c:2306 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: 0x%x ÀÇ Çì´õ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2639 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "%2$s À妽º¿¡¼ \"%1$s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2643 +#: rpmdb/rpmdb.c:2476 #, c-format msgid "removing %d entries from %s index.\n" msgstr "%2$s À妽º¿¡¼ %1$d Ç׸ñµé(entries)À» »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2813 +#: rpmdb/rpmdb.c:2663 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "»õ·Î¿î ÆÐÅ°Áö¸¦ ¹èÄ¡ÇÏ´Â µµÁß ¿À·ù(%d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:3008 +#: rpmdb/rpmdb.c:2858 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "%2$s À妽º¿¡ \"%1$s\" (À»)¸¦ Ãß°¡ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:2862 #, c-format msgid "adding %d entries to %s index.\n" msgstr "%2$s À妽º¿¡ %1$d Ç׸ñµé(entries)À» Ãß°¡ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3393 +#: rpmdb/rpmdb.c:3243 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "db3¸¦ À籸Ãà ÇÑ ÈÄ¿¡ %s (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3276 msgid "no dbpath has been set" msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù" -#: rpmdb/rpmdb.c:3453 +#: rpmdb/rpmdb.c:3303 #, c-format msgid "rebuilding database %s into %s\n" msgstr "%2$s ¿¡ µ¥ÀÌÅͺ£À̽º %1$s (À»)¸¦ À籸Ãà ÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3457 +#: rpmdb/rpmdb.c:3307 #, c-format msgid "temporary database %s already exists\n" msgstr "Àӽà µ¥ÀÌÅͺ£À̽º %s (ÀÌ)°¡ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3313 #, c-format msgid "creating directory %s\n" msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3315 #, c-format msgid "creating directory %s: %s\n" msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÔ: %s\n" -#: rpmdb/rpmdb.c:3472 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "opening old database with dbapi %d\n" msgstr "dbapi %d (À»)¸¦ ÅëÇØ ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n" -#: rpmdb/rpmdb.c:3483 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "opening new database with dbapi %d\n" msgstr "dbapi %d (À»)¸¦ ÅëÇØ »õ·Î¿î µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n" -#: rpmdb/rpmdb.c:3547 +#: rpmdb/rpmdb.c:3397 #, c-format msgid "cannot add record originally at %u\n" msgstr "%u ¿¡ ·¹Äڵ带 Ãß°¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:3565 +#: rpmdb/rpmdb.c:3415 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "µ¥ÀÌÅͺ£À̽º¸¦ À籸ÃàÇϴµ¥ ½ÇÆÐÇÔ: ¿øº» µ¥ÀÌÅͺ£À̽º´Â ±×´ë·Î À¯ÁöµË´Ï´Ù\n" -#: rpmdb/rpmdb.c:3573 +#: rpmdb/rpmdb.c:3423 msgid "failed to replace old database with new database!\n" msgstr "ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ »õ·Î¿î µ¥ÀÌÅͺ£À̽º·Î ±³Ã¼Çϴµ¥ ½ÇÆÐÇß½À´Ï´Ù!\n" -#: rpmdb/rpmdb.c:3575 +#: rpmdb/rpmdb.c:3425 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "º¹±¸Çϱâ À§ÇØ $2$s ÀÇ ÆÄÀÏÀ» $1$s ÀÇ ÆÄÀÏ·Î ±³Ã¼ÇÕ´Ï´Ù" -#: rpmdb/rpmdb.c:3585 +#: rpmdb/rpmdb.c:3435 #, c-format msgid "removing directory %s\n" msgstr "%s µð·ºÅ丮¸¦ »èÁ¦ÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3587 +#: rpmdb/rpmdb.c:3437 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "%s µð·ºÅ丮¸¦ »èÁ¦Çϴµ¥ ½ÇÆÐÇÔ: %s\n" @@ -3435,6 +3427,13 @@ msgstr "URL Æ÷Æ®´Â ¹Ýµå½Ã ¼ýÀÚÀ̾î¾ß ÇÕ´Ï´Ù\n" msgid "failed to create %s: %s\n" msgstr "%s (À»)¸¦ »ý¼ºÇϴµ¥ ½ÇÆÐÇÔ: %s\n" +#~ msgid "" +#~ "old format database is present; use --rebuilddb to generate a new format " +#~ "database\n" +#~ msgstr "" +#~ "ÀÌÀü Çü½ÄÀÇ µ¥ÀÌÅͺ£À̽º°¡ Á¸ÀçÇÕ´Ï´Ù; »õ·Î¿î Çü½ÄÀÇ µ¥ÀÌÅͺ£À̽º¸¦ »ý¼ºÇÏ" +#~ "½Ã·Á¸é --rebuilddb ¿É¼ÇÀ» ÀÌ¿ëÇϽʽÿä\n" + #, fuzzy #~ msgid "don't verify signature(s)" #~ msgstr "ÆÄÀÏÀÇ ½Éº¼¸¯ ¸µÅ© °æ·Î¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-14 17:43-0400\n" +"POT-Creation-Date: 2002-05-01 18:05-0400\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n" "Language-Team: Norwegian <no@li.org>\n" @@ -114,7 +114,7 @@ msgstr "<kmd>" msgid "use <dir> as the top level directory" msgstr "bruk <katalog> som toppnivåkatalog" -#: rpmqv.c:125 lib/poptI.c:219 +#: rpmqv.c:125 lib/poptI.c:215 msgid "<dir>" msgstr "<kat>" @@ -1431,73 +1431,73 @@ msgstr " feilet - " msgid "package %s was already added, replacing with %s\n" msgstr "pakke %s er allerede installert" -#: lib/depends.c:367 +#: lib/depends.c:380 msgid "(cached)" msgstr "" -#: lib/depends.c:392 +#: lib/depends.c:405 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:408 +#: lib/depends.c:421 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:429 +#: lib/depends.c:442 msgid "(db files)" msgstr "" -#: lib/depends.c:441 +#: lib/depends.c:454 msgid "(db provides)" msgstr "" -#: lib/depends.c:454 +#: lib/depends.c:467 #, fuzzy msgid "(db package)" msgstr "ingen pakker\n" -#: lib/depends.c:762 +#: lib/depends.c:783 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:903 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1171 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1277 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1370 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1440 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1475 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1480 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2978 rpmdb/header.c:2999 rpmdb/header.c:3021 +#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 msgid "(not a number)" msgstr "" @@ -1631,35 +1631,35 @@ msgstr "" msgid "%s: Fread failed: %s\n" msgstr "%s: Fread feilet: %s\n" -#: lib/poptI.c:53 +#: lib/poptI.c:49 msgid "exclude paths must begin with a /" msgstr "eksluderingssti må begynne med en /" -#: lib/poptI.c:65 +#: lib/poptI.c:61 msgid "relocations must begin with a /" msgstr "relokasjoner må begynne med en /" -#: lib/poptI.c:67 +#: lib/poptI.c:63 msgid "relocations must contain a =" msgstr "relokasjoner må inneholde et =" -#: lib/poptI.c:70 +#: lib/poptI.c:66 msgid "relocations must have a / following the =" msgstr "relokasjoner må ha et / etter =" -#: lib/poptI.c:84 +#: lib/poptI.c:80 msgid "rollback takes a time/date stamp argument" msgstr "" -#: lib/poptI.c:91 +#: lib/poptI.c:87 msgid "malformed rollback time/date stamp argument" msgstr "" -#: lib/poptI.c:110 +#: lib/poptI.c:106 msgid "install all files, even configurations which might otherwise be skipped" msgstr "installer alle filer, selv konfigurasjoner som ellers kan hoppes over" -#: lib/poptI.c:114 +#: lib/poptI.c:110 msgid "" "remove all packages which match <package> (normally an error is generated if " "<package> specified multiple packages)" @@ -1667,146 +1667,146 @@ msgstr "" "fjern alle pakker som er lik <pakke> (normalt vil en feil genereres hvis " "<pakke> spesifiserer flere pakker)" -#: lib/poptI.c:120 lib/poptI.c:175 +#: lib/poptI.c:116 lib/poptI.c:171 msgid "do not execute package scriptlet(s)" msgstr "ikke kjør pakkespesifikke skriptlet" -#: lib/poptI.c:124 +#: lib/poptI.c:120 msgid "relocate files in non-relocateable package" msgstr "omplasser filer i ikke-omplasserbar pakke" -#: lib/poptI.c:127 +#: lib/poptI.c:123 msgid "save erased package files by renaming into sub-directory" msgstr "lagre slettede pakkefiler ved å endre navn til underkatalog" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "erase (uninstall) package" msgstr "slett (avinstaller) pakke" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "<package>+" msgstr "<pakke>+" -#: lib/poptI.c:133 +#: lib/poptI.c:129 msgid "do not install documentation" msgstr "ikke installer dokumentasjon" -#: lib/poptI.c:135 +#: lib/poptI.c:131 msgid "skip files with leading component <path> " msgstr "hopp over filer med innledende komponent <sti> " -#: lib/poptI.c:136 +#: lib/poptI.c:132 msgid "<path>" msgstr "<sti>" -#: lib/poptI.c:139 +#: lib/poptI.c:135 msgid "short hand for --replacepkgs --replacefiles" msgstr "forkortning for --replacepkgs --replacefiles" -#: lib/poptI.c:142 +#: lib/poptI.c:138 msgid "upgrade package(s) if already installed" msgstr "oppgrader pakke(r) hvis allerede installert" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 +#: lib/poptI.c:139 lib/poptI.c:155 lib/poptI.c:236 msgid "<packagefile>+" msgstr "<pakkefil>+" -#: lib/poptI.c:145 +#: lib/poptI.c:141 msgid "print hash marks as package installs (good with -v)" msgstr "skriv ut skigarder etter som pakken installeres (nyttig med -v)" -#: lib/poptI.c:148 +#: lib/poptI.c:144 msgid "don't verify package architecture" msgstr "ikke verifiser pakkearkitektur" -#: lib/poptI.c:151 +#: lib/poptI.c:147 msgid "don't verify package operating system" msgstr "ikke verifiser operativsystem for pakken" -#: lib/poptI.c:154 +#: lib/poptI.c:150 msgid "don't check disk space before installing" msgstr "ikke sjekk diskplass før installasjon" -#: lib/poptI.c:156 +#: lib/poptI.c:152 msgid "install documentation" msgstr "installer dokumentasjon" -#: lib/poptI.c:159 +#: lib/poptI.c:155 #, fuzzy msgid "install package(s)" msgstr "installer pakke" -#: lib/poptI.c:161 +#: lib/poptI.c:157 msgid "update the database, but do not modify the filesystem" msgstr "oppdater databasen, men ikke modifiser filsystemet" -#: lib/poptI.c:163 +#: lib/poptI.c:159 msgid "do not verify package dependencies" msgstr "ikke verifiser pakkeavhengigheter" -#: lib/poptI.c:166 +#: lib/poptI.c:162 msgid "do not reorder package installation to satisfy dependencies" msgstr "ikke ordne pakkeinstallasjon for å tilfredsstille avhengigheter" -#: lib/poptI.c:171 +#: lib/poptI.c:167 msgid "do not suggest missing dependency resolution(s)" msgstr "" -#: lib/poptI.c:178 +#: lib/poptI.c:174 #, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "ikke kjør noen %%pre skriptlet (hvis noen)" -#: lib/poptI.c:181 +#: lib/poptI.c:177 #, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "ikke kjør %%post skriptlet (hvis noen)" -#: lib/poptI.c:184 +#: lib/poptI.c:180 #, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "ikke kjør %%preun skriptlet (hvis noen)" -#: lib/poptI.c:187 +#: lib/poptI.c:183 #, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "ikke kjør %%postun skriptlet (hvis noen)" -#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy msgid "don't verify package digest(s)" msgstr "ikke verifiser header SHA1 digest" -#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy msgid "don't verify package signature(s)" msgstr "verifiser pakkesignatur" -#: lib/poptI.c:196 +#: lib/poptI.c:192 msgid "do not execute any scriptlet(s) triggered by this package" msgstr "Ikke kjør noen skriptlets som utløses av denne pakken" -#: lib/poptI.c:199 +#: lib/poptI.c:195 #, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "ikke kjør %%triggerprein skriptlets" -#: lib/poptI.c:202 +#: lib/poptI.c:198 #, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "ikke kjør %%triggerin skriptlets" -#: lib/poptI.c:205 +#: lib/poptI.c:201 #, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "ikke kjør %%triggerun skriplets" -#: lib/poptI.c:208 +#: lib/poptI.c:204 #, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "ikke kjør %%triggerpostun skriptlets" -#: lib/poptI.c:212 +#: lib/poptI.c:208 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1814,48 +1814,48 @@ msgstr "" "oppgrader til en gammel versjon av pakken (--force ved oppgraderinger gjør " "dette automatisk)" -#: lib/poptI.c:216 +#: lib/poptI.c:212 msgid "print percentages as package installs" msgstr "skriv ut prosentvis fremgang etter som pakken installeres" -#: lib/poptI.c:218 +#: lib/poptI.c:214 msgid "relocate the package to <dir>, if relocatable" msgstr "omplasser pakken til <kat>, hvis den er omplasserbar" -#: lib/poptI.c:221 +#: lib/poptI.c:217 msgid "relocate files from path <old> to <new>" msgstr "omplasser filer fra sti <gml> til <ny>" -#: lib/poptI.c:222 +#: lib/poptI.c:218 msgid "<old>=<new>" msgstr "<gml>=<ny>" -#: lib/poptI.c:225 +#: lib/poptI.c:221 msgid "save erased package files by repackaging" msgstr "lagre slettede pakkefiler ved ompakking" -#: lib/poptI.c:228 +#: lib/poptI.c:224 msgid "install even if the package replaces installed files" msgstr "installer selv om pakken erstatter installerte filer" -#: lib/poptI.c:231 +#: lib/poptI.c:227 msgid "reinstall if the package is already present" msgstr "reinstaller selv om pakken allerede er installert" -#: lib/poptI.c:233 +#: lib/poptI.c:229 msgid "deinstall new, reinstall old, package(s), back to <date>" msgstr "" -#: lib/poptI.c:234 +#: lib/poptI.c:230 #, fuzzy msgid "<date>" msgstr "<sti>" -#: lib/poptI.c:236 +#: lib/poptI.c:232 msgid "don't install, but tell if it would work or not" msgstr "ikke installer, men si ifra om det ville virke eller ikke" -#: lib/poptI.c:239 +#: lib/poptI.c:235 msgid "upgrade package(s)" msgstr "oppgrader pakke(r)" @@ -2248,96 +2248,96 @@ msgstr "(ingen tilstand)" msgid "package has neither file owner or id lists\n" msgstr "pakken har verken fileier eller id-lister\n" -#: lib/query.c:463 +#: lib/query.c:464 #, c-format msgid "can't query %s: %s\n" msgstr "kan ikke spørre på %s: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/query.c:618 lib/query.c:656 lib/rpminstall.c:352 lib/rpminstall.c:494 #: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "feil under åpning av %s: %s\n" -#: lib/query.c:633 +#: lib/query.c:634 #, c-format msgid "query of %s failed\n" msgstr "spørring på %s feilet\n" -#: lib/query.c:639 +#: lib/query.c:640 msgid "old format source packages cannot be queried\n" msgstr "kildepakker i gammelt format kan ikke spørres\n" -#: lib/query.c:665 lib/rpminstall.c:507 +#: lib/query.c:666 lib/rpminstall.c:507 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: lesing av manifest feilet: %s\n" -#: lib/query.c:709 +#: lib/query.c:710 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:730 +#: lib/query.c:731 msgid "no packages\n" msgstr "ingen pakker\n" -#: lib/query.c:750 +#: lib/query.c:751 #, c-format msgid "group %s does not contain any packages\n" msgstr "gruppe %s inneholder ingen pakker\n" -#: lib/query.c:760 +#: lib/query.c:761 #, c-format msgid "no package triggers %s\n" msgstr "ingen pakke utløser %s\n" -#: lib/query.c:774 lib/query.c:796 lib/query.c:817 lib/query.c:852 +#: lib/query.c:775 lib/query.c:797 lib/query.c:818 lib/query.c:853 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "kunne ikke opprette %s: %s\n" -#: lib/query.c:784 lib/query.c:802 lib/query.c:827 lib/query.c:857 +#: lib/query.c:785 lib/query.c:803 lib/query.c:828 lib/query.c:858 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "ingen pakke utløser %s\n" -#: lib/query.c:868 +#: lib/query.c:869 #, c-format msgid "no package requires %s\n" msgstr "ingen pakke krever %s\n" -#: lib/query.c:879 +#: lib/query.c:880 #, c-format msgid "no package provides %s\n" msgstr "ingen pakke gir %s\n" -#: lib/query.c:913 +#: lib/query.c:914 #, c-format msgid "file %s: %s\n" msgstr "fil %s: %s\n" -#: lib/query.c:917 +#: lib/query.c:918 #, c-format msgid "file %s is not owned by any package\n" msgstr "filen %s eies ikke av noen pakke\n" -#: lib/query.c:944 +#: lib/query.c:945 #, c-format msgid "invalid package number: %s\n" msgstr "ugyldig pakkenummer: %s\n" -#: lib/query.c:947 +#: lib/query.c:948 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:952 +#: lib/query.c:953 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:963 lib/rpminstall.c:675 +#: lib/query.c:964 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "pakke %s er ikke installert\n" @@ -2642,139 +2642,139 @@ msgstr "Kunne ikke åpne spec fil %s: %s\n" msgid "cannot open Packages database in %s\n" msgstr "kan ikke åpne pakkedatabase i %s\n" -#: lib/signature.c:123 +#: lib/signature.c:124 msgid "file is not regular -- skipping size check\n" msgstr "" -#: lib/signature.c:132 +#: lib/signature.c:142 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:137 +#: lib/signature.c:147 #, c-format msgid " Actual size: %12d\n" msgstr "" -#: lib/signature.c:157 +#: lib/signature.c:167 msgid "No signature\n" msgstr "" -#: lib/signature.c:161 +#: lib/signature.c:171 msgid "Old PGP signature\n" msgstr "" -#: lib/signature.c:172 +#: lib/signature.c:182 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "" -#: lib/signature.c:226 +#: lib/signature.c:232 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "" -#: lib/signature.c:305 lib/signature.c:402 lib/signature.c:669 -#: lib/signature.c:702 +#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675 +#: lib/signature.c:708 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Kunne ikke kjøre %s: %s\n" -#: lib/signature.c:321 +#: lib/signature.c:327 msgid "pgp failed\n" msgstr "" #. PGP failed to write signature #. Just in case -#: lib/signature.c:328 +#: lib/signature.c:334 msgid "pgp failed to write signature\n" msgstr "" -#: lib/signature.c:333 +#: lib/signature.c:339 #, c-format msgid "PGP sig size: %d\n" msgstr "" -#: lib/signature.c:347 lib/signature.c:445 +#: lib/signature.c:353 lib/signature.c:451 msgid "unable to read the signature\n" msgstr "" -#: lib/signature.c:352 +#: lib/signature.c:358 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:419 +#: lib/signature.c:425 msgid "gpg failed\n" msgstr "" #. GPG failed to write signature #. Just in case -#: lib/signature.c:426 +#: lib/signature.c:432 msgid "gpg failed to write signature\n" msgstr "" -#: lib/signature.c:431 +#: lib/signature.c:437 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:450 +#: lib/signature.c:456 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:707 lib/signature.c:758 +#: lib/signature.c:713 lib/signature.c:764 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:737 +#: lib/signature.c:743 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "" -#: lib/signature.c:750 +#: lib/signature.c:756 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "" -#: lib/signature.c:794 +#: lib/signature.c:800 #, fuzzy msgid "Header+Payload size: " msgstr "For stor header" -#: lib/signature.c:830 +#: lib/signature.c:836 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:879 +#: lib/signature.c:885 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1066 +#: lib/signature.c:1072 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "hopp over MD5-signaturer" -#: lib/signature.c:1176 +#: lib/signature.c:1182 msgid "Header " msgstr "" -#: lib/signature.c:1177 +#: lib/signature.c:1183 msgid "V3 DSA signature: " msgstr "" -#: lib/signature.c:1252 +#: lib/signature.c:1258 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1279 +#: lib/signature.c:1285 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1283 +#: lib/signature.c:1289 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" @@ -2809,12 +2809,12 @@ msgstr "feilede avhengigheter:\n" msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:100 +#: rpmdb/db1.c:98 rpmdb/db3.c:98 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:103 +#: rpmdb/db1.c:101 rpmdb/db3.c:101 #, c-format msgid "db%d error(%d): %s\n" msgstr "" @@ -2857,70 +2857,70 @@ msgstr "" msgid "cannot get %s lock on database\n" msgstr "kan ikke åpne pakkedatabase i %s\n" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "exclusive" msgstr "" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "shared" msgstr "" -#: rpmdb/db3.c:129 +#: rpmdb/db3.c:127 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:147 +#: rpmdb/db3.c:145 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:187 +#: rpmdb/db3.c:185 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: rpmdb/db3.c:711 +#: rpmdb/db3.c:614 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:778 +#: rpmdb/db3.c:681 #, c-format msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:1001 +#: rpmdb/db3.c:903 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1226 +#: rpmdb/db3.c:1119 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: rpmdb/db3.c:1232 +#: rpmdb/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:404 +#: rpmdb/dbconfig.c:400 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:442 +#: rpmdb/dbconfig.c:438 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:451 +#: rpmdb/dbconfig.c:447 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:460 +#: rpmdb/dbconfig.c:456 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3028,155 +3028,149 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "generer headere som er kompatible med (gamle) rpm[23] pakker" #. @-modfilesys@ -#: rpmdb/rpmdb.c:163 +#: rpmdb/rpmdb.c:165 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:440 +#: rpmdb/rpmdb.c:258 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "kan ikke åpne %s-indeks ved bruk av db%d - %s (%d)\n" -#: rpmdb/rpmdb.c:462 +#: rpmdb/rpmdb.c:280 #, c-format msgid "cannot open %s index\n" msgstr "kan ikke åpne %s indeks\n" -#: rpmdb/rpmdb.c:554 +#: rpmdb/rpmdb.c:379 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:685 +#: rpmdb/rpmdb.c:516 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "feil(%d) under lagring av post %s til %s\n" -#: rpmdb/rpmdb.c:695 +#: rpmdb/rpmdb.c:529 #, c-format msgid "error(%d) removing record %s from %s\n" msgstr "feil(%d) under fjerning av post %s fra %s\n" -#: rpmdb/rpmdb.c:954 +#: rpmdb/rpmdb.c:788 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1102 -msgid "" -"old format database is present; use --rebuilddb to generate a new format " -"database\n" -msgstr "" - #. error -#: rpmdb/rpmdb.c:1367 +#: rpmdb/rpmdb.c:1174 #, c-format msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2146 rpmdb/rpmdb.c:3507 +#: rpmdb/rpmdb.c:1971 rpmdb/rpmdb.c:3357 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2199 +#: rpmdb/rpmdb.c:2034 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2478 +#: rpmdb/rpmdb.c:2306 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2639 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2643 +#: rpmdb/rpmdb.c:2476 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2813 +#: rpmdb/rpmdb.c:2663 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3008 +#: rpmdb/rpmdb.c:2858 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:2862 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3393 +#: rpmdb/rpmdb.c:3243 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3276 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3453 +#: rpmdb/rpmdb.c:3303 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3457 +#: rpmdb/rpmdb.c:3307 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3313 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3315 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3472 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3483 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3547 +#: rpmdb/rpmdb.c:3397 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3565 +#: rpmdb/rpmdb.c:3415 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3573 +#: rpmdb/rpmdb.c:3423 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3575 +#: rpmdb/rpmdb.c:3425 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3585 +#: rpmdb/rpmdb.c:3435 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3587 +#: rpmdb/rpmdb.c:3437 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-14 17:43-0400\n" +"POT-Creation-Date: 2002-05-01 18:05-0400\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n" "Language-Team: Polish <pl@li.org>\n" @@ -122,7 +122,7 @@ msgstr "" msgid "use <dir> as the top level directory" msgstr "u¿yj <katalogu> jako katalogu najwy¿szego poziomu" -#: rpmqv.c:125 lib/poptI.c:219 +#: rpmqv.c:125 lib/poptI.c:215 msgid "<dir>" msgstr "" @@ -1471,77 +1471,77 @@ msgstr " nie powiod³o siê -" msgid "package %s was already added, replacing with %s\n" msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany" -#: lib/depends.c:367 +#: lib/depends.c:380 msgid "(cached)" msgstr "" -#: lib/depends.c:392 +#: lib/depends.c:405 #, fuzzy msgid "(rpmrc provides)" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:408 +#: lib/depends.c:421 #, fuzzy msgid "(rpmlib provides)" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:429 +#: lib/depends.c:442 #, fuzzy msgid "(db files)" msgstr "b³êdny status pliku: %s" -#: lib/depends.c:441 +#: lib/depends.c:454 #, fuzzy msgid "(db provides)" msgstr "Udostêpniane zasoby:" -#: lib/depends.c:454 +#: lib/depends.c:467 #, fuzzy msgid "(db package)" msgstr "znaleziono %d pakietów\n" -#: lib/depends.c:762 +#: lib/depends.c:783 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:903 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "usuwanie indeksu grupy\n" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1171 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1277 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1370 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1440 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1475 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1480 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2978 rpmdb/header.c:2999 rpmdb/header.c:3021 +#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 msgid "(not a number)" msgstr "(nie jest liczb±)" @@ -1681,37 +1681,37 @@ msgstr "" msgid "%s: Fread failed: %s\n" msgstr "%s: readLead nie powiod³o siê\n" -#: lib/poptI.c:53 +#: lib/poptI.c:49 msgid "exclude paths must begin with a /" msgstr "¶cie¿ki wy³±czeñ musz± siê zaczynaæ od /" -#: lib/poptI.c:65 +#: lib/poptI.c:61 msgid "relocations must begin with a /" msgstr "drzewa przesuniêæ musz± zaczynaæ sie od /" -#: lib/poptI.c:67 +#: lib/poptI.c:63 msgid "relocations must contain a =" msgstr "specyfikacja przesuniêcia musi zawieraæ =" -#: lib/poptI.c:70 +#: lib/poptI.c:66 msgid "relocations must have a / following the =" msgstr "specyfikacja przesuniêcia musi zawieraæ / po =" -#: lib/poptI.c:84 +#: lib/poptI.c:80 msgid "rollback takes a time/date stamp argument" msgstr "" -#: lib/poptI.c:91 +#: lib/poptI.c:87 msgid "malformed rollback time/date stamp argument" msgstr "" -#: lib/poptI.c:110 +#: lib/poptI.c:106 msgid "install all files, even configurations which might otherwise be skipped" msgstr "" "instaluj wszystkie pliki, nawet konfiguracyjne, które w innym przypadku by " "pominêto" -#: lib/poptI.c:114 +#: lib/poptI.c:110 msgid "" "remove all packages which match <package> (normally an error is generated if " "<package> specified multiple packages)" @@ -1719,153 +1719,153 @@ msgstr "" "usuñ wszystkie pakiety, które spe³niaj± wzorzec <pakiet> (zazwyczaj " "wy¶wietlany jest b³±d gdy <pakiet> opisuje wiele pakietów)" -#: lib/poptI.c:120 lib/poptI.c:175 +#: lib/poptI.c:116 lib/poptI.c:171 #, fuzzy msgid "do not execute package scriptlet(s)" msgstr "nie wykonuj ¿adnych skryptów instalacyjnych" -#: lib/poptI.c:124 +#: lib/poptI.c:120 #, fuzzy msgid "relocate files in non-relocateable package" msgstr "nie mo¿na u¿yæ ¶cie¿ki %s przy przesuwaniu pakietu %s-%s-%s" -#: lib/poptI.c:127 +#: lib/poptI.c:123 msgid "save erased package files by renaming into sub-directory" msgstr "" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "erase (uninstall) package" msgstr "usuñ (odinstaluj) pakiet" -#: lib/poptI.c:130 +#: lib/poptI.c:126 #, fuzzy msgid "<package>+" msgstr "znaleziono %d pakietów\n" -#: lib/poptI.c:133 +#: lib/poptI.c:129 msgid "do not install documentation" msgstr "nie instaluj dokumentacji" -#: lib/poptI.c:135 +#: lib/poptI.c:131 #, fuzzy msgid "skip files with leading component <path> " msgstr "pomiñ pliki le¿±ce w <¶cie¿ce>" -#: lib/poptI.c:136 +#: lib/poptI.c:132 msgid "<path>" msgstr "" -#: lib/poptI.c:139 +#: lib/poptI.c:135 msgid "short hand for --replacepkgs --replacefiles" msgstr "skrócona wersja kombinacji --replacepkgs --replacefiles" -#: lib/poptI.c:142 +#: lib/poptI.c:138 #, fuzzy msgid "upgrade package(s) if already installed" msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 +#: lib/poptI.c:139 lib/poptI.c:155 lib/poptI.c:236 #, fuzzy msgid "<packagefile>+" msgstr " -p <nazwa pakietu>+ " -#: lib/poptI.c:145 +#: lib/poptI.c:141 msgid "print hash marks as package installs (good with -v)" msgstr "wy¶wietlaj znaki hash przy instalacji (fajne z -v)" -#: lib/poptI.c:148 +#: lib/poptI.c:144 msgid "don't verify package architecture" msgstr "nie sprawdzaj architektury systemu" -#: lib/poptI.c:151 +#: lib/poptI.c:147 msgid "don't verify package operating system" msgstr "nie sprawdzaj rodzaju systemu operacyjnego" -#: lib/poptI.c:154 +#: lib/poptI.c:150 msgid "don't check disk space before installing" msgstr "nie sprawdzaj zajêto¶ci dysku przed instalacj±" -#: lib/poptI.c:156 +#: lib/poptI.c:152 msgid "install documentation" msgstr "zainstaluj dokumentacjê" -#: lib/poptI.c:159 +#: lib/poptI.c:155 #, fuzzy msgid "install package(s)" msgstr "instaluj pakiet" -#: lib/poptI.c:161 +#: lib/poptI.c:157 msgid "update the database, but do not modify the filesystem" msgstr "od¶wie¿ bazê, ale nie modyfikuj systemu plików" -#: lib/poptI.c:163 +#: lib/poptI.c:159 msgid "do not verify package dependencies" msgstr "nie sprawdzaj zale¿no¶ci pakietu" -#: lib/poptI.c:166 +#: lib/poptI.c:162 msgid "do not reorder package installation to satisfy dependencies" msgstr "nie zmieniaj kolejno¶ci instalacji pakietów by zapewniæ zale¿no¶ci" -#: lib/poptI.c:171 +#: lib/poptI.c:167 msgid "do not suggest missing dependency resolution(s)" msgstr "" -#: lib/poptI.c:178 +#: lib/poptI.c:174 #, fuzzy, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "nie wykonuj ¿adnych etapów" -#: lib/poptI.c:181 +#: lib/poptI.c:177 #, fuzzy, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "nie wykonuj ¿adnych etapów" -#: lib/poptI.c:184 +#: lib/poptI.c:180 #, fuzzy, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "nie wykonuj ¿adnych etapów" -#: lib/poptI.c:187 +#: lib/poptI.c:183 #, fuzzy, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "nie wykonuj ¿adnych etapów" -#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy msgid "don't verify package digest(s)" msgstr "nie sprawdzaj plików pakietu" -#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy msgid "don't verify package signature(s)" msgstr "sprawd¼ sygnaturê pakietu" -#: lib/poptI.c:196 +#: lib/poptI.c:192 #, fuzzy msgid "do not execute any scriptlet(s) triggered by this package" msgstr "odpytywanie pakietów zahaczanych przez pakiet" -#: lib/poptI.c:199 +#: lib/poptI.c:195 #, fuzzy, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "nie wykonuj ¿adnych skryptów instalacyjnych" -#: lib/poptI.c:202 +#: lib/poptI.c:198 #, fuzzy, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "nie wykonuj ¿adnych skryptów instalacyjnych" -#: lib/poptI.c:205 +#: lib/poptI.c:201 #, fuzzy, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "nie wykonuj ¿adnych skryptów instalacyjnych" -#: lib/poptI.c:208 +#: lib/poptI.c:204 #, fuzzy, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "nie wykonuj ¿adnych skryptów instalacyjnych" -#: lib/poptI.c:212 +#: lib/poptI.c:208 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1873,49 +1873,49 @@ msgstr "" "uaktualnij do starej wersji (--force robi to samo automatycznie podczas " "uaktualniania)" -#: lib/poptI.c:216 +#: lib/poptI.c:212 msgid "print percentages as package installs" msgstr "wy¶wietlaj stan instalacji w procentach" -#: lib/poptI.c:218 +#: lib/poptI.c:214 msgid "relocate the package to <dir>, if relocatable" msgstr "przesuñ pliki pakietu do drzewa <katalog>, je¶li jest przesuwalny" -#: lib/poptI.c:221 +#: lib/poptI.c:217 #, fuzzy msgid "relocate files from path <old> to <new>" msgstr "przesuñ pliki z drzewa <stara-¶cie¿ka> do drzewa <nowa-¶cie¿ka>" -#: lib/poptI.c:222 +#: lib/poptI.c:218 #, fuzzy msgid "<old>=<new>" msgstr " --relocate <stara-¶cie¿ka>=<nowa-¶cie¿ka>" -#: lib/poptI.c:225 +#: lib/poptI.c:221 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:228 +#: lib/poptI.c:224 msgid "install even if the package replaces installed files" msgstr "instaluj nawet gdy pakiet zastêpuje inne zainstalowane pliki" -#: lib/poptI.c:231 +#: lib/poptI.c:227 msgid "reinstall if the package is already present" msgstr "przeinstaluj je¶li pakiet jest ju¿ zainstalowany" -#: lib/poptI.c:233 +#: lib/poptI.c:229 msgid "deinstall new, reinstall old, package(s), back to <date>" msgstr "" -#: lib/poptI.c:234 +#: lib/poptI.c:230 msgid "<date>" msgstr "" -#: lib/poptI.c:236 +#: lib/poptI.c:232 msgid "don't install, but tell if it would work or not" msgstr "nie instaluj, podaj tylko czy instalacja zadzia³a czy nie" -#: lib/poptI.c:239 +#: lib/poptI.c:235 #, fuzzy msgid "upgrade package(s)" msgstr " --upgrade <nazwa pakietu>" @@ -2333,97 +2333,97 @@ msgstr "(brak statusu)" msgid "package has neither file owner or id lists\n" msgstr "pakiet nie ma ani w³a¶ciciela pliku ani list id" -#: lib/query.c:463 +#: lib/query.c:464 #, fuzzy, c-format msgid "can't query %s: %s\n" msgstr "nie mo¿na odwi±zaæ %s: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/query.c:618 lib/query.c:656 lib/rpminstall.c:352 lib/rpminstall.c:494 #: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "otwarcie %s nie powiod³o siê\n" -#: lib/query.c:633 +#: lib/query.c:634 #, c-format msgid "query of %s failed\n" msgstr "odpytywanie %s nie powiod³o siê\n" -#: lib/query.c:639 +#: lib/query.c:640 msgid "old format source packages cannot be queried\n" msgstr "pakiety w starym formacie nie mog± byæ odpytywane\n" -#: lib/query.c:665 lib/rpminstall.c:507 +#: lib/query.c:666 lib/rpminstall.c:507 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: readLead nie powiod³o siê\n" -#: lib/query.c:709 +#: lib/query.c:710 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "odpytywanie pliku spec %s nie powiod³o siê, nie mo¿na interpretowaæ\n" -#: lib/query.c:730 +#: lib/query.c:731 #, fuzzy msgid "no packages\n" msgstr "znaleziono %d pakietów\n" -#: lib/query.c:750 +#: lib/query.c:751 #, c-format msgid "group %s does not contain any packages\n" msgstr "grupa %s nie zawiera ¿adnych pakietów\n" -#: lib/query.c:760 +#: lib/query.c:761 #, c-format msgid "no package triggers %s\n" msgstr "¿aden pakiet nie zahacza %s\n" -#: lib/query.c:774 lib/query.c:796 lib/query.c:817 lib/query.c:852 +#: lib/query.c:775 lib/query.c:797 lib/query.c:818 lib/query.c:853 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "Odczytanie %s nie powiod³o siê: %s." -#: lib/query.c:784 lib/query.c:802 lib/query.c:827 lib/query.c:857 +#: lib/query.c:785 lib/query.c:803 lib/query.c:828 lib/query.c:858 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "¿aden pakiet nie zahacza %s\n" -#: lib/query.c:868 +#: lib/query.c:869 #, c-format msgid "no package requires %s\n" msgstr "¿aden pakiet nie wymaga %s\n" -#: lib/query.c:879 +#: lib/query.c:880 #, c-format msgid "no package provides %s\n" msgstr "¿aden pakiet nie udostêpnia %s\n" -#: lib/query.c:913 +#: lib/query.c:914 #, c-format msgid "file %s: %s\n" msgstr "plik %s: %s\n" -#: lib/query.c:917 +#: lib/query.c:918 #, c-format msgid "file %s is not owned by any package\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/query.c:944 +#: lib/query.c:945 #, c-format msgid "invalid package number: %s\n" msgstr "b³êdny numer pakietu: %s\n" -#: lib/query.c:947 +#: lib/query.c:948 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "numer rekordu pakietu: %d\n" -#: lib/query.c:952 +#: lib/query.c:953 #, fuzzy, c-format msgid "record %u could not be read\n" msgstr "nie mo¿na odczytaæ rekordu %d\n" -#: lib/query.c:963 lib/rpminstall.c:675 +#: lib/query.c:964 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "pakiet %s nie jest zainstalowany\n" @@ -2733,146 +2733,146 @@ msgstr "Nie mo¿na otworzyæ %s do odczytu: %s." msgid "cannot open Packages database in %s\n" msgstr "nie mo¿na otworzyæ %s/packages.rpm\n" -#: lib/signature.c:123 +#: lib/signature.c:124 msgid "file is not regular -- skipping size check\n" msgstr "plik nieregularny -- sprawdzanie rozmiaru pominiête\n" -#: lib/signature.c:132 +#: lib/signature.c:142 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:137 +#: lib/signature.c:147 #, fuzzy, c-format msgid " Actual size: %12d\n" msgstr "Rozmiar sygnatury: %d\n" -#: lib/signature.c:157 +#: lib/signature.c:167 msgid "No signature\n" msgstr "Brak sygnatury\n" -#: lib/signature.c:161 +#: lib/signature.c:171 msgid "Old PGP signature\n" msgstr "Stara sygnatura PGP\n" -#: lib/signature.c:172 +#: lib/signature.c:182 #, fuzzy msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "Stara (tylko wewnêtrzna) sygnatura! Sk±d Ty to wzi±³e¶!?" -#: lib/signature.c:226 +#: lib/signature.c:232 #, fuzzy, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "Rozmiar sygnatury: %d\n" -#: lib/signature.c:305 lib/signature.c:402 lib/signature.c:669 -#: lib/signature.c:702 +#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675 +#: lib/signature.c:708 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Nie mo¿na uruchomiæ %s" -#: lib/signature.c:321 +#: lib/signature.c:327 #, fuzzy msgid "pgp failed\n" msgstr "pgp nie powiod³o siê" #. PGP failed to write signature #. Just in case -#: lib/signature.c:328 +#: lib/signature.c:334 #, fuzzy msgid "pgp failed to write signature\n" msgstr "zapisanie sygnatury przez pgp nie powiod³o siê" -#: lib/signature.c:333 +#: lib/signature.c:339 #, c-format msgid "PGP sig size: %d\n" msgstr "rozmiar sygnatury PGP: %d\n" -#: lib/signature.c:347 lib/signature.c:445 +#: lib/signature.c:353 lib/signature.c:451 #, fuzzy msgid "unable to read the signature\n" msgstr "nie mo¿na odczytaæ sygnatury" -#: lib/signature.c:352 +#: lib/signature.c:358 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "Mam %d bajtów sygnatury PGP\n" -#: lib/signature.c:419 +#: lib/signature.c:425 #, fuzzy msgid "gpg failed\n" msgstr "gpg nie powiod³o siê" #. GPG failed to write signature #. Just in case -#: lib/signature.c:426 +#: lib/signature.c:432 #, fuzzy msgid "gpg failed to write signature\n" msgstr "zapisanie sygnatury przez gpg nie powiod³o siê" -#: lib/signature.c:431 +#: lib/signature.c:437 #, c-format msgid "GPG sig size: %d\n" msgstr "rozmiar sygnatury GPG: %d\n" -#: lib/signature.c:450 +#: lib/signature.c:456 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "Mam %d bajtów sygnatury GPG\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:707 lib/signature.c:758 +#: lib/signature.c:713 lib/signature.c:764 #, fuzzy, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "B³êdny %%_signature spec w pliku makra.\n" -#: lib/signature.c:737 +#: lib/signature.c:743 #, fuzzy, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "Musisz ustawiæ \"%%_gpg_name\" w pliku swego makra" -#: lib/signature.c:750 +#: lib/signature.c:756 #, fuzzy, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "Musisz ustawiæ \"%%_pgp_name\" w pliku swego makra" -#: lib/signature.c:794 +#: lib/signature.c:800 #, fuzzy msgid "Header+Payload size: " msgstr "Rozmiar nag³ówka jest zbyt du¿y" -#: lib/signature.c:830 +#: lib/signature.c:836 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:879 +#: lib/signature.c:885 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1066 +#: lib/signature.c:1072 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "pomiñ wszelkie sygnatury MD5" -#: lib/signature.c:1176 +#: lib/signature.c:1182 msgid "Header " msgstr "" -#: lib/signature.c:1177 +#: lib/signature.c:1183 #, fuzzy msgid "V3 DSA signature: " msgstr "Brak sygnatury\n" -#: lib/signature.c:1252 +#: lib/signature.c:1258 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1279 +#: lib/signature.c:1285 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1283 +#: lib/signature.c:1289 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Blok sygnatury: %d\n" @@ -2907,12 +2907,12 @@ msgstr "Niespe³nione zale¿no¶ci dla %s-%s-%s: " msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:100 +#: rpmdb/db1.c:98 rpmdb/db3.c:98 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:103 +#: rpmdb/db1.c:101 rpmdb/db3.c:101 #, c-format msgid "db%d error(%d): %s\n" msgstr "" @@ -2955,70 +2955,70 @@ msgstr "otwiernie bazê danych w trybie 0x%x w %s\n" msgid "cannot get %s lock on database\n" msgstr "utworzenie blokady %s na bazie danych nie jest mo¿liwe" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "exclusive" msgstr "" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "shared" msgstr "" -#: rpmdb/db3.c:129 +#: rpmdb/db3.c:127 #, fuzzy, c-format msgid "closed db environment %s/%s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: rpmdb/db3.c:147 +#: rpmdb/db3.c:145 #, fuzzy, c-format msgid "removed db environment %s/%s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: rpmdb/db3.c:187 +#: rpmdb/db3.c:185 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: rpmdb/db3.c:711 +#: rpmdb/db3.c:614 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: rpmdb/db3.c:778 +#: rpmdb/db3.c:681 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: rpmdb/db3.c:1001 +#: rpmdb/db3.c:903 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "otwiernie bazê danych w trybie 0x%x w %s\n" -#: rpmdb/db3.c:1226 +#: rpmdb/db3.c:1119 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "utworzenie blokady %s na bazie danych nie jest mo¿liwe" -#: rpmdb/db3.c:1232 +#: rpmdb/db3.c:1125 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: rpmdb/dbconfig.c:404 +#: rpmdb/dbconfig.c:400 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:442 +#: rpmdb/dbconfig.c:438 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:451 +#: rpmdb/dbconfig.c:447 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:460 +#: rpmdb/dbconfig.c:456 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3129,160 +3129,151 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:163 +#: rpmdb/rpmdb.c:165 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:440 +#: rpmdb/rpmdb.c:258 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "nie mo¿na otworzyæ %s przy %s:%d" -#: rpmdb/rpmdb.c:462 +#: rpmdb/rpmdb.c:280 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "nie mo¿na otworzyæ %s\n" -#: rpmdb/rpmdb.c:554 +#: rpmdb/rpmdb.c:379 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "b³±d pobierania rekordu %s z %s" -#: rpmdb/rpmdb.c:685 +#: rpmdb/rpmdb.c:516 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "b³±d zapisywania rekordu %s do %s" -#: rpmdb/rpmdb.c:695 +#: rpmdb/rpmdb.c:529 #, fuzzy, c-format msgid "error(%d) removing record %s from %s\n" msgstr "b³±d usuwania rekordu %s z %s" -#: rpmdb/rpmdb.c:954 +#: rpmdb/rpmdb.c:788 #, fuzzy msgid "no dbpath has been set\n" msgstr "¶cie¿ka bazy danych nie zosta³a podana" -#: rpmdb/rpmdb.c:1102 -#, fuzzy -msgid "" -"old format database is present; use --rebuilddb to generate a new format " -"database\n" -msgstr "" -"baza danych jest w starym formacie; u¿yj --rebuilddb aby wygenerowaæ bazê w " -"nowym formacie" - #. error -#: rpmdb/rpmdb.c:1367 +#: rpmdb/rpmdb.c:1174 #, fuzzy, c-format msgid "error(%d) counting packages\n" msgstr "b³±d szukania pakietu %s\n" -#: rpmdb/rpmdb.c:2146 rpmdb/rpmdb.c:3507 +#: rpmdb/rpmdb.c:1971 rpmdb/rpmdb.c:3357 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "rekord numer %d w bazie danych jest b³êdny -- rekord pominiêto" -#: rpmdb/rpmdb.c:2199 +#: rpmdb/rpmdb.c:2034 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2478 +#: rpmdb/rpmdb.c:2306 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "nie mo¿na odczytaæ nag³ówka przy %d dla poszukiwania" -#: rpmdb/rpmdb.c:2639 +#: rpmdb/rpmdb.c:2472 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "usuwanie indeksu grupy\n" -#: rpmdb/rpmdb.c:2643 +#: rpmdb/rpmdb.c:2476 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "usuwanie indeksu nazw\n" -#: rpmdb/rpmdb.c:2813 +#: rpmdb/rpmdb.c:2663 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "b³±d szukania pakietu %s\n" -#: rpmdb/rpmdb.c:3008 +#: rpmdb/rpmdb.c:2858 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "zmiana nazwy %s na %s\n" -#: rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:2862 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "zmiana nazwy %s na %s\n" -#: rpmdb/rpmdb.c:3393 +#: rpmdb/rpmdb.c:3243 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3276 msgid "no dbpath has been set" msgstr "¶cie¿ka bazy danych nie zosta³a podana" -#: rpmdb/rpmdb.c:3453 +#: rpmdb/rpmdb.c:3303 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "odbudowywujê bazê danych w rootdir %s\n" -#: rpmdb/rpmdb.c:3457 +#: rpmdb/rpmdb.c:3307 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "tymczasowa baza danych %s ju¿ istnieje" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3313 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3315 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3472 +#: rpmdb/rpmdb.c:3322 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "otwieranie starej bazy danych\n" -#: rpmdb/rpmdb.c:3483 +#: rpmdb/rpmdb.c:3333 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "otwieranie nowej bazy danych\n" -#: rpmdb/rpmdb.c:3547 +#: rpmdb/rpmdb.c:3397 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "nie mo¿na dodaæ rekordu oryginalnie przy %d" -#: rpmdb/rpmdb.c:3565 +#: rpmdb/rpmdb.c:3415 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "przebudowanie bazy nie powiod³o siê; stara pozosta³a na miejscu\n" -#: rpmdb/rpmdb.c:3573 +#: rpmdb/rpmdb.c:3423 msgid "failed to replace old database with new database!\n" msgstr "zamiana starej bazy na now± nie powiod³a siê!\n" -#: rpmdb/rpmdb.c:3575 +#: rpmdb/rpmdb.c:3425 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "naprawcze zastêpowanie plików w %s plikami z %s" -#: rpmdb/rpmdb.c:3585 +#: rpmdb/rpmdb.c:3435 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3587 +#: rpmdb/rpmdb.c:3437 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n" @@ -3499,6 +3490,14 @@ msgid "failed to create %s: %s\n" msgstr "utworzenie %s nie powiod³o siê\n" #, fuzzy +#~ msgid "" +#~ "old format database is present; use --rebuilddb to generate a new format " +#~ "database\n" +#~ msgstr "" +#~ "baza danych jest w starym formacie; u¿yj --rebuilddb aby wygenerowaæ " +#~ "bazê w nowym formacie" + +#, fuzzy #~ msgid "don't verify signature(s)" #~ msgstr "nie sprawdzaj plików pakietu" diff --git a/po/pt_BR.po b/po/pt_BR.po index 1048cde55..03ed04dfc 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-14 17:43-0400\n" +"POT-Creation-Date: 2002-05-01 18:05-0400\n" #: build.c:38 #, fuzzy @@ -118,7 +118,7 @@ msgstr "" msgid "use <dir> as the top level directory" msgstr "use <diretrio> como diretrio raiz" -#: rpmqv.c:125 lib/poptI.c:219 +#: rpmqv.c:125 lib/poptI.c:215 msgid "<dir>" msgstr "" @@ -1583,76 +1583,76 @@ msgstr "Construo falhou.\n" msgid "package %s was already added, replacing with %s\n" msgstr "no foi passado pacote para instalao" -#: lib/depends.c:367 +#: lib/depends.c:380 msgid "(cached)" msgstr "" -#: lib/depends.c:392 +#: lib/depends.c:405 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:408 +#: lib/depends.c:421 msgid "(rpmlib provides)" msgstr "" # , c-format -#: lib/depends.c:429 +#: lib/depends.c:442 #, fuzzy msgid "(db files)" msgstr "No consegui abrir: %s\n" -#: lib/depends.c:441 +#: lib/depends.c:454 msgid "(db provides)" msgstr "" -#: lib/depends.c:454 +#: lib/depends.c:467 #, fuzzy msgid "(db package)" msgstr "pesquise todos os pacotes" -#: lib/depends.c:762 +#: lib/depends.c:783 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" # , c-format -#: lib/depends.c:882 +#: lib/depends.c:903 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "No consegui abrir: %s\n" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1171 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1277 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1370 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1440 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1475 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1480 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2978 rpmdb/header.c:2999 rpmdb/header.c:3021 +#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 msgid "(not a number)" msgstr "" @@ -1796,37 +1796,37 @@ msgstr "" msgid "%s: Fread failed: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/poptI.c:53 +#: lib/poptI.c:49 #, fuzzy msgid "exclude paths must begin with a /" msgstr "argumentos para o --dbpath devem comear com uma /" -#: lib/poptI.c:65 +#: lib/poptI.c:61 #, fuzzy msgid "relocations must begin with a /" msgstr "argumentos para o --dbpath devem comear com uma /" -#: lib/poptI.c:67 +#: lib/poptI.c:63 msgid "relocations must contain a =" msgstr "" -#: lib/poptI.c:70 +#: lib/poptI.c:66 msgid "relocations must have a / following the =" msgstr "" -#: lib/poptI.c:84 +#: lib/poptI.c:80 msgid "rollback takes a time/date stamp argument" msgstr "" -#: lib/poptI.c:91 +#: lib/poptI.c:87 msgid "malformed rollback time/date stamp argument" msgstr "" -#: lib/poptI.c:110 +#: lib/poptI.c:106 msgid "install all files, even configurations which might otherwise be skipped" msgstr "" -#: lib/poptI.c:114 +#: lib/poptI.c:110 msgid "" "remove all packages which match <package> (normally an error is generated if " "<package> specified multiple packages)" @@ -1834,154 +1834,154 @@ msgstr "" "remova todos os pacotes iguais a <pacote> (normalmente um erro gerado se " "<pacote> especificou mltiplos pacotes)" -#: lib/poptI.c:120 lib/poptI.c:175 +#: lib/poptI.c:116 lib/poptI.c:171 #, fuzzy msgid "do not execute package scriptlet(s)" msgstr "no execute nenhuma script especfica do pacote" -#: lib/poptI.c:124 +#: lib/poptI.c:120 #, fuzzy msgid "relocate files in non-relocateable package" msgstr "no foi passado pacote para instalao" -#: lib/poptI.c:127 +#: lib/poptI.c:123 msgid "save erased package files by renaming into sub-directory" msgstr "" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "erase (uninstall) package" msgstr "apague (desinstale) pacote" -#: lib/poptI.c:130 +#: lib/poptI.c:126 #, fuzzy msgid "<package>+" msgstr "pesquise todos os pacotes" -#: lib/poptI.c:133 +#: lib/poptI.c:129 msgid "do not install documentation" msgstr "no instale documentao" -#: lib/poptI.c:135 +#: lib/poptI.c:131 msgid "skip files with leading component <path> " msgstr "" -#: lib/poptI.c:136 +#: lib/poptI.c:132 msgid "<path>" msgstr "" -#: lib/poptI.c:139 +#: lib/poptI.c:135 msgid "short hand for --replacepkgs --replacefiles" msgstr "alis para --replacepkgs --replacefiles" -#: lib/poptI.c:142 +#: lib/poptI.c:138 #, fuzzy msgid "upgrade package(s) if already installed" msgstr "no foi passado pacote para instalao" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 +#: lib/poptI.c:139 lib/poptI.c:155 lib/poptI.c:236 #, fuzzy msgid "<packagefile>+" msgstr " -b<estgio> <spec> " -#: lib/poptI.c:145 +#: lib/poptI.c:141 msgid "print hash marks as package installs (good with -v)" msgstr "mostre caracteres # a medida que o pacote instala (bom com -v)" -#: lib/poptI.c:148 +#: lib/poptI.c:144 #, fuzzy msgid "don't verify package architecture" msgstr "no verifique a arquitetura do pacote" -#: lib/poptI.c:151 +#: lib/poptI.c:147 msgid "don't verify package operating system" msgstr "no verifique o sistema operacional do pacote" -#: lib/poptI.c:154 +#: lib/poptI.c:150 msgid "don't check disk space before installing" msgstr "" -#: lib/poptI.c:156 +#: lib/poptI.c:152 msgid "install documentation" msgstr "instale documentao" -#: lib/poptI.c:159 +#: lib/poptI.c:155 #, fuzzy msgid "install package(s)" msgstr "instale pacote" -#: lib/poptI.c:161 +#: lib/poptI.c:157 msgid "update the database, but do not modify the filesystem" msgstr "" -#: lib/poptI.c:163 +#: lib/poptI.c:159 msgid "do not verify package dependencies" msgstr "no verifique as dependncias do pacote" -#: lib/poptI.c:166 +#: lib/poptI.c:162 #, fuzzy msgid "do not reorder package installation to satisfy dependencies" msgstr "no verifique as dependncias do pacote" -#: lib/poptI.c:171 +#: lib/poptI.c:167 msgid "do not suggest missing dependency resolution(s)" msgstr "" -#: lib/poptI.c:178 +#: lib/poptI.c:174 #, fuzzy, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "no execute nenhum estgio" -#: lib/poptI.c:181 +#: lib/poptI.c:177 #, fuzzy, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "no execute nenhum estgio" -#: lib/poptI.c:184 +#: lib/poptI.c:180 #, fuzzy, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "no execute nenhum estgio" -#: lib/poptI.c:187 +#: lib/poptI.c:183 #, fuzzy, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "no execute nenhum estgio" -#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy msgid "don't verify package digest(s)" msgstr "instale pacote" -#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy msgid "don't verify package signature(s)" msgstr "verifique a assinatura do pacote" -#: lib/poptI.c:196 +#: lib/poptI.c:192 #, fuzzy msgid "do not execute any scriptlet(s) triggered by this package" msgstr "pesquise o pacote ao qual <arquivo> pertence" -#: lib/poptI.c:199 +#: lib/poptI.c:195 #, fuzzy, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "no execute nenhuma script especfica do pacote" -#: lib/poptI.c:202 +#: lib/poptI.c:198 #, fuzzy, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "no execute nenhuma script de instalao" -#: lib/poptI.c:205 +#: lib/poptI.c:201 #, fuzzy, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "no execute nenhuma script de instalao" -#: lib/poptI.c:208 +#: lib/poptI.c:204 #, fuzzy, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "no execute nenhuma script de instalao" -#: lib/poptI.c:212 +#: lib/poptI.c:208 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1989,48 +1989,48 @@ msgstr "" "atualize para uma verso mais velha do pacote (--force em atualizaes no faz " "isto automaticamente)" -#: lib/poptI.c:216 +#: lib/poptI.c:212 msgid "print percentages as package installs" msgstr "imprima porcentagens a medida que o pacote vai sendo instalado" -#: lib/poptI.c:218 +#: lib/poptI.c:214 msgid "relocate the package to <dir>, if relocatable" msgstr "realoque o pacote para <diretrio>, se realocvel" -#: lib/poptI.c:221 +#: lib/poptI.c:217 msgid "relocate files from path <old> to <new>" msgstr "" -#: lib/poptI.c:222 +#: lib/poptI.c:218 #, fuzzy msgid "<old>=<new>" msgstr " [--nomd5] [alvos]" -#: lib/poptI.c:225 +#: lib/poptI.c:221 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:228 +#: lib/poptI.c:224 msgid "install even if the package replaces installed files" msgstr "instale mesmo que o pacote substitua arquivos j instalados" -#: lib/poptI.c:231 +#: lib/poptI.c:227 msgid "reinstall if the package is already present" msgstr "reinstale se o pacote j estiver presente" -#: lib/poptI.c:233 +#: lib/poptI.c:229 msgid "deinstall new, reinstall old, package(s), back to <date>" msgstr "" -#: lib/poptI.c:234 +#: lib/poptI.c:230 msgid "<date>" msgstr "" -#: lib/poptI.c:236 +#: lib/poptI.c:232 msgid "don't install, but tell if it would work or not" msgstr "no instale, mas diga se a instalao funcionar ou no" -#: lib/poptI.c:239 +#: lib/poptI.c:235 #, fuzzy msgid "upgrade package(s)" msgstr "instale pacote" @@ -2457,99 +2457,99 @@ msgid "package has neither file owner or id lists\n" msgstr "no foi passado pacote para instalao" # , c-format -#: lib/query.c:463 +#: lib/query.c:464 #, fuzzy, c-format msgid "can't query %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/query.c:618 lib/query.c:656 lib/rpminstall.c:352 lib/rpminstall.c:494 #: lib/rpminstall.c:887 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "Construo falhou.\n" -#: lib/query.c:633 +#: lib/query.c:634 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:639 +#: lib/query.c:640 msgid "old format source packages cannot be queried\n" msgstr "" # , c-format -#: lib/query.c:665 lib/rpminstall.c:507 +#: lib/query.c:666 lib/rpminstall.c:507 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/query.c:709 +#: lib/query.c:710 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:730 +#: lib/query.c:731 #, fuzzy msgid "no packages\n" msgstr "pesquise todos os pacotes" -#: lib/query.c:750 +#: lib/query.c:751 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:760 +#: lib/query.c:761 #, fuzzy, c-format msgid "no package triggers %s\n" msgstr "no foram passados pacotes para assinatura" # , c-format -#: lib/query.c:774 lib/query.c:796 lib/query.c:817 lib/query.c:852 +#: lib/query.c:775 lib/query.c:797 lib/query.c:818 lib/query.c:853 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: lib/query.c:784 lib/query.c:802 lib/query.c:827 lib/query.c:857 +#: lib/query.c:785 lib/query.c:803 lib/query.c:828 lib/query.c:858 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "no foram passados pacotes para assinatura" -#: lib/query.c:868 +#: lib/query.c:869 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:879 +#: lib/query.c:880 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:913 +#: lib/query.c:914 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:917 +#: lib/query.c:918 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:944 +#: lib/query.c:945 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:947 +#: lib/query.c:948 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:952 +#: lib/query.c:953 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:963 lib/rpminstall.c:675 +#: lib/query.c:964 lib/rpminstall.c:675 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "no foi passado pacote para instalao" @@ -2882,146 +2882,146 @@ msgstr "No consegui abrir: %s\n" msgid "cannot open Packages database in %s\n" msgstr "No consegui abrir: %s\n" -#: lib/signature.c:123 +#: lib/signature.c:124 msgid "file is not regular -- skipping size check\n" msgstr "" -#: lib/signature.c:132 +#: lib/signature.c:142 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:137 +#: lib/signature.c:147 #, c-format msgid " Actual size: %12d\n" msgstr "" -#: lib/signature.c:157 +#: lib/signature.c:167 msgid "No signature\n" msgstr "" -#: lib/signature.c:161 +#: lib/signature.c:171 #, fuzzy msgid "Old PGP signature\n" msgstr "gere assinatura PGP" -#: lib/signature.c:172 +#: lib/signature.c:182 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "" -#: lib/signature.c:226 +#: lib/signature.c:232 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "" # , c-format -#: lib/signature.c:305 lib/signature.c:402 lib/signature.c:669 -#: lib/signature.c:702 +#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675 +#: lib/signature.c:708 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: lib/signature.c:321 +#: lib/signature.c:327 #, fuzzy msgid "pgp failed\n" msgstr "Construo falhou.\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:328 +#: lib/signature.c:334 #, fuzzy msgid "pgp failed to write signature\n" msgstr "gere assinatura PGP" -#: lib/signature.c:333 +#: lib/signature.c:339 #, c-format msgid "PGP sig size: %d\n" msgstr "" -#: lib/signature.c:347 lib/signature.c:445 +#: lib/signature.c:353 lib/signature.c:451 #, fuzzy msgid "unable to read the signature\n" msgstr "gere assinatura PGP" -#: lib/signature.c:352 +#: lib/signature.c:358 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:419 +#: lib/signature.c:425 #, fuzzy msgid "gpg failed\n" msgstr "Construo falhou.\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:426 +#: lib/signature.c:432 #, fuzzy msgid "gpg failed to write signature\n" msgstr "gere assinatura PGP" -#: lib/signature.c:431 +#: lib/signature.c:437 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:450 +#: lib/signature.c:456 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:707 lib/signature.c:758 +#: lib/signature.c:713 lib/signature.c:764 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:737 +#: lib/signature.c:743 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "" -#: lib/signature.c:750 +#: lib/signature.c:756 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "" -#: lib/signature.c:794 +#: lib/signature.c:800 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:830 +#: lib/signature.c:836 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:879 +#: lib/signature.c:885 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1066 +#: lib/signature.c:1072 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "desconsidere quaisquer assinaturas MD5" -#: lib/signature.c:1176 +#: lib/signature.c:1182 msgid "Header " msgstr "" -#: lib/signature.c:1177 +#: lib/signature.c:1183 #, fuzzy msgid "V3 DSA signature: " msgstr "gere assinatura PGP" -#: lib/signature.c:1252 +#: lib/signature.c:1258 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1279 +#: lib/signature.c:1285 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1283 +#: lib/signature.c:1289 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" @@ -3064,12 +3064,12 @@ msgstr "lista dependncias do pacote" msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:100 +#: rpmdb/db1.c:98 rpmdb/db3.c:98 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:103 +#: rpmdb/db1.c:101 rpmdb/db3.c:101 #, c-format msgid "db%d error(%d): %s\n" msgstr "" @@ -3113,70 +3113,70 @@ msgstr "reconstrua o banco de dados a partir de um banco de dados existente" msgid "cannot get %s lock on database\n" msgstr "no foi passado pacote para desinstalao" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "exclusive" msgstr "" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "shared" msgstr "" -#: rpmdb/db3.c:129 +#: rpmdb/db3.c:127 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:147 +#: rpmdb/db3.c:145 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:187 +#: rpmdb/db3.c:185 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/db3.c:711 +#: rpmdb/db3.c:614 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/db3.c:778 +#: rpmdb/db3.c:681 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/db3.c:1001 +#: rpmdb/db3.c:903 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/db3.c:1226 +#: rpmdb/db3.c:1119 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "no foi passado pacote para desinstalao" -#: rpmdb/db3.c:1232 +#: rpmdb/db3.c:1125 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/dbconfig.c:404 +#: rpmdb/dbconfig.c:400 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:442 +#: rpmdb/dbconfig.c:438 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:451 +#: rpmdb/dbconfig.c:447 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:460 +#: rpmdb/dbconfig.c:456 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3288,154 +3288,148 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:163 +#: rpmdb/rpmdb.c:165 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:440 +#: rpmdb/rpmdb.c:258 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:462 +#: rpmdb/rpmdb.c:280 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:554 +#: rpmdb/rpmdb.c:379 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:685 +#: rpmdb/rpmdb.c:516 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:695 +#: rpmdb/rpmdb.c:529 #, fuzzy, c-format msgid "error(%d) removing record %s from %s\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:954 +#: rpmdb/rpmdb.c:788 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1102 -msgid "" -"old format database is present; use --rebuilddb to generate a new format " -"database\n" -msgstr "" - #. error -#: rpmdb/rpmdb.c:1367 +#: rpmdb/rpmdb.c:1174 #, fuzzy, c-format msgid "error(%d) counting packages\n" msgstr "no foi passado pacote para instalao" -#: rpmdb/rpmdb.c:2146 rpmdb/rpmdb.c:3507 +#: rpmdb/rpmdb.c:1971 rpmdb/rpmdb.c:3357 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2199 +#: rpmdb/rpmdb.c:2034 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2478 +#: rpmdb/rpmdb.c:2306 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "no foi passado pacote para desinstalao" -#: rpmdb/rpmdb.c:2639 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:2643 +#: rpmdb/rpmdb.c:2476 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:2813 +#: rpmdb/rpmdb.c:2663 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "no foi passado pacote para instalao" -#: rpmdb/rpmdb.c:3008 +#: rpmdb/rpmdb.c:2858 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:2862 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:3393 +#: rpmdb/rpmdb.c:3243 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3276 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3453 +#: rpmdb/rpmdb.c:3303 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/rpmdb.c:3457 +#: rpmdb/rpmdb.c:3307 #, c-format msgid "temporary database %s already exists\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3313 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3315 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:3472 +#: rpmdb/rpmdb.c:3322 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/rpmdb.c:3483 +#: rpmdb/rpmdb.c:3333 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/rpmdb.c:3547 +#: rpmdb/rpmdb.c:3397 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3565 +#: rpmdb/rpmdb.c:3415 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3573 +#: rpmdb/rpmdb.c:3423 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3575 +#: rpmdb/rpmdb.c:3425 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" @@ -3448,13 +3442,13 @@ msgstr "" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: rpmdb/rpmdb.c:3585 +#: rpmdb/rpmdb.c:3435 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "RPM verso %s\n" # , c-format -#: rpmdb/rpmdb.c:3587 +#: rpmdb/rpmdb.c:3437 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "No consegui abrir: %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-14 17:43-0400\n" +"POT-Creation-Date: 2002-05-01 18:05-0400\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton <gafton@redhat.com>\n" "Language-Team: Romanian <ro@li.org>\n" @@ -113,7 +113,7 @@ msgstr "" msgid "use <dir> as the top level directory" msgstr "" -#: rpmqv.c:125 lib/poptI.c:219 +#: rpmqv.c:125 lib/poptI.c:215 msgid "<dir>" msgstr "" @@ -1409,72 +1409,72 @@ msgstr "" msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:367 +#: lib/depends.c:380 msgid "(cached)" msgstr "" -#: lib/depends.c:392 +#: lib/depends.c:405 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:408 +#: lib/depends.c:421 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:429 +#: lib/depends.c:442 msgid "(db files)" msgstr "" -#: lib/depends.c:441 +#: lib/depends.c:454 msgid "(db provides)" msgstr "" -#: lib/depends.c:454 +#: lib/depends.c:467 msgid "(db package)" msgstr "" -#: lib/depends.c:762 +#: lib/depends.c:783 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:903 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1171 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1277 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1370 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1440 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1475 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1480 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2978 rpmdb/header.c:2999 rpmdb/header.c:3021 +#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 msgid "(not a number)" msgstr "" @@ -1608,223 +1608,223 @@ msgstr "" msgid "%s: Fread failed: %s\n" msgstr "" -#: lib/poptI.c:53 +#: lib/poptI.c:49 msgid "exclude paths must begin with a /" msgstr "" -#: lib/poptI.c:65 +#: lib/poptI.c:61 msgid "relocations must begin with a /" msgstr "" -#: lib/poptI.c:67 +#: lib/poptI.c:63 msgid "relocations must contain a =" msgstr "" -#: lib/poptI.c:70 +#: lib/poptI.c:66 msgid "relocations must have a / following the =" msgstr "" -#: lib/poptI.c:84 +#: lib/poptI.c:80 msgid "rollback takes a time/date stamp argument" msgstr "" -#: lib/poptI.c:91 +#: lib/poptI.c:87 msgid "malformed rollback time/date stamp argument" msgstr "" -#: lib/poptI.c:110 +#: lib/poptI.c:106 msgid "install all files, even configurations which might otherwise be skipped" msgstr "" -#: lib/poptI.c:114 +#: lib/poptI.c:110 msgid "" "remove all packages which match <package> (normally an error is generated if " "<package> specified multiple packages)" msgstr "" -#: lib/poptI.c:120 lib/poptI.c:175 +#: lib/poptI.c:116 lib/poptI.c:171 msgid "do not execute package scriptlet(s)" msgstr "" -#: lib/poptI.c:124 +#: lib/poptI.c:120 msgid "relocate files in non-relocateable package" msgstr "" -#: lib/poptI.c:127 +#: lib/poptI.c:123 msgid "save erased package files by renaming into sub-directory" msgstr "" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "erase (uninstall) package" msgstr "" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "<package>+" msgstr "" -#: lib/poptI.c:133 +#: lib/poptI.c:129 msgid "do not install documentation" msgstr "" -#: lib/poptI.c:135 +#: lib/poptI.c:131 msgid "skip files with leading component <path> " msgstr "" -#: lib/poptI.c:136 +#: lib/poptI.c:132 msgid "<path>" msgstr "" -#: lib/poptI.c:139 +#: lib/poptI.c:135 msgid "short hand for --replacepkgs --replacefiles" msgstr "" -#: lib/poptI.c:142 +#: lib/poptI.c:138 msgid "upgrade package(s) if already installed" msgstr "" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 +#: lib/poptI.c:139 lib/poptI.c:155 lib/poptI.c:236 msgid "<packagefile>+" msgstr "" -#: lib/poptI.c:145 +#: lib/poptI.c:141 msgid "print hash marks as package installs (good with -v)" msgstr "" -#: lib/poptI.c:148 +#: lib/poptI.c:144 msgid "don't verify package architecture" msgstr "" -#: lib/poptI.c:151 +#: lib/poptI.c:147 msgid "don't verify package operating system" msgstr "" -#: lib/poptI.c:154 +#: lib/poptI.c:150 msgid "don't check disk space before installing" msgstr "" -#: lib/poptI.c:156 +#: lib/poptI.c:152 msgid "install documentation" msgstr "" -#: lib/poptI.c:159 +#: lib/poptI.c:155 msgid "install package(s)" msgstr "" -#: lib/poptI.c:161 +#: lib/poptI.c:157 msgid "update the database, but do not modify the filesystem" msgstr "" -#: lib/poptI.c:163 +#: lib/poptI.c:159 msgid "do not verify package dependencies" msgstr "" -#: lib/poptI.c:166 +#: lib/poptI.c:162 msgid "do not reorder package installation to satisfy dependencies" msgstr "" -#: lib/poptI.c:171 +#: lib/poptI.c:167 msgid "do not suggest missing dependency resolution(s)" msgstr "" -#: lib/poptI.c:178 +#: lib/poptI.c:174 #, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "" -#: lib/poptI.c:181 +#: lib/poptI.c:177 #, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "" -#: lib/poptI.c:184 +#: lib/poptI.c:180 #, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "" -#: lib/poptI.c:187 +#: lib/poptI.c:183 #, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "" -#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 msgid "don't verify package digest(s)" msgstr "" -#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 msgid "don't verify package signature(s)" msgstr "" -#: lib/poptI.c:196 +#: lib/poptI.c:192 msgid "do not execute any scriptlet(s) triggered by this package" msgstr "" -#: lib/poptI.c:199 +#: lib/poptI.c:195 #, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "" -#: lib/poptI.c:202 +#: lib/poptI.c:198 #, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "" -#: lib/poptI.c:205 +#: lib/poptI.c:201 #, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "" -#: lib/poptI.c:208 +#: lib/poptI.c:204 #, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "" -#: lib/poptI.c:212 +#: lib/poptI.c:208 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" msgstr "" -#: lib/poptI.c:216 +#: lib/poptI.c:212 msgid "print percentages as package installs" msgstr "" -#: lib/poptI.c:218 +#: lib/poptI.c:214 msgid "relocate the package to <dir>, if relocatable" msgstr "" -#: lib/poptI.c:221 +#: lib/poptI.c:217 msgid "relocate files from path <old> to <new>" msgstr "" -#: lib/poptI.c:222 +#: lib/poptI.c:218 msgid "<old>=<new>" msgstr "" -#: lib/poptI.c:225 +#: lib/poptI.c:221 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:228 +#: lib/poptI.c:224 msgid "install even if the package replaces installed files" msgstr "" -#: lib/poptI.c:231 +#: lib/poptI.c:227 msgid "reinstall if the package is already present" msgstr "" -#: lib/poptI.c:233 +#: lib/poptI.c:229 msgid "deinstall new, reinstall old, package(s), back to <date>" msgstr "" -#: lib/poptI.c:234 +#: lib/poptI.c:230 msgid "<date>" msgstr "" -#: lib/poptI.c:236 +#: lib/poptI.c:232 msgid "don't install, but tell if it would work or not" msgstr "" -#: lib/poptI.c:239 +#: lib/poptI.c:235 msgid "upgrade package(s)" msgstr "" @@ -2205,96 +2205,96 @@ msgstr "" msgid "package has neither file owner or id lists\n" msgstr "" -#: lib/query.c:463 +#: lib/query.c:464 #, c-format msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/query.c:618 lib/query.c:656 lib/rpminstall.c:352 lib/rpminstall.c:494 #: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:633 +#: lib/query.c:634 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:639 +#: lib/query.c:640 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:665 lib/rpminstall.c:507 +#: lib/query.c:666 lib/rpminstall.c:507 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" -#: lib/query.c:709 +#: lib/query.c:710 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:730 +#: lib/query.c:731 msgid "no packages\n" msgstr "" -#: lib/query.c:750 +#: lib/query.c:751 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:760 +#: lib/query.c:761 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:774 lib/query.c:796 lib/query.c:817 lib/query.c:852 +#: lib/query.c:775 lib/query.c:797 lib/query.c:818 lib/query.c:853 #, c-format msgid "malformed %s: %s\n" msgstr "" -#: lib/query.c:784 lib/query.c:802 lib/query.c:827 lib/query.c:857 +#: lib/query.c:785 lib/query.c:803 lib/query.c:828 lib/query.c:858 #, c-format msgid "no package matches %s: %s\n" msgstr "" -#: lib/query.c:868 +#: lib/query.c:869 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:879 +#: lib/query.c:880 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:913 +#: lib/query.c:914 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:917 +#: lib/query.c:918 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:944 +#: lib/query.c:945 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:947 +#: lib/query.c:948 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:952 +#: lib/query.c:953 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:963 lib/rpminstall.c:675 +#: lib/query.c:964 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2598,137 +2598,137 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/signature.c:123 +#: lib/signature.c:124 msgid "file is not regular -- skipping size check\n" msgstr "" -#: lib/signature.c:132 +#: lib/signature.c:142 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:137 +#: lib/signature.c:147 #, c-format msgid " Actual size: %12d\n" msgstr "" -#: lib/signature.c:157 +#: lib/signature.c:167 msgid "No signature\n" msgstr "" -#: lib/signature.c:161 +#: lib/signature.c:171 msgid "Old PGP signature\n" msgstr "" -#: lib/signature.c:172 +#: lib/signature.c:182 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "" -#: lib/signature.c:226 +#: lib/signature.c:232 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "" -#: lib/signature.c:305 lib/signature.c:402 lib/signature.c:669 -#: lib/signature.c:702 +#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675 +#: lib/signature.c:708 #, c-format msgid "Could not exec %s: %s\n" msgstr "" -#: lib/signature.c:321 +#: lib/signature.c:327 msgid "pgp failed\n" msgstr "" #. PGP failed to write signature #. Just in case -#: lib/signature.c:328 +#: lib/signature.c:334 msgid "pgp failed to write signature\n" msgstr "" -#: lib/signature.c:333 +#: lib/signature.c:339 #, c-format msgid "PGP sig size: %d\n" msgstr "" -#: lib/signature.c:347 lib/signature.c:445 +#: lib/signature.c:353 lib/signature.c:451 msgid "unable to read the signature\n" msgstr "" -#: lib/signature.c:352 +#: lib/signature.c:358 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:419 +#: lib/signature.c:425 msgid "gpg failed\n" msgstr "" #. GPG failed to write signature #. Just in case -#: lib/signature.c:426 +#: lib/signature.c:432 msgid "gpg failed to write signature\n" msgstr "" -#: lib/signature.c:431 +#: lib/signature.c:437 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:450 +#: lib/signature.c:456 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:707 lib/signature.c:758 +#: lib/signature.c:713 lib/signature.c:764 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:737 +#: lib/signature.c:743 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "" -#: lib/signature.c:750 +#: lib/signature.c:756 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "" -#: lib/signature.c:794 +#: lib/signature.c:800 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:830 +#: lib/signature.c:836 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:879 +#: lib/signature.c:885 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1066 +#: lib/signature.c:1072 msgid "V3 RSA/MD5 signature: " msgstr "" -#: lib/signature.c:1176 +#: lib/signature.c:1182 msgid "Header " msgstr "" -#: lib/signature.c:1177 +#: lib/signature.c:1183 msgid "V3 DSA signature: " msgstr "" -#: lib/signature.c:1252 +#: lib/signature.c:1258 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1279 +#: lib/signature.c:1285 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1283 +#: lib/signature.c:1289 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" @@ -2763,12 +2763,12 @@ msgstr "" msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:100 +#: rpmdb/db1.c:98 rpmdb/db3.c:98 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:103 +#: rpmdb/db1.c:101 rpmdb/db3.c:101 #, c-format msgid "db%d error(%d): %s\n" msgstr "" @@ -2811,70 +2811,70 @@ msgstr "" msgid "cannot get %s lock on database\n" msgstr "" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "exclusive" msgstr "" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "shared" msgstr "" -#: rpmdb/db3.c:129 +#: rpmdb/db3.c:127 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:147 +#: rpmdb/db3.c:145 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:187 +#: rpmdb/db3.c:185 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: rpmdb/db3.c:711 +#: rpmdb/db3.c:614 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:778 +#: rpmdb/db3.c:681 #, c-format msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:1001 +#: rpmdb/db3.c:903 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1226 +#: rpmdb/db3.c:1119 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: rpmdb/db3.c:1232 +#: rpmdb/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:404 +#: rpmdb/dbconfig.c:400 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:442 +#: rpmdb/dbconfig.c:438 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:451 +#: rpmdb/dbconfig.c:447 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:460 +#: rpmdb/dbconfig.c:456 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -2982,155 +2982,149 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:163 +#: rpmdb/rpmdb.c:165 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:440 +#: rpmdb/rpmdb.c:258 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: rpmdb/rpmdb.c:462 +#: rpmdb/rpmdb.c:280 #, c-format msgid "cannot open %s index\n" msgstr "" -#: rpmdb/rpmdb.c:554 +#: rpmdb/rpmdb.c:379 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:685 +#: rpmdb/rpmdb.c:516 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:695 +#: rpmdb/rpmdb.c:529 #, c-format msgid "error(%d) removing record %s from %s\n" msgstr "" -#: rpmdb/rpmdb.c:954 +#: rpmdb/rpmdb.c:788 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1102 -msgid "" -"old format database is present; use --rebuilddb to generate a new format " -"database\n" -msgstr "" - #. error -#: rpmdb/rpmdb.c:1367 +#: rpmdb/rpmdb.c:1174 #, c-format msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2146 rpmdb/rpmdb.c:3507 +#: rpmdb/rpmdb.c:1971 rpmdb/rpmdb.c:3357 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2199 +#: rpmdb/rpmdb.c:2034 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2478 +#: rpmdb/rpmdb.c:2306 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2639 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2643 +#: rpmdb/rpmdb.c:2476 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2813 +#: rpmdb/rpmdb.c:2663 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3008 +#: rpmdb/rpmdb.c:2858 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:2862 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3393 +#: rpmdb/rpmdb.c:3243 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3276 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3453 +#: rpmdb/rpmdb.c:3303 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3457 +#: rpmdb/rpmdb.c:3307 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3313 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3315 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3472 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3483 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3547 +#: rpmdb/rpmdb.c:3397 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3565 +#: rpmdb/rpmdb.c:3415 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3573 +#: rpmdb/rpmdb.c:3423 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3575 +#: rpmdb/rpmdb.c:3425 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3585 +#: rpmdb/rpmdb.c:3435 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3587 +#: rpmdb/rpmdb.c:3437 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index f64b5bf06..cca00ab56 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-04-14 17:43-0400\n" +"POT-Creation-Date: 2002-05-01 18:05-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -119,7 +119,7 @@ msgstr "" msgid "use <dir> as the top level directory" msgstr "" -#: rpmqv.c:125 lib/poptI.c:219 +#: rpmqv.c:125 lib/poptI.c:215 msgid "<dir>" msgstr "" @@ -1415,72 +1415,72 @@ msgstr "" msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:367 +#: lib/depends.c:380 msgid "(cached)" msgstr "" -#: lib/depends.c:392 +#: lib/depends.c:405 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:408 +#: lib/depends.c:421 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:429 +#: lib/depends.c:442 msgid "(db files)" msgstr "" -#: lib/depends.c:441 +#: lib/depends.c:454 msgid "(db provides)" msgstr "" -#: lib/depends.c:454 +#: lib/depends.c:467 msgid "(db package)" msgstr "" -#: lib/depends.c:762 +#: lib/depends.c:783 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:903 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1171 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1277 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1370 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1440 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1475 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1480 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2978 rpmdb/header.c:2999 rpmdb/header.c:3021 +#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 msgid "(not a number)" msgstr "" @@ -1614,223 +1614,223 @@ msgstr "" msgid "%s: Fread failed: %s\n" msgstr "" -#: lib/poptI.c:53 +#: lib/poptI.c:49 msgid "exclude paths must begin with a /" msgstr "" -#: lib/poptI.c:65 +#: lib/poptI.c:61 msgid "relocations must begin with a /" msgstr "" -#: lib/poptI.c:67 +#: lib/poptI.c:63 msgid "relocations must contain a =" msgstr "" -#: lib/poptI.c:70 +#: lib/poptI.c:66 msgid "relocations must have a / following the =" msgstr "" -#: lib/poptI.c:84 +#: lib/poptI.c:80 msgid "rollback takes a time/date stamp argument" msgstr "" -#: lib/poptI.c:91 +#: lib/poptI.c:87 msgid "malformed rollback time/date stamp argument" msgstr "" -#: lib/poptI.c:110 +#: lib/poptI.c:106 msgid "install all files, even configurations which might otherwise be skipped" msgstr "" -#: lib/poptI.c:114 +#: lib/poptI.c:110 msgid "" "remove all packages which match <package> (normally an error is generated if " "<package> specified multiple packages)" msgstr "" -#: lib/poptI.c:120 lib/poptI.c:175 +#: lib/poptI.c:116 lib/poptI.c:171 msgid "do not execute package scriptlet(s)" msgstr "" -#: lib/poptI.c:124 +#: lib/poptI.c:120 msgid "relocate files in non-relocateable package" msgstr "" -#: lib/poptI.c:127 +#: lib/poptI.c:123 msgid "save erased package files by renaming into sub-directory" msgstr "" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "erase (uninstall) package" msgstr "" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "<package>+" msgstr "" -#: lib/poptI.c:133 +#: lib/poptI.c:129 msgid "do not install documentation" msgstr "" -#: lib/poptI.c:135 +#: lib/poptI.c:131 msgid "skip files with leading component <path> " msgstr "" -#: lib/poptI.c:136 +#: lib/poptI.c:132 msgid "<path>" msgstr "" -#: lib/poptI.c:139 +#: lib/poptI.c:135 msgid "short hand for --replacepkgs --replacefiles" msgstr "" -#: lib/poptI.c:142 +#: lib/poptI.c:138 msgid "upgrade package(s) if already installed" msgstr "" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 +#: lib/poptI.c:139 lib/poptI.c:155 lib/poptI.c:236 msgid "<packagefile>+" msgstr "" -#: lib/poptI.c:145 +#: lib/poptI.c:141 msgid "print hash marks as package installs (good with -v)" msgstr "" -#: lib/poptI.c:148 +#: lib/poptI.c:144 msgid "don't verify package architecture" msgstr "" -#: lib/poptI.c:151 +#: lib/poptI.c:147 msgid "don't verify package operating system" msgstr "" -#: lib/poptI.c:154 +#: lib/poptI.c:150 msgid "don't check disk space before installing" msgstr "" -#: lib/poptI.c:156 +#: lib/poptI.c:152 msgid "install documentation" msgstr "" -#: lib/poptI.c:159 +#: lib/poptI.c:155 msgid "install package(s)" msgstr "" -#: lib/poptI.c:161 +#: lib/poptI.c:157 msgid "update the database, but do not modify the filesystem" msgstr "" -#: lib/poptI.c:163 +#: lib/poptI.c:159 msgid "do not verify package dependencies" msgstr "" -#: lib/poptI.c:166 +#: lib/poptI.c:162 msgid "do not reorder package installation to satisfy dependencies" msgstr "" -#: lib/poptI.c:171 +#: lib/poptI.c:167 msgid "do not suggest missing dependency resolution(s)" msgstr "" -#: lib/poptI.c:178 +#: lib/poptI.c:174 #, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "" -#: lib/poptI.c:181 +#: lib/poptI.c:177 #, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "" -#: lib/poptI.c:184 +#: lib/poptI.c:180 #, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "" -#: lib/poptI.c:187 +#: lib/poptI.c:183 #, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "" -#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 msgid "don't verify package digest(s)" msgstr "" -#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 msgid "don't verify package signature(s)" msgstr "" -#: lib/poptI.c:196 +#: lib/poptI.c:192 msgid "do not execute any scriptlet(s) triggered by this package" msgstr "" -#: lib/poptI.c:199 +#: lib/poptI.c:195 #, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "" -#: lib/poptI.c:202 +#: lib/poptI.c:198 #, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "" -#: lib/poptI.c:205 +#: lib/poptI.c:201 #, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "" -#: lib/poptI.c:208 +#: lib/poptI.c:204 #, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "" -#: lib/poptI.c:212 +#: lib/poptI.c:208 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" msgstr "" -#: lib/poptI.c:216 +#: lib/poptI.c:212 msgid "print percentages as package installs" msgstr "" -#: lib/poptI.c:218 +#: lib/poptI.c:214 msgid "relocate the package to <dir>, if relocatable" msgstr "" -#: lib/poptI.c:221 +#: lib/poptI.c:217 msgid "relocate files from path <old> to <new>" msgstr "" -#: lib/poptI.c:222 +#: lib/poptI.c:218 msgid "<old>=<new>" msgstr "" -#: lib/poptI.c:225 +#: lib/poptI.c:221 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:228 +#: lib/poptI.c:224 msgid "install even if the package replaces installed files" msgstr "" -#: lib/poptI.c:231 +#: lib/poptI.c:227 msgid "reinstall if the package is already present" msgstr "" -#: lib/poptI.c:233 +#: lib/poptI.c:229 msgid "deinstall new, reinstall old, package(s), back to <date>" msgstr "" -#: lib/poptI.c:234 +#: lib/poptI.c:230 msgid "<date>" msgstr "" -#: lib/poptI.c:236 +#: lib/poptI.c:232 msgid "don't install, but tell if it would work or not" msgstr "" -#: lib/poptI.c:239 +#: lib/poptI.c:235 msgid "upgrade package(s)" msgstr "" @@ -2211,96 +2211,96 @@ msgstr "" msgid "package has neither file owner or id lists\n" msgstr "" -#: lib/query.c:463 +#: lib/query.c:464 #, c-format msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/query.c:618 lib/query.c:656 lib/rpminstall.c:352 lib/rpminstall.c:494 #: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:633 +#: lib/query.c:634 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:639 +#: lib/query.c:640 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:665 lib/rpminstall.c:507 +#: lib/query.c:666 lib/rpminstall.c:507 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" -#: lib/query.c:709 +#: lib/query.c:710 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:730 +#: lib/query.c:731 msgid "no packages\n" msgstr "" -#: lib/query.c:750 +#: lib/query.c:751 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:760 +#: lib/query.c:761 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:774 lib/query.c:796 lib/query.c:817 lib/query.c:852 +#: lib/query.c:775 lib/query.c:797 lib/query.c:818 lib/query.c:853 #, c-format msgid "malformed %s: %s\n" msgstr "" -#: lib/query.c:784 lib/query.c:802 lib/query.c:827 lib/query.c:857 +#: lib/query.c:785 lib/query.c:803 lib/query.c:828 lib/query.c:858 #, c-format msgid "no package matches %s: %s\n" msgstr "" -#: lib/query.c:868 +#: lib/query.c:869 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:879 +#: lib/query.c:880 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:913 +#: lib/query.c:914 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:917 +#: lib/query.c:918 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:944 +#: lib/query.c:945 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:947 +#: lib/query.c:948 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:952 +#: lib/query.c:953 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:963 lib/rpminstall.c:675 +#: lib/query.c:964 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2604,137 +2604,137 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/signature.c:123 +#: lib/signature.c:124 msgid "file is not regular -- skipping size check\n" msgstr "" -#: lib/signature.c:132 +#: lib/signature.c:142 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:137 +#: lib/signature.c:147 #, c-format msgid " Actual size: %12d\n" msgstr "" -#: lib/signature.c:157 +#: lib/signature.c:167 msgid "No signature\n" msgstr "" -#: lib/signature.c:161 +#: lib/signature.c:171 msgid "Old PGP signature\n" msgstr "" -#: lib/signature.c:172 +#: lib/signature.c:182 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "" -#: lib/signature.c:226 +#: lib/signature.c:232 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "" -#: lib/signature.c:305 lib/signature.c:402 lib/signature.c:669 -#: lib/signature.c:702 +#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675 +#: lib/signature.c:708 #, c-format msgid "Could not exec %s: %s\n" msgstr "" -#: lib/signature.c:321 +#: lib/signature.c:327 msgid "pgp failed\n" msgstr "" #. PGP failed to write signature #. Just in case -#: lib/signature.c:328 +#: lib/signature.c:334 msgid "pgp failed to write signature\n" msgstr "" -#: lib/signature.c:333 +#: lib/signature.c:339 #, c-format msgid "PGP sig size: %d\n" msgstr "" -#: lib/signature.c:347 lib/signature.c:445 +#: lib/signature.c:353 lib/signature.c:451 msgid "unable to read the signature\n" msgstr "" -#: lib/signature.c:352 +#: lib/signature.c:358 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:419 +#: lib/signature.c:425 msgid "gpg failed\n" msgstr "" #. GPG failed to write signature #. Just in case -#: lib/signature.c:426 +#: lib/signature.c:432 msgid "gpg failed to write signature\n" msgstr "" -#: lib/signature.c:431 +#: lib/signature.c:437 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:450 +#: lib/signature.c:456 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:707 lib/signature.c:758 +#: lib/signature.c:713 lib/signature.c:764 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:737 +#: lib/signature.c:743 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "" -#: lib/signature.c:750 +#: lib/signature.c:756 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "" -#: lib/signature.c:794 +#: lib/signature.c:800 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:830 +#: lib/signature.c:836 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:879 +#: lib/signature.c:885 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1066 +#: lib/signature.c:1072 msgid "V3 RSA/MD5 signature: " msgstr "" -#: lib/signature.c:1176 +#: lib/signature.c:1182 msgid "Header " msgstr "" -#: lib/signature.c:1177 +#: lib/signature.c:1183 msgid "V3 DSA signature: " msgstr "" -#: lib/signature.c:1252 +#: lib/signature.c:1258 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1279 +#: lib/signature.c:1285 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1283 +#: lib/signature.c:1289 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" @@ -2769,12 +2769,12 @@ msgstr "" msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:100 +#: rpmdb/db1.c:98 rpmdb/db3.c:98 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:103 +#: rpmdb/db1.c:101 rpmdb/db3.c:101 #, c-format msgid "db%d error(%d): %s\n" msgstr "" @@ -2817,70 +2817,70 @@ msgstr "" msgid "cannot get %s lock on database\n" msgstr "" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "exclusive" msgstr "" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "shared" msgstr "" -#: rpmdb/db3.c:129 +#: rpmdb/db3.c:127 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:147 +#: rpmdb/db3.c:145 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:187 +#: rpmdb/db3.c:185 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: rpmdb/db3.c:711 +#: rpmdb/db3.c:614 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:778 +#: rpmdb/db3.c:681 #, c-format msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:1001 +#: rpmdb/db3.c:903 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1226 +#: rpmdb/db3.c:1119 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: rpmdb/db3.c:1232 +#: rpmdb/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:404 +#: rpmdb/dbconfig.c:400 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:442 +#: rpmdb/dbconfig.c:438 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:451 +#: rpmdb/dbconfig.c:447 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:460 +#: rpmdb/dbconfig.c:456 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -2988,155 +2988,149 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:163 +#: rpmdb/rpmdb.c:165 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:440 +#: rpmdb/rpmdb.c:258 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: rpmdb/rpmdb.c:462 +#: rpmdb/rpmdb.c:280 #, c-format msgid "cannot open %s index\n" msgstr "" -#: rpmdb/rpmdb.c:554 +#: rpmdb/rpmdb.c:379 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:685 +#: rpmdb/rpmdb.c:516 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:695 +#: rpmdb/rpmdb.c:529 #, c-format msgid "error(%d) removing record %s from %s\n" msgstr "" -#: rpmdb/rpmdb.c:954 +#: rpmdb/rpmdb.c:788 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1102 -msgid "" -"old format database is present; use --rebuilddb to generate a new format " -"database\n" -msgstr "" - #. error -#: rpmdb/rpmdb.c:1367 +#: rpmdb/rpmdb.c:1174 #, c-format msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2146 rpmdb/rpmdb.c:3507 +#: rpmdb/rpmdb.c:1971 rpmdb/rpmdb.c:3357 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2199 +#: rpmdb/rpmdb.c:2034 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2478 +#: rpmdb/rpmdb.c:2306 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2639 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2643 +#: rpmdb/rpmdb.c:2476 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2813 +#: rpmdb/rpmdb.c:2663 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:3008 +#: rpmdb/rpmdb.c:2858 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:2862 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3393 +#: rpmdb/rpmdb.c:3243 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3276 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3453 +#: rpmdb/rpmdb.c:3303 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3457 +#: rpmdb/rpmdb.c:3307 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3313 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3315 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3472 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3483 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3547 +#: rpmdb/rpmdb.c:3397 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3565 +#: rpmdb/rpmdb.c:3415 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3573 +#: rpmdb/rpmdb.c:3423 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3575 +#: rpmdb/rpmdb.c:3425 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3585 +#: rpmdb/rpmdb.c:3435 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3587 +#: rpmdb/rpmdb.c:3437 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-14 17:43-0400\n" +"POT-Creation-Date: 2002-05-01 18:05-0400\n" "PO-Revision-Date: 2001-08-29 13:55-0400\n" "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n" "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n" @@ -116,7 +116,7 @@ msgstr "<ËÏÍÁÎÄÁ>" msgid "use <dir> as the top level directory" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <ËÁÔÁÌÏÇ> ËÁË ËÏÒÎÅ×ÏÊ ËÁÔÁÌÏÇ" -#: rpmqv.c:125 lib/poptI.c:219 +#: rpmqv.c:125 lib/poptI.c:215 msgid "<dir>" msgstr "<ËÁÔÁÌÏÇ>" @@ -1448,52 +1448,52 @@ msgstr "ÎÅ ÕÄÁÌÏÓØ - " msgid "package %s was already added, replacing with %s\n" msgstr "ÐÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/depends.c:367 +#: lib/depends.c:380 msgid "(cached)" msgstr "" -#: lib/depends.c:392 +#: lib/depends.c:405 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s YES (rpmrc provides)\n" -#: lib/depends.c:408 +#: lib/depends.c:421 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s YES (rpmlib provides)\n" -#: lib/depends.c:429 +#: lib/depends.c:442 #, fuzzy msgid "(db files)" msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n" -#: lib/depends.c:441 +#: lib/depends.c:454 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s YES (db provides)\n" -#: lib/depends.c:454 +#: lib/depends.c:467 #, fuzzy msgid "(db package)" msgstr "ÎÅÔ ÐÁËÅÔÏ×\n" -#: lib/depends.c:762 +#: lib/depends.c:783 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:903 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s-%s-%s \"%s\" ÉÚ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ.\n" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1171 msgid "========== recording tsort relations\n" msgstr "========== ÚÁÐÉÓØ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1277 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1502,26 +1502,26 @@ msgstr "" "========== ÓÏÒÔÉÒÏ×ËÁ ÐÁËÅÔÏ× (ÏÞÅÒÅÄÎÏÓÔØ, #predecessors, #succesors, " "ÇÌÕÂÉÎÁ)\n" -#: lib/depends.c:1349 +#: lib/depends.c:1370 msgid "========== successors only (presentation order)\n" msgstr "========== ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌÉ (× ÐÏÒÑÄËÅ ÐÒÅÄÓÔÁ×ÌÅÎÉÑ)\n" -#: lib/depends.c:1419 +#: lib/depends.c:1440 msgid "LOOP:\n" msgstr "ãéëì:\n" -#: lib/depends.c:1454 +#: lib/depends.c:1475 msgid "========== continuing tsort ...\n" msgstr "========== ÐÒÏÄÏÌÖÅÎÉÅ ÕÐÏÒÑÄÏÞÅÎÉÑ ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1480 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2978 rpmdb/header.c:2999 rpmdb/header.c:3021 +#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 msgid "(not a number)" msgstr "(ÎÅ ÞÉÓÌÏ)" @@ -1658,38 +1658,38 @@ msgstr "" msgid "%s: Fread failed: %s\n" msgstr "%s: ÏÛÉÂËÁ Fread: %s\n" -#: lib/poptI.c:53 +#: lib/poptI.c:49 msgid "exclude paths must begin with a /" msgstr "ÉÓËÌÀÞÅÎÉÑ ÄÏÌÖÎÙ ÎÁÞÉÎÁÔØÓÑ Ó /" -#: lib/poptI.c:65 +#: lib/poptI.c:61 msgid "relocations must begin with a /" msgstr "ÐÅÒÅÍÅÝÅÎÉÑ ÄÏÌÖÎÙ ÎÁÞÉÎÁÔØÓÑ Ó /" -#: lib/poptI.c:67 +#: lib/poptI.c:63 msgid "relocations must contain a =" msgstr "ÐÅÒÅÍÅÝÅÎÉÑ ÄÏÌÖÎÙ ÓÏÄÅÒÖÁÔØ =" -#: lib/poptI.c:70 +#: lib/poptI.c:66 msgid "relocations must have a / following the =" msgstr "ÐÅÒÅÍÅÝÅÎÉÑ ÄÏÌÖÎÙ ÉÍÅÔØ / ÐÏÓÌÅ =" -#: lib/poptI.c:84 +#: lib/poptI.c:80 msgid "rollback takes a time/date stamp argument" msgstr "" -#: lib/poptI.c:91 +#: lib/poptI.c:87 #, fuzzy msgid "malformed rollback time/date stamp argument" msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÆÏÒÍÁÔ ×ÒÅÍÅÎÉ ÏÔËÁÔÁ" -#: lib/poptI.c:110 +#: lib/poptI.c:106 msgid "install all files, even configurations which might otherwise be skipped" msgstr "" "ÕÓÔÁÎÁ×ÌÉ×ÁÔØ ×ÓÅ ÆÁÊÌÙ, ÄÁÖÅ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÅ, ËÏÔÏÒÙÅ ÍÏÇÌÉ ÂÙ ÂÙÔØ " "ÐÒÏÐÕÝÅÎÙ" -#: lib/poptI.c:114 +#: lib/poptI.c:110 msgid "" "remove all packages which match <package> (normally an error is generated if " "<package> specified multiple packages)" @@ -1697,146 +1697,146 @@ msgstr "" "ÕÄÁÌÉÔØ ×ÓÅ ÐÁËÅÔÙ, ÓÏ×ÐÁÄÁÀÝÉÅ Ó <ÐÁËÅÔ> (ÏÂÙÞÎÏ, ÅÓÌÉ <ÐÁËÅÔ> " "ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÎÅÓËÏÌØËÉÍ ÐÁËÅÔÁÍ, ÇÅÎÅÒÉÒÕÅÔÓÑ ÏÛÉÂËÁ)" -#: lib/poptI.c:120 lib/poptI.c:175 +#: lib/poptI.c:116 lib/poptI.c:171 msgid "do not execute package scriptlet(s)" msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ ÎÉËÁËÉÈ ÓÃÅÎÁÒÉÅ× ÐÁËÅÔÁ(Ï×)" -#: lib/poptI.c:124 +#: lib/poptI.c:120 msgid "relocate files in non-relocateable package" msgstr "ÐÅÒÅÍÅÓÔÉÔØ ÆÁÊÌÙ × ÎÅÐÅÒÅÍÅÝÁÅÍÏÍ ÐÁËÅÔÅ" -#: lib/poptI.c:127 +#: lib/poptI.c:123 msgid "save erased package files by renaming into sub-directory" msgstr "ÓÏÈÒÁÎÉÔØ × ÐÏÄËÁÔÁÌÏÇÅ ÐÏÄÌÅÖÁÝÉÅ ÕÄÁÌÅÎÉÀ ÆÁÊÌÙ ÐÁËÅÔÁ" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "erase (uninstall) package" msgstr "ÕÄÁÌÉÔØ (ÄÅÉÎÓÔÁÌÌÉÒÏ×ÁÔØ) ÐÁËÅÔ" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "<package>+" msgstr "<ÐÁËÅÔ>+" -#: lib/poptI.c:133 +#: lib/poptI.c:129 msgid "do not install documentation" msgstr "ÎÅ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ ÄÏËÕÍÅÎÔÁÃÉÀ" -#: lib/poptI.c:135 +#: lib/poptI.c:131 msgid "skip files with leading component <path> " msgstr "ÐÒÏÐÕÓÔÉÔØ ÆÁÊÌÙ × ÐÕÔÉ <ÐÕÔØ>" -#: lib/poptI.c:136 +#: lib/poptI.c:132 msgid "<path>" msgstr "<ÐÕÔØ>" -#: lib/poptI.c:139 +#: lib/poptI.c:135 msgid "short hand for --replacepkgs --replacefiles" msgstr "ÓÏËÒÁÝÅÎÉÅ ÄÌÑ --replacepkgs --replacefiles" -#: lib/poptI.c:142 +#: lib/poptI.c:138 msgid "upgrade package(s) if already installed" msgstr "ÏÂÎÏ×ÉÔØ ÐÁËÅÔ(Ù) ÅÓÌÉ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 +#: lib/poptI.c:139 lib/poptI.c:155 lib/poptI.c:236 msgid "<packagefile>+" msgstr "<ÆÁÊÌ ÐÁËÅÔÁ>+" -#: lib/poptI.c:145 +#: lib/poptI.c:141 msgid "print hash marks as package installs (good with -v)" msgstr "×Ù×ÏÄÉÔØ \"#\" ÐÏ ÍÅÒÅ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ (ÈÏÒÏÛÏ Ó -v)" -#: lib/poptI.c:148 +#: lib/poptI.c:144 msgid "don't verify package architecture" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÁÒÈÉÔÅËÔÕÒÕ ÐÁËÅÔÁ" -#: lib/poptI.c:151 +#: lib/poptI.c:147 msgid "don't verify package operating system" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÏÐÅÒÁÃÉÏÎÎÕÀ ÓÉÓÔÅÍÕ ÐÁËÅÔÁ" -#: lib/poptI.c:154 +#: lib/poptI.c:150 msgid "don't check disk space before installing" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÄÉÓËÏ×ÏÅ ÐÒÏÓÔÒÁÎÓÔ×Ï ÐÅÒÅÄ ÕÓÔÁÎÏ×ËÏÊ" -#: lib/poptI.c:156 +#: lib/poptI.c:152 msgid "install documentation" msgstr "ÕÓÔÁÎÏ×ÉÔØ ÄÏËÕÍÅÎÔÁÃÉÀ" -#: lib/poptI.c:159 +#: lib/poptI.c:155 #, fuzzy msgid "install package(s)" msgstr "ÕÓÔÁÎÏ×ÉÔØ ÐÁËÅÔ" -#: lib/poptI.c:161 +#: lib/poptI.c:157 msgid "update the database, but do not modify the filesystem" msgstr "ÏÂÎÏ×ÉÔØ ÂÁÚÕ ÄÁÎÎÙÈ, ÎÏ ÎÅ ÍÏÄÉÆÉÃÉÒÏ×ÁÔØ ÆÁÊÌÏ×ÕÀ ÓÉÓÔÅÍÕ" -#: lib/poptI.c:163 +#: lib/poptI.c:159 msgid "do not verify package dependencies" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÚÁ×ÉÓÉÍÏÓÔÉ ÐÁËÅÔÁ" -#: lib/poptI.c:166 +#: lib/poptI.c:162 msgid "do not reorder package installation to satisfy dependencies" msgstr "ÎÅ ÍÅÎÑÔØ ÐÏÒÑÄÏË ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÏ× ÄÌÑ ÕÄÏ×ÌÅÔ×ÏÒÅÎÉÑ ÚÁ×ÉÓÉÍÏÓÔÅÊ" -#: lib/poptI.c:171 +#: lib/poptI.c:167 msgid "do not suggest missing dependency resolution(s)" msgstr "" -#: lib/poptI.c:178 +#: lib/poptI.c:174 #, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%pre ÓÃÅÎÁÒÉÅ× (ÅÓÌÉ ÅÓÔØ)" -#: lib/poptI.c:181 +#: lib/poptI.c:177 #, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%post ÓÃÅÎÁÒÉÅ× (ÅÓÌÉ ÅÓÔØ)" -#: lib/poptI.c:184 +#: lib/poptI.c:180 #, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%preun ÓÃÅÎÁÒÉÅ× (ÅÓÌÉ ÅÓÔØ)" -#: lib/poptI.c:187 +#: lib/poptI.c:183 #, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%postun ÓÃÅÎÁÒÉÅ× (ÅÓÌÉ ÅÓÔØ)" -#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy msgid "don't verify package digest(s)" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÆÁÊÌÙ ÎÁ ËÏÎÔÒÏÌØÎÕÀ ÓÕÍÍÕ MD5" -#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy msgid "don't verify package signature(s)" msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ × ÐÁËÅÔÅ" -#: lib/poptI.c:196 +#: lib/poptI.c:192 msgid "do not execute any scriptlet(s) triggered by this package" msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ ÔÒÉÇÇÅÒ-ÓÃÅÎÁÒÉÅ×, ×Ú×ÅÄÅÎÎÙÈ ÜÔÉÍ ÐÁËÅÔÏÍ" -#: lib/poptI.c:199 +#: lib/poptI.c:195 #, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%triggerprein ÓÃÅÎÁÒÉÅ×" -#: lib/poptI.c:202 +#: lib/poptI.c:198 #, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%triggerin ÓÃÅÎÁÒÉÅ×" -#: lib/poptI.c:205 +#: lib/poptI.c:201 #, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%triggerun ÓÃÅÎÁÒÉÅ×" -#: lib/poptI.c:208 +#: lib/poptI.c:204 #, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%triggerpostun ÓÃÅÎÁÒÉÅ×" -#: lib/poptI.c:212 +#: lib/poptI.c:208 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1844,50 +1844,50 @@ msgstr "" "ÏÔËÁÔ ÎÁ ÂÏÌÅÅ ÓÔÁÒÕÀ ×ÅÒÓÉÀ ÐÁËÅÔÁ (--force ÐÒÉ ÏÂÎÏ×ÌÅÎÉÉ ÄÅÌÁÅÔ ÜÔÏ " "Á×ÔÏÍÁÔÉÞÅÓËÉ)" -#: lib/poptI.c:216 +#: lib/poptI.c:212 msgid "print percentages as package installs" msgstr "×Ù×ÏÄÉÔØ ÐÒÏÃÅÎÔ ÇÏÔÏ×ÎÏÓÔÉ ÐÏ ÍÅÒÅ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ" -#: lib/poptI.c:218 +#: lib/poptI.c:214 msgid "relocate the package to <dir>, if relocatable" msgstr "ÐÅÒÅÍÅÓÔÉÔØ ÐÁËÅÔ × <ËÁÔÁÌÏÇ>, ÅÓÌÉ ÐÁËÅÔ ÜÔÏ ÐÏÚ×ÏÌÑÅÔ" -#: lib/poptI.c:221 +#: lib/poptI.c:217 msgid "relocate files from path <old> to <new>" msgstr "ÐÅÒÅÍÅÓÔÉÔØ ÆÁÊÌÙ ÉÚ ÐÕÔÉ <old> × <new>" -#: lib/poptI.c:222 +#: lib/poptI.c:218 msgid "<old>=<new>" msgstr "<old>=<new>" -#: lib/poptI.c:225 +#: lib/poptI.c:221 msgid "save erased package files by repackaging" msgstr "ÓÏÈÒÁÎÉÔØ ÐÏÄÌÅÖÁÝÉÅ ÕÄÁÌÅÎÉÀ ÆÁÊÌÙ × ÎÏ×ÏÍ ÐÁËÅÔÅ" -#: lib/poptI.c:228 +#: lib/poptI.c:224 msgid "install even if the package replaces installed files" msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÔØ, ÄÁÖÅ ÅÓÌÉ ÐÁËÅÔ ÐÅÒÅÐÉÛÅÔ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎÎÙÅ ÆÁÊÌÙ" -#: lib/poptI.c:231 +#: lib/poptI.c:227 msgid "reinstall if the package is already present" msgstr "ÐÅÒÅÕÓÔÁÎÏ×ÉÔØ, ÅÓÌÉ ÐÁËÅÔ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/poptI.c:233 +#: lib/poptI.c:229 #, fuzzy msgid "deinstall new, reinstall old, package(s), back to <date>" msgstr "" "ÕÄÁÌÉÔØ ÎÏ×ÙÊ(Å) ÐÁËÅÔ(Ù), ÐÅÒÅÕÓÔÁÎÏ×ÉÔØ ÓÔÁÒÙÊ(Å) ÐÁËÅÔ(Ù), ÏÂÒÁÔÎÏ ÎÁ " "ÕËÁÚÁÎÎÕÀ ÄÁÔÕ" -#: lib/poptI.c:234 +#: lib/poptI.c:230 msgid "<date>" msgstr "<ÄÁÔÁ>" -#: lib/poptI.c:236 +#: lib/poptI.c:232 msgid "don't install, but tell if it would work or not" msgstr "ÎÅ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ, Á ÔÏÌØËÏ ÓÏÏÂÝÉÔØ, ÕÄÁÓÔÓÑ ÌÉ ÕÓÔÁÎÏ×ËÁ" -#: lib/poptI.c:239 +#: lib/poptI.c:235 msgid "upgrade package(s)" msgstr "ÏÂÎÏ×ÉÔØ ÐÁËÅÔ(Ù)" @@ -2281,96 +2281,96 @@ msgstr "(ÓÏÓÔ. ÎÅÔ) " msgid "package has neither file owner or id lists\n" msgstr "ÐÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÓÐÉÓËÏ× ÎÉ ÈÏÚÑÅ× ÆÁÊÌÏ×, ÎÉ ÉÈ ID\n" -#: lib/query.c:463 +#: lib/query.c:464 #, c-format msgid "can't query %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÒÏÓÉÔØ %s: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/query.c:618 lib/query.c:656 lib/rpminstall.c:352 lib/rpminstall.c:494 #: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" -#: lib/query.c:633 +#: lib/query.c:634 #, c-format msgid "query of %s failed\n" msgstr "ÏÛÉÂËÁ ÚÁÐÒÏÓÁ %s\n" -#: lib/query.c:639 +#: lib/query.c:640 msgid "old format source packages cannot be queried\n" msgstr "ÚÁÐÒÏÓÙ Ë ÉÓÈÏÄÎÙÍ ÐÁËÅÔÁÍ × ÓÔÁÒÏÍ ÆÏÒÍÁÔÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ\n" -#: lib/query.c:665 lib/rpminstall.c:507 +#: lib/query.c:666 lib/rpminstall.c:507 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: ÏÛÉÂËÁ ÞÔÅÎÉÑ ÓÐÉÓËÁ ÆÁÊÌÏ×: %s\n" -#: lib/query.c:709 +#: lib/query.c:710 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "ÚÁÐÒÏÓ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ %s ÎÅ ÕÄÁÌÓÑ, ÎÅ×ÏÚÍÏÖÎÏ ÒÁÚÏÂÒÁÔØ ÆÁÊÌ\n" -#: lib/query.c:730 +#: lib/query.c:731 msgid "no packages\n" msgstr "ÎÅÔ ÐÁËÅÔÏ×\n" -#: lib/query.c:750 +#: lib/query.c:751 #, c-format msgid "group %s does not contain any packages\n" msgstr "ÇÒÕÐÐÁ %s ÎÅ ÓÏÄÅÒÖÉÔ ÎÉËÁËÉÈ ÐÁËÅÔÏ×\n" -#: lib/query.c:760 +#: lib/query.c:761 #, c-format msgid "no package triggers %s\n" msgstr "ÎÉ ÏÄÉÎ ÉÚ ÐÁËÅÔÏ× ÎÅ ×Ú×ÏÄÉÔ ÔÒÉÇÇÅÒ %s\n" -#: lib/query.c:774 lib/query.c:796 lib/query.c:817 lib/query.c:852 +#: lib/query.c:775 lib/query.c:797 lib/query.c:818 lib/query.c:853 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÅÓÔØ %s: %s.\n" -#: lib/query.c:784 lib/query.c:802 lib/query.c:827 lib/query.c:857 +#: lib/query.c:785 lib/query.c:803 lib/query.c:828 lib/query.c:858 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "ÎÉ ÏÄÉÎ ÉÚ ÐÁËÅÔÏ× ÎÅ ×Ú×ÏÄÉÔ ÔÒÉÇÇÅÒ %s\n" -#: lib/query.c:868 +#: lib/query.c:869 #, c-format msgid "no package requires %s\n" msgstr "ÎÉ ÏÄÉÎ ÉÚ ÐÁËÅÔÏ× ÎÅ ÔÒÅÂÕÅÔ %s\n" -#: lib/query.c:879 +#: lib/query.c:880 #, c-format msgid "no package provides %s\n" msgstr "ÎÉ ÏÄÉÎ ÉÚ ÐÁËÅÔÏ× ÎÅ ÐÒÅÄÏÓÔÁ×ÌÑÅÔ %s\n" -#: lib/query.c:913 +#: lib/query.c:914 #, c-format msgid "file %s: %s\n" msgstr "ÆÁÊÌ %s: %s\n" -#: lib/query.c:917 +#: lib/query.c:918 #, c-format msgid "file %s is not owned by any package\n" msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n" -#: lib/query.c:944 +#: lib/query.c:945 #, c-format msgid "invalid package number: %s\n" msgstr "ÎÅ×ÅÒÎÙÊ ÎÏÍÅÒ ÐÁËÅÔÁ: %s\n" -#: lib/query.c:947 +#: lib/query.c:948 #, c-format msgid "package record number: %u\n" msgstr "ÎÏÍÅÒ ÚÁÐÉÓÉ ÐÁËÅÔÁ: %u\n" -#: lib/query.c:952 +#: lib/query.c:953 #, c-format msgid "record %u could not be read\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÚÁÐÉÓØ %u\n" -#: lib/query.c:963 lib/rpminstall.c:675 +#: lib/query.c:964 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "ÐÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" @@ -2679,141 +2679,141 @@ msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÞÔÅÎÉÑ: %s.\n" msgid "cannot open Packages database in %s\n" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n" -#: lib/signature.c:123 +#: lib/signature.c:124 msgid "file is not regular -- skipping size check\n" msgstr "ÎÅÏÂÙÞÎÙÊ ÆÁÊÌ -- ÐÒÏÐÕÓËÁÀ ÐÒÏ×ÅÒËÕ ÒÁÚÍÅÒÁ\n" -#: lib/signature.c:132 +#: lib/signature.c:142 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "ïÖÉÄÁÅÍÙÊ ÒÁÚÍÅÒ: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" -#: lib/signature.c:137 +#: lib/signature.c:147 #, c-format msgid " Actual size: %12d\n" msgstr "æÁËÔÉÞÅÓËÉÊ ÒÁÚÍÅÒ: %12d\n" -#: lib/signature.c:157 +#: lib/signature.c:167 msgid "No signature\n" msgstr "ðÏÄÐÉÓÉ ÎÅÔ\n" -#: lib/signature.c:161 +#: lib/signature.c:171 msgid "Old PGP signature\n" msgstr "óÔÁÒÁÑ ÐÏÄÐÉÓØ PGP\n" -#: lib/signature.c:172 +#: lib/signature.c:182 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "" "óÔÁÒÁÑ (ÔÏÌØËÏ ÄÌÑ ×ÎÕÔÒÅÎÎÅÇÏ ÉÓÐÏÌØÚÏ×ÁÎÉÑ) ÐÏÄÐÉÓØ! çÄÅ ×Ù üôï ×ÚÑÌÉ!?\n" -#: lib/signature.c:226 +#: lib/signature.c:232 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "ðÏÄÐÉÓØ: ÒÁÚÍÅÒ(%d)+ÚÁÐÏÌÎÅÎÉÅ(%d)\n" -#: lib/signature.c:305 lib/signature.c:402 lib/signature.c:669 -#: lib/signature.c:702 +#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675 +#: lib/signature.c:708 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÌÎÉÔØ %s: %s\n" -#: lib/signature.c:321 +#: lib/signature.c:327 msgid "pgp failed\n" msgstr "ÏÛÉÂËÁ pgp\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:328 +#: lib/signature.c:334 msgid "pgp failed to write signature\n" msgstr "ÏÛÉÂËÁ pgp ÐÒÉ ÚÁÐÉÓÉ ÐÏÄÐÉÓÉ\n" -#: lib/signature.c:333 +#: lib/signature.c:339 #, c-format msgid "PGP sig size: %d\n" msgstr "òÁÚÍÅÒ ÐÏÄÐÉÓÉ PGP: %d\n" -#: lib/signature.c:347 lib/signature.c:445 +#: lib/signature.c:353 lib/signature.c:451 msgid "unable to read the signature\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÅÓÔØ ÐÏÄÐÉÓØ\n" -#: lib/signature.c:352 +#: lib/signature.c:358 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "ðÏÌÕÞÅÎÏ %d ÂÁÊÔ ÐÏÄÐÉÓÉ PGP\n" -#: lib/signature.c:419 +#: lib/signature.c:425 msgid "gpg failed\n" msgstr "ÏÛÉÂËÁ gpg\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:426 +#: lib/signature.c:432 msgid "gpg failed to write signature\n" msgstr "ÏÛÉÂËÁ gpg ÐÒÉ ÚÁÐÉÓÉ ÐÏÄÐÉÓÉ\n" -#: lib/signature.c:431 +#: lib/signature.c:437 #, c-format msgid "GPG sig size: %d\n" msgstr "òÁÚÍÅÒ ÐÏÄÐÉÓÉ GPG: %d\n" -#: lib/signature.c:450 +#: lib/signature.c:456 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "ðÏÌÕÞÅÎÏ %d ÂÁÊÔ ÐÏÄÐÉÓÉ GPG\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:707 lib/signature.c:758 +#: lib/signature.c:713 lib/signature.c:764 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "îÅ×ÅÒÎÁÑ ÓÐÅÃÉÆÉËÁÃÉÑ %%_signature × ÍÁËÒÏÆÁÊÌÅ\n" -#: lib/signature.c:737 +#: lib/signature.c:743 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ \"%%_gpg_name\" × ×ÁÛÅÍ ÍÁËÒÏÆÁÊÌÅ\n" -#: lib/signature.c:750 +#: lib/signature.c:756 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ \"%%_pgp_name\" × ×ÁÛÅÍ ÍÁËÒÏÆÁÊÌÅ\n" -#: lib/signature.c:794 +#: lib/signature.c:800 #, fuzzy msgid "Header+Payload size: " msgstr "úÁÇÏÌÏ×ÏË ÓÌÉÛËÏÍ ×ÅÌÉË" -#: lib/signature.c:830 +#: lib/signature.c:836 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:879 +#: lib/signature.c:885 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1066 +#: lib/signature.c:1072 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "ÐÒÏÐÕÓÔÉÔØ ×ÓÅ MD5-ÐÏÄÐÉÓÉ" -#: lib/signature.c:1176 +#: lib/signature.c:1182 msgid "Header " msgstr "" -#: lib/signature.c:1177 +#: lib/signature.c:1183 #, fuzzy msgid "V3 DSA signature: " msgstr "ðÏÄÐÉÓÉ ÎÅÔ\n" -#: lib/signature.c:1252 +#: lib/signature.c:1258 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1279 +#: lib/signature.c:1285 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1283 +#: lib/signature.c:1289 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "ðÏÄÐÉÓØ: ÒÁÚÍÅÒ(%d)+ÚÁÐÏÌÎÅÎÉÅ(%d)\n" @@ -2848,12 +2848,12 @@ msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÄÌÑ %s-%s-%s: " msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "%s-%s-%s: ÎÅÐÒÁ×ÉÌØÎÁÑ ÐÏÄÐÉÓØ ÏÂÌÁÓÔÉ ÚÁÇÏÌÏ×ËÁ ÐÁËÅÔÁ\n" -#: rpmdb/db1.c:98 rpmdb/db3.c:100 +#: rpmdb/db1.c:98 rpmdb/db3.c:98 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "ÏÛÉÂËÁ(%d) db%d ÉÚ %s: %s\n" -#: rpmdb/db1.c:101 rpmdb/db3.c:103 +#: rpmdb/db1.c:101 rpmdb/db3.c:101 #, c-format msgid "db%d error(%d): %s\n" msgstr "ÏÛÉÂËÁ(%d) db%d: %s\n" @@ -2897,70 +2897,70 @@ msgstr "ÏÔËÒÙ×ÅÔÓÑ ÆÁÊÌ %s ÂÁÚÙ ÄÁÎÎÙÈ × ÒÅÖÉÍÅ 0x%x\n" msgid "cannot get %s lock on database\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÂÌÏËÉÒÏ×ËÕ %s ÂÁÚÙ ÄÁÎÎÙÈ\n" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "exclusive" msgstr "ÉÓËÌÀÞÉÔÅÌØÎÙÊ" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "shared" msgstr "ÒÁÚÄÅÌÑÅÍÙÊ" -#: rpmdb/db3.c:129 +#: rpmdb/db3.c:127 #, c-format msgid "closed db environment %s/%s\n" msgstr "ÚÁËÒÙÔÏ ÏËÒÕÖÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n" -#: rpmdb/db3.c:147 +#: rpmdb/db3.c:145 #, c-format msgid "removed db environment %s/%s\n" msgstr "ÕÄÁÌÅÎÏ ÏËÒÕÖÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n" -#: rpmdb/db3.c:187 +#: rpmdb/db3.c:185 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÏËÒÕÖÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s %s\n" -#: rpmdb/db3.c:711 +#: rpmdb/db3.c:614 #, c-format msgid "closed db index %s/%s\n" msgstr "ÚÁËÒÙÔ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n" -#: rpmdb/db3.c:778 +#: rpmdb/db3.c:681 #, c-format msgid "verified db index %s/%s\n" msgstr "ÐÒÏ×ÅÒÅÎ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n" -#: rpmdb/db3.c:1001 +#: rpmdb/db3.c:903 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s %s mode=0x%x\n" -#: rpmdb/db3.c:1226 +#: rpmdb/db3.c:1119 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÂÌÏËÉÒÏ×ËÕ %s ÎÁ %s/%s\n" -#: rpmdb/db3.c:1232 +#: rpmdb/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "ÚÁÂÌÏËÉÒÏ×ÁÎ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n" -#: rpmdb/dbconfig.c:404 +#: rpmdb/dbconfig.c:400 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "ÎÅÏÐÏÚÎÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÂÁÚÙ ÄÁÎÎÙÈ: \"%s\" ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ\n" -#: rpmdb/dbconfig.c:442 +#: rpmdb/dbconfig.c:438 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "ÎÅ×ÅÒÎÏÅ ÞÉÓÌÏ×ÏÅ ÚÎÁÞÅÎÉÅ %s, ÐÒÏÐÕÝÅÎÏ\n" -#: rpmdb/dbconfig.c:451 +#: rpmdb/dbconfig.c:447 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s ÉÍÅÅÔ ÓÌÉÛËÏÍ ÍÁÌÕÀ ÉÌÉ ÓÌÉÛËÏÍ ÂÏÌØÛÕÀ ×ÅÌÉÞÉÎÕ long, ÐÒÏÐÕÝÅÎÏ\n" -#: rpmdb/dbconfig.c:460 +#: rpmdb/dbconfig.c:456 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3075,158 +3075,150 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "ÓÏÚÄÁÔØ ÚÁÇÏÌÏ×ËÉ, ÓÏ×ÍÅÓÔÉÍÙÅ Ó (ÕÓÔÁÒÅ×ÛÉÍÉ) ÐÁËÅÔÁÍÉ rpm[23]" #. @-modfilesys@ -#: rpmdb/rpmdb.c:163 +#: rpmdb/rpmdb.c:165 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: ÉÍÑ ËÌÀÞÁ \"%s\" ÎÅ ÉÚ×ÅÓÔÎÏ, ÉÇÎÏÒÉÒÕÅÔÓÑ\n" -#: rpmdb/rpmdb.c:440 +#: rpmdb/rpmdb.c:258 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÉÎÄÅËÓ %s ÉÓÐÏÌØÚÕÑ db%d - %s (%d)\n" -#: rpmdb/rpmdb.c:462 +#: rpmdb/rpmdb.c:280 #, c-format msgid "cannot open %s index\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÉÎÄÅËÓ %s\n" -#: rpmdb/rpmdb.c:554 +#: rpmdb/rpmdb.c:379 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "ÏÛÉÂËÁ(%d) ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s\n" -#: rpmdb/rpmdb.c:685 +#: rpmdb/rpmdb.c:516 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n" -#: rpmdb/rpmdb.c:695 +#: rpmdb/rpmdb.c:529 #, c-format msgid "error(%d) removing record %s from %s\n" msgstr "ÏÛÉÂËÁ(%d) ÕÄÁÌÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s\n" -#: rpmdb/rpmdb.c:954 +#: rpmdb/rpmdb.c:788 msgid "no dbpath has been set\n" msgstr "ÐÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" -#: rpmdb/rpmdb.c:1102 -msgid "" -"old format database is present; use --rebuilddb to generate a new format " -"database\n" -msgstr "" -"ÎÁÊÄÅÎÁ ÂÁÚÁ ÄÁÎÎÙÈ ÓÔÁÒÏÇÏ ÆÏÒÍÁÔÁ; ÉÓÐÏÌØÚÕÊÔÅ --rebuilddb ÄÌÑ ÇÅÎÅÒÁÃÉÉ " -"ÂÁÚÙ ÄÁÎÎÙÈ ÎÏ×ÏÇÏ ÆÏÒÍÁÔÁ\n" - #. error -#: rpmdb/rpmdb.c:1367 +#: rpmdb/rpmdb.c:1174 #, c-format msgid "error(%d) counting packages\n" msgstr "ÏÛÉÂËÁ(%d) ÐÒÉ ÐÏÄÓÞ£ÔÅ ÐÁËÅÔÏ×\n" -#: rpmdb/rpmdb.c:2146 rpmdb/rpmdb.c:3507 +#: rpmdb/rpmdb.c:1971 rpmdb/rpmdb.c:3357 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "ÚÁÐÉÓØ ÎÏÍÅÒ %u × ÂÁÚÅ ÄÁÎÎÙÈ ÎÅ×ÅÒÎÁ, ÐÒÏÐÕÓËÁÅÔÓÑ.\n" -#: rpmdb/rpmdb.c:2199 +#: rpmdb/rpmdb.c:2034 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "rpmdb: ÐÏÌÕÞÅÎ ÐÏ×ÒÅÖÄÅÎÎÙÊ ÚÁÇÏÌÏ×ÏË #%u, ÐÒÏÐÕÓËÁÅÔÓÑ.\n" -#: rpmdb/rpmdb.c:2478 +#: rpmdb/rpmdb.c:2306 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÅÓÔØ ÚÁÇÏÌÏ×ÏË × 0x%x\n" -#: rpmdb/rpmdb.c:2639 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "ÕÄÁÌÑÅÔÓÑ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s.\n" -#: rpmdb/rpmdb.c:2643 +#: rpmdb/rpmdb.c:2476 #, c-format msgid "removing %d entries from %s index.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ ÉÚ ÉÎÄÅËÓÁ %s.\n" -#: rpmdb/rpmdb.c:2813 +#: rpmdb/rpmdb.c:2663 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "ÏÛÉÂËÁ(%d) ÒÅÚÅÒ×ÉÒÏ×ÁÎÉÑ ÐÁÍÑÔÉ ÄÌÑ ÏÂÒÁÚÁ ÎÏ×ÏÇÏ ÐÁËÅÔÁ\n" -#: rpmdb/rpmdb.c:3008 +#: rpmdb/rpmdb.c:2858 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ \"%s\" × ÉÎÄÅËÓ %s.\n" -#: rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:2862 #, c-format msgid "adding %d entries to %s index.\n" msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ × ÉÎÄÅËÓ %s\n" -#: rpmdb/rpmdb.c:3393 +#: rpmdb/rpmdb.c:3243 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s ÐÏÓÌÅ ÕÓÐÅÛÎÏÇÏ ÚÁ×ÅÒÛÅÎÉÑ ÐÅÒÅÉÎÄÅËÁÃÉÉ ÂÁÚÙ × db3.\n" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3276 msgid "no dbpath has been set" msgstr "ÐÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: rpmdb/rpmdb.c:3453 +#: rpmdb/rpmdb.c:3303 #, c-format msgid "rebuilding database %s into %s\n" msgstr "ÐÅÒÅÓÔÒÁÉ×ÁÅÔÓÑ ÂÁÚÁ ÄÁÎÎÙÈ %s × %s\n" -#: rpmdb/rpmdb.c:3457 +#: rpmdb/rpmdb.c:3307 #, c-format msgid "temporary database %s already exists\n" msgstr "×ÒÅÍÅÎÎÁÑ ÂÁÚÁ ÄÁÎÎÙÈ %s ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ\n" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3313 #, c-format msgid "creating directory %s\n" msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3315 #, c-format msgid "creating directory %s: %s\n" msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s: %s\n" -#: rpmdb/rpmdb.c:3472 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "opening old database with dbapi %d\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n" -#: rpmdb/rpmdb.c:3483 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "opening new database with dbapi %d\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÎÏ×ÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n" -#: rpmdb/rpmdb.c:3547 +#: rpmdb/rpmdb.c:3397 #, c-format msgid "cannot add record originally at %u\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÚÁÐÉÓØ (ÐÅÒ×ÏÎÁÞÁÌØÎÏ × %u)\n" -#: rpmdb/rpmdb.c:3565 +#: rpmdb/rpmdb.c:3415 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "ÐÅÒÅÓÔÒÏÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÎÅ ÕÄÁÌÏÓØ, ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÏÓÔÁÅÔÓÑ ÎÁ ÍÅÓÔÅ\n" -#: rpmdb/rpmdb.c:3573 +#: rpmdb/rpmdb.c:3423 msgid "failed to replace old database with new database!\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÍÅÎÉÔØ ÓÔÁÒÕÀ ÂÁÚÕ ÄÁÎÎÙÈ ÎÁ ÎÏ×ÕÀ!\n" -#: rpmdb/rpmdb.c:3575 +#: rpmdb/rpmdb.c:3425 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "ÆÁÊÌÙ × %s ÚÁÍÅÎÑÀÔÓÑ ÆÁÊÌÁÍÉ ÉÚ %s ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ" -#: rpmdb/rpmdb.c:3585 +#: rpmdb/rpmdb.c:3435 #, c-format msgid "removing directory %s\n" msgstr "ÕÄÁÌÑÅÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: rpmdb/rpmdb.c:3587 +#: rpmdb/rpmdb.c:3437 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s\n" @@ -3438,6 +3430,13 @@ msgstr "url ÐÏÒÔ ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏÍ\n" msgid "failed to create %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n" +#~ msgid "" +#~ "old format database is present; use --rebuilddb to generate a new format " +#~ "database\n" +#~ msgstr "" +#~ "ÎÁÊÄÅÎÁ ÂÁÚÁ ÄÁÎÎÙÈ ÓÔÁÒÏÇÏ ÆÏÒÍÁÔÁ; ÉÓÐÏÌØÚÕÊÔÅ --rebuilddb ÄÌÑ " +#~ "ÇÅÎÅÒÁÃÉÉ ÂÁÚÙ ÄÁÎÎÙÈ ÎÏ×ÏÇÏ ÆÏÒÍÁÔÁ\n" + #, fuzzy #~ msgid "don't verify signature(s)" #~ msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÐÕÔØ ÓÉÍ×ÏÌÉÞÅÓËÉÈ ÓÓÙÌÏË" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-14 17:43-0400\n" +"POT-Creation-Date: 2002-05-01 18:05-0400\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n" "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n" @@ -115,7 +115,7 @@ msgstr "" msgid "use <dir> as the top level directory" msgstr "pou¾i» <adresár> ako adresár najvy¹¹ej úrovne" -#: rpmqv.c:125 lib/poptI.c:219 +#: rpmqv.c:125 lib/poptI.c:215 msgid "<dir>" msgstr "" @@ -1469,77 +1469,77 @@ msgstr " zlyhalo - " msgid "package %s was already added, replacing with %s\n" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/depends.c:367 +#: lib/depends.c:380 msgid "(cached)" msgstr "" -#: lib/depends.c:392 +#: lib/depends.c:405 #, fuzzy msgid "(rpmrc provides)" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:408 +#: lib/depends.c:421 #, fuzzy msgid "(rpmlib provides)" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:429 +#: lib/depends.c:442 #, fuzzy msgid "(db files)" msgstr "chybný stav súboru: %s" -#: lib/depends.c:441 +#: lib/depends.c:454 #, fuzzy msgid "(db provides)" msgstr "Poskytuje:" -#: lib/depends.c:454 +#: lib/depends.c:467 #, fuzzy msgid "(db package)" msgstr "nájdených %d balíkov\n" -#: lib/depends.c:762 +#: lib/depends.c:783 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:903 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstraòuje sa index skupín\n" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1171 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1277 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1370 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1440 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1475 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1480 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2978 rpmdb/header.c:2999 rpmdb/header.c:3021 +#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 msgid "(not a number)" msgstr "(nie je èíslo)" @@ -1677,37 +1677,37 @@ msgstr "" msgid "%s: Fread failed: %s\n" msgstr "%s: readLead zlyhalo\n" -#: lib/poptI.c:53 +#: lib/poptI.c:49 msgid "exclude paths must begin with a /" msgstr "vynechané cesty musia zaèína» znakom /" -#: lib/poptI.c:65 +#: lib/poptI.c:61 msgid "relocations must begin with a /" msgstr "presunutia musia zaèína» znakom /" -#: lib/poptI.c:67 +#: lib/poptI.c:63 msgid "relocations must contain a =" msgstr "presunutia musia obsahova» znak =" -#: lib/poptI.c:70 +#: lib/poptI.c:66 msgid "relocations must have a / following the =" msgstr "presunutia musia ma» za znakom = znak /" -#: lib/poptI.c:84 +#: lib/poptI.c:80 msgid "rollback takes a time/date stamp argument" msgstr "" -#: lib/poptI.c:91 +#: lib/poptI.c:87 msgid "malformed rollback time/date stamp argument" msgstr "" -#: lib/poptI.c:110 +#: lib/poptI.c:106 msgid "install all files, even configurations which might otherwise be skipped" msgstr "" "in¹talova» v¹etky súbory vrátane konfiguraèných súborov, ktoré by inak mohli " "by» vynechané" -#: lib/poptI.c:114 +#: lib/poptI.c:110 msgid "" "remove all packages which match <package> (normally an error is generated if " "<package> specified multiple packages)" @@ -1715,153 +1715,153 @@ msgstr "" "odin¹talova» v¹etky balíky urèené <balíkom> (inak je chybou, pokiaµ <balík> " "¹pecifikuje viac ako jeden balík)" -#: lib/poptI.c:120 lib/poptI.c:175 +#: lib/poptI.c:116 lib/poptI.c:171 #, fuzzy msgid "do not execute package scriptlet(s)" msgstr "nevykona» ¾iadne skripty ¹pecifikované balíkom" -#: lib/poptI.c:124 +#: lib/poptI.c:120 #, fuzzy msgid "relocate files in non-relocateable package" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/poptI.c:127 +#: lib/poptI.c:123 msgid "save erased package files by renaming into sub-directory" msgstr "" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "erase (uninstall) package" msgstr "odin¹talova» balík" -#: lib/poptI.c:130 +#: lib/poptI.c:126 #, fuzzy msgid "<package>+" msgstr "nájdených %d balíkov\n" -#: lib/poptI.c:133 +#: lib/poptI.c:129 msgid "do not install documentation" msgstr "nein¹talova» dokumentáciu" -#: lib/poptI.c:135 +#: lib/poptI.c:131 #, fuzzy msgid "skip files with leading component <path> " msgstr "vynecha» súbory v ceste <cesta>" -#: lib/poptI.c:136 +#: lib/poptI.c:132 msgid "<path>" msgstr "" -#: lib/poptI.c:139 +#: lib/poptI.c:135 msgid "short hand for --replacepkgs --replacefiles" msgstr "skratka pre --replacepkgs --replacefiles" -#: lib/poptI.c:142 +#: lib/poptI.c:138 #, fuzzy msgid "upgrade package(s) if already installed" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 +#: lib/poptI.c:139 lib/poptI.c:155 lib/poptI.c:236 #, fuzzy msgid "<packagefile>+" msgstr " -p <súbor_balíku>+" -#: lib/poptI.c:145 +#: lib/poptI.c:141 msgid "print hash marks as package installs (good with -v)" msgstr "vypisova» znaèky poèas in¹talácie balíka (vhodné s -v)" -#: lib/poptI.c:148 +#: lib/poptI.c:144 msgid "don't verify package architecture" msgstr "neoverova» architektúru balíka" -#: lib/poptI.c:151 +#: lib/poptI.c:147 msgid "don't verify package operating system" msgstr "neoverova» operaèný systém balíka" -#: lib/poptI.c:154 +#: lib/poptI.c:150 msgid "don't check disk space before installing" msgstr "pred in¹taláciou nekontrolova» dostupné miesto na disku" -#: lib/poptI.c:156 +#: lib/poptI.c:152 msgid "install documentation" msgstr "in¹talova» dokumentáciu" -#: lib/poptI.c:159 +#: lib/poptI.c:155 #, fuzzy msgid "install package(s)" msgstr "in¹talova» balík" -#: lib/poptI.c:161 +#: lib/poptI.c:157 msgid "update the database, but do not modify the filesystem" msgstr "aktualizova» databázu bez zmeny súborového systému" -#: lib/poptI.c:163 +#: lib/poptI.c:159 msgid "do not verify package dependencies" msgstr "neoverova» závislosti balíka" -#: lib/poptI.c:166 +#: lib/poptI.c:162 msgid "do not reorder package installation to satisfy dependencies" msgstr "nemeni» poradie balíkov kvôli vyrie¹eniu závislostí" -#: lib/poptI.c:171 +#: lib/poptI.c:167 msgid "do not suggest missing dependency resolution(s)" msgstr "" -#: lib/poptI.c:178 +#: lib/poptI.c:174 #, fuzzy, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "nevykona» ¾iadne etapy" -#: lib/poptI.c:181 +#: lib/poptI.c:177 #, fuzzy, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "nevykona» ¾iadne etapy" -#: lib/poptI.c:184 +#: lib/poptI.c:180 #, fuzzy, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "nevykona» ¾iadne etapy" -#: lib/poptI.c:187 +#: lib/poptI.c:183 #, fuzzy, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "nevykona» ¾iadne etapy" -#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy msgid "don't verify package digest(s)" msgstr "zobrazi» súbory v balíku" -#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy msgid "don't verify package signature(s)" msgstr "overi» podpis balíka" -#: lib/poptI.c:196 +#: lib/poptI.c:192 #, fuzzy msgid "do not execute any scriptlet(s) triggered by this package" msgstr "nevykona» ¾iadne skripty spú¹»ané týmto balíkom" -#: lib/poptI.c:199 +#: lib/poptI.c:195 #, fuzzy, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "nevykona» ¾iadne skripty ¹pecifikované balíkom" -#: lib/poptI.c:202 +#: lib/poptI.c:198 #, fuzzy, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "nevykona» ¾iadne in¹talaèné skripty" -#: lib/poptI.c:205 +#: lib/poptI.c:201 #, fuzzy, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "nevykona» ¾iadne in¹talaèné skripty" -#: lib/poptI.c:208 +#: lib/poptI.c:204 #, fuzzy, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "nevykona» ¾iadne in¹talaèné skripty" -#: lib/poptI.c:212 +#: lib/poptI.c:208 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1869,49 +1869,49 @@ msgstr "" "aktualizova» na star¹iu verziu balíka (--force to pri aktualizácii urobí " "automaticky)" -#: lib/poptI.c:216 +#: lib/poptI.c:212 msgid "print percentages as package installs" msgstr "vypisova» percentá poèas in¹talácie balíka" -#: lib/poptI.c:218 +#: lib/poptI.c:214 msgid "relocate the package to <dir>, if relocatable" msgstr "presunú» balík do <adresára>, pokiaµ to balík povoµuje" -#: lib/poptI.c:221 +#: lib/poptI.c:217 #, fuzzy msgid "relocate files from path <old> to <new>" msgstr "presunú» súbory zo <starej_cesty> do <novej_cesty>" -#: lib/poptI.c:222 +#: lib/poptI.c:218 #, fuzzy msgid "<old>=<new>" msgstr " --relocate <stará_cesta>=<nová_cesta>" -#: lib/poptI.c:225 +#: lib/poptI.c:221 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:228 +#: lib/poptI.c:224 msgid "install even if the package replaces installed files" msgstr "in¹talova» aj pokiaµ balík prepí¹e in¹talované súbory" -#: lib/poptI.c:231 +#: lib/poptI.c:227 msgid "reinstall if the package is already present" msgstr "prein¹talova», pokiaµ u¾ balík existuje" -#: lib/poptI.c:233 +#: lib/poptI.c:229 msgid "deinstall new, reinstall old, package(s), back to <date>" msgstr "" -#: lib/poptI.c:234 +#: lib/poptI.c:230 msgid "<date>" msgstr "" -#: lib/poptI.c:236 +#: lib/poptI.c:232 msgid "don't install, but tell if it would work or not" msgstr "nein¹talova», ale oznámi», èi by to bolo mo¾né" -#: lib/poptI.c:239 +#: lib/poptI.c:235 #, fuzzy msgid "upgrade package(s)" msgstr " --upgrade <súbor_balíka>" @@ -2329,97 +2329,97 @@ msgstr "(¾iadny stav) " msgid "package has neither file owner or id lists\n" msgstr "balík neobsahuje ani vlastníka súboru, ani zoznamy identifikácií" -#: lib/query.c:463 +#: lib/query.c:464 #, fuzzy, c-format msgid "can't query %s: %s\n" msgstr "zmazanie %s zlyhalo: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/query.c:618 lib/query.c:656 lib/rpminstall.c:352 lib/rpminstall.c:494 #: lib/rpminstall.c:887 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "otvorenie %s zlyhalo\n" -#: lib/query.c:633 +#: lib/query.c:634 #, c-format msgid "query of %s failed\n" msgstr "otázka na %s zlyhala\n" -#: lib/query.c:639 +#: lib/query.c:640 msgid "old format source packages cannot be queried\n" msgstr "nie je mo¾né pýta» sa zdrojových balíkov v starom formáte\n" -#: lib/query.c:665 lib/rpminstall.c:507 +#: lib/query.c:666 lib/rpminstall.c:507 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: readLead zlyhalo\n" -#: lib/query.c:709 +#: lib/query.c:710 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "otázka na spec-súbor %s zlyhala, nie je mo¾né analyzova»\n" -#: lib/query.c:730 +#: lib/query.c:731 #, fuzzy msgid "no packages\n" msgstr "nájdených %d balíkov\n" -#: lib/query.c:750 +#: lib/query.c:751 #, c-format msgid "group %s does not contain any packages\n" msgstr "skupina %s neobsahuje ¾iadne balíky\n" -#: lib/query.c:760 +#: lib/query.c:761 #, c-format msgid "no package triggers %s\n" msgstr "¾iadny z balíkov nespú¹»a %s\n" -#: lib/query.c:774 lib/query.c:796 lib/query.c:817 lib/query.c:852 +#: lib/query.c:775 lib/query.c:797 lib/query.c:818 lib/query.c:853 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "Nie je mo¾né preèíta» %s: %s." -#: lib/query.c:784 lib/query.c:802 lib/query.c:827 lib/query.c:857 +#: lib/query.c:785 lib/query.c:803 lib/query.c:828 lib/query.c:858 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "¾iadny z balíkov nespú¹»a %s\n" -#: lib/query.c:868 +#: lib/query.c:869 #, c-format msgid "no package requires %s\n" msgstr "¾iadny z balíkov nevy¾aduje %s\n" -#: lib/query.c:879 +#: lib/query.c:880 #, c-format msgid "no package provides %s\n" msgstr "¾iadny z balíkov neposkytuje %s\n" -#: lib/query.c:913 +#: lib/query.c:914 #, c-format msgid "file %s: %s\n" msgstr "súbor %s: %s\n" -#: lib/query.c:917 +#: lib/query.c:918 #, c-format msgid "file %s is not owned by any package\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/query.c:944 +#: lib/query.c:945 #, c-format msgid "invalid package number: %s\n" msgstr "chybné èíslo balíku: %s\n" -#: lib/query.c:947 +#: lib/query.c:948 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "po¾aduje sa záznam èíslo %d\n" -#: lib/query.c:952 +#: lib/query.c:953 #, fuzzy, c-format msgid "record %u could not be read\n" msgstr "záznam %d nie je mo¾né preèíta»\n" -#: lib/query.c:963 lib/rpminstall.c:675 +#: lib/query.c:964 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "balík %s nie je nain¹talovaný\n" @@ -2729,146 +2729,146 @@ msgstr "Nie je mo¾né otvori» %s pre èítanie: %s." msgid "cannot open Packages database in %s\n" msgstr "nie je mo¾né otvori» %s/packages.rpm\n" -#: lib/signature.c:123 +#: lib/signature.c:124 msgid "file is not regular -- skipping size check\n" msgstr "nejde o be¾ný súbor - kontrola veµkosti vynechaná\n" -#: lib/signature.c:132 +#: lib/signature.c:142 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:137 +#: lib/signature.c:147 #, fuzzy, c-format msgid " Actual size: %12d\n" msgstr "Veµkos» podpisu: %d\n" -#: lib/signature.c:157 +#: lib/signature.c:167 msgid "No signature\n" msgstr "Podpis nie je k dispozícii\n" -#: lib/signature.c:161 +#: lib/signature.c:171 msgid "Old PGP signature\n" msgstr "Starý PGP podpis\n" -#: lib/signature.c:172 +#: lib/signature.c:182 #, fuzzy msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "Starý (iba interný) podpis! Ako ste sa k tomu dostali?!" -#: lib/signature.c:226 +#: lib/signature.c:232 #, fuzzy, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "Veµkos» podpisu: %d\n" -#: lib/signature.c:305 lib/signature.c:402 lib/signature.c:669 -#: lib/signature.c:702 +#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675 +#: lib/signature.c:708 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Nie je mo¾né spusti» %s" -#: lib/signature.c:321 +#: lib/signature.c:327 #, fuzzy msgid "pgp failed\n" msgstr "pgp zlyhalo" #. PGP failed to write signature #. Just in case -#: lib/signature.c:328 +#: lib/signature.c:334 #, fuzzy msgid "pgp failed to write signature\n" msgstr "pgp sa nepodarilo zapísa» podpis" -#: lib/signature.c:333 +#: lib/signature.c:339 #, c-format msgid "PGP sig size: %d\n" msgstr "Veµkos» PGP podpisu: %d\n" -#: lib/signature.c:347 lib/signature.c:445 +#: lib/signature.c:353 lib/signature.c:451 #, fuzzy msgid "unable to read the signature\n" msgstr "nie je mo¾né preèíta» podpis" -#: lib/signature.c:352 +#: lib/signature.c:358 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "Preèítaný PGP podpis obsahuje %d bajtov\n" -#: lib/signature.c:419 +#: lib/signature.c:425 #, fuzzy msgid "gpg failed\n" msgstr "gpg zlyhalo" #. GPG failed to write signature #. Just in case -#: lib/signature.c:426 +#: lib/signature.c:432 #, fuzzy msgid "gpg failed to write signature\n" msgstr "gpg sa nepodarilo zapísa» podpis" -#: lib/signature.c:431 +#: lib/signature.c:437 #, c-format msgid "GPG sig size: %d\n" msgstr "Veµkos» GPG podpisu: %d\n" -#: lib/signature.c:450 +#: lib/signature.c:456 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "Preèítaný GPG podpis obsahuje %d bajtov\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:707 lib/signature.c:758 +#: lib/signature.c:713 lib/signature.c:764 #, fuzzy, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "Chybná ¹pecifikácia %%_signature v makro-súbore.\n" -#: lib/signature.c:737 +#: lib/signature.c:743 #, fuzzy, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "Musíte nastavi» \"%%gpg_name\" vo va¹om makro-súbore" -#: lib/signature.c:750 +#: lib/signature.c:756 #, fuzzy, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "Musíte nastavi» \"%%pgp_name\" vo va¹om makro-súbore" -#: lib/signature.c:794 +#: lib/signature.c:800 #, fuzzy msgid "Header+Payload size: " msgstr "Priveµká hlavièka" -#: lib/signature.c:830 +#: lib/signature.c:836 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:879 +#: lib/signature.c:885 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1066 +#: lib/signature.c:1072 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "vynecha» akékoµvek MD5 podpisy" -#: lib/signature.c:1176 +#: lib/signature.c:1182 msgid "Header " msgstr "" -#: lib/signature.c:1177 +#: lib/signature.c:1183 #, fuzzy msgid "V3 DSA signature: " msgstr "Podpis nie je k dispozícii\n" -#: lib/signature.c:1252 +#: lib/signature.c:1258 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1279 +#: lib/signature.c:1285 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1283 +#: lib/signature.c:1289 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Doplnenie podpisu: %d\n" @@ -2903,12 +2903,12 @@ msgstr "Nevyrie¹ené závislosti pre %s-%s-%s: " msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:100 +#: rpmdb/db1.c:98 rpmdb/db3.c:98 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:103 +#: rpmdb/db1.c:101 rpmdb/db3.c:101 #, c-format msgid "db%d error(%d): %s\n" msgstr "" @@ -2951,70 +2951,70 @@ msgstr "otvára sa databáza s právami 0x%x v %s\n" msgid "cannot get %s lock on database\n" msgstr "nie je mo¾né získa» %s zámok pre databázu" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "exclusive" msgstr "výhradný" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "shared" msgstr "zdieµaný" -#: rpmdb/db3.c:129 +#: rpmdb/db3.c:127 #, fuzzy, c-format msgid "closed db environment %s/%s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: rpmdb/db3.c:147 +#: rpmdb/db3.c:145 #, fuzzy, c-format msgid "removed db environment %s/%s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: rpmdb/db3.c:187 +#: rpmdb/db3.c:185 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: rpmdb/db3.c:711 +#: rpmdb/db3.c:614 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: rpmdb/db3.c:778 +#: rpmdb/db3.c:681 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: rpmdb/db3.c:1001 +#: rpmdb/db3.c:903 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "otvára sa databáza s právami 0x%x v %s\n" -#: rpmdb/db3.c:1226 +#: rpmdb/db3.c:1119 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "nie je mo¾né získa» %s zámok pre databázu" -#: rpmdb/db3.c:1232 +#: rpmdb/db3.c:1125 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: rpmdb/dbconfig.c:404 +#: rpmdb/dbconfig.c:400 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:442 +#: rpmdb/dbconfig.c:438 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:451 +#: rpmdb/dbconfig.c:447 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:460 +#: rpmdb/dbconfig.c:456 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3125,160 +3125,151 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:163 +#: rpmdb/rpmdb.c:165 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:440 +#: rpmdb/rpmdb.c:258 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "nie je mo¾né otvori» %s na %s:%d" -#: rpmdb/rpmdb.c:462 +#: rpmdb/rpmdb.c:280 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "nie je mo¾né otvori» %s\n" -#: rpmdb/rpmdb.c:554 +#: rpmdb/rpmdb.c:379 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "chyba pri naèítaní záznamu %s z %s" -#: rpmdb/rpmdb.c:685 +#: rpmdb/rpmdb.c:516 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "chyba pri zápise záznamu %s do %s" -#: rpmdb/rpmdb.c:695 +#: rpmdb/rpmdb.c:529 #, fuzzy, c-format msgid "error(%d) removing record %s from %s\n" msgstr "chyba pri odstraòovaní záznamu %s z %s" -#: rpmdb/rpmdb.c:954 +#: rpmdb/rpmdb.c:788 #, fuzzy msgid "no dbpath has been set\n" msgstr "nebola nastavená ¾iadna dbpath" -#: rpmdb/rpmdb.c:1102 -#, fuzzy -msgid "" -"old format database is present; use --rebuilddb to generate a new format " -"database\n" -msgstr "" -"existuje databáza v starom formáte; pou¾ite --rebuilddb pre vytvorenie " -"databázy v novom formáte" - #. error -#: rpmdb/rpmdb.c:1367 +#: rpmdb/rpmdb.c:1174 #, fuzzy, c-format msgid "error(%d) counting packages\n" msgstr "chyba pri hµadaní balíka %s\n" -#: rpmdb/rpmdb.c:2146 rpmdb/rpmdb.c:3507 +#: rpmdb/rpmdb.c:1971 rpmdb/rpmdb.c:3357 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "záznam èíslo %d v databáze je chybný -- bol vynechaný" -#: rpmdb/rpmdb.c:2199 +#: rpmdb/rpmdb.c:2034 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2478 +#: rpmdb/rpmdb.c:2306 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "nie je mo¾né preèíta» hlavièku na %d pre vyhµadanie" -#: rpmdb/rpmdb.c:2639 +#: rpmdb/rpmdb.c:2472 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstraòuje sa index skupín\n" -#: rpmdb/rpmdb.c:2643 +#: rpmdb/rpmdb.c:2476 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "odstraòuje sa index názvov\n" -#: rpmdb/rpmdb.c:2813 +#: rpmdb/rpmdb.c:2663 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "chyba pri hµadaní balíka %s\n" -#: rpmdb/rpmdb.c:3008 +#: rpmdb/rpmdb.c:2858 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "premenováva sa %s na %s\n" -#: rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:2862 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "premenováva sa %s na %s\n" -#: rpmdb/rpmdb.c:3393 +#: rpmdb/rpmdb.c:3243 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3276 msgid "no dbpath has been set" msgstr "nebola nastavená ¾iadna dbpath" -#: rpmdb/rpmdb.c:3453 +#: rpmdb/rpmdb.c:3303 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "znovu sa vytvára databáza v adresári %s\n" -#: rpmdb/rpmdb.c:3457 +#: rpmdb/rpmdb.c:3307 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "doèasná databáza %s u¾ existuje" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3313 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3315 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3472 +#: rpmdb/rpmdb.c:3322 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "otvára sa stará databáza\n" -#: rpmdb/rpmdb.c:3483 +#: rpmdb/rpmdb.c:3333 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "otvára sa nová databáza\n" -#: rpmdb/rpmdb.c:3547 +#: rpmdb/rpmdb.c:3397 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "nie je mo¾né prida» záznam pôvodne na %d" -#: rpmdb/rpmdb.c:3565 +#: rpmdb/rpmdb.c:3415 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "nepodarilo sa znovu vytvori» databázu; zostáva pôvodná\n" -#: rpmdb/rpmdb.c:3573 +#: rpmdb/rpmdb.c:3423 msgid "failed to replace old database with new database!\n" msgstr "nepodarilo sa nahradi» starú databázu novou!\n" -#: rpmdb/rpmdb.c:3575 +#: rpmdb/rpmdb.c:3425 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "nahradí súbory v %s súbormi z %s kvôli obnove" -#: rpmdb/rpmdb.c:3585 +#: rpmdb/rpmdb.c:3435 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3587 +#: rpmdb/rpmdb.c:3437 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "nepodarilo sa odstráni» adresár %s: %s\n" @@ -3495,6 +3486,14 @@ msgid "failed to create %s: %s\n" msgstr "nepodarilo sa vytvori» %s\n" #, fuzzy +#~ msgid "" +#~ "old format database is present; use --rebuilddb to generate a new format " +#~ "database\n" +#~ msgstr "" +#~ "existuje databáza v starom formáte; pou¾ite --rebuilddb pre vytvorenie " +#~ "databázy v novom formáte" + +#, fuzzy #~ msgid "don't verify signature(s)" #~ msgstr "zobrazi» súbory v balíku" @@ -1,12 +1,12 @@ # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr. # Copyright (C) 2000 Free Software Foundation, Inc. # Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000. -# $Id: sl.po,v 1.239 2002/04/14 21:49:28 jbj Exp $ +# $Id: sl.po,v 1.240 2002/05/01 22:13:09 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-14 17:43-0400\n" +"POT-Creation-Date: 2002-05-01 18:05-0400\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -120,7 +120,7 @@ msgstr "" msgid "use <dir> as the top level directory" msgstr "uporabi <imenik> za korenski imenik" -#: rpmqv.c:125 lib/poptI.c:219 +#: rpmqv.c:125 lib/poptI.c:215 msgid "<dir>" msgstr "" @@ -1471,77 +1471,77 @@ msgstr " neuspe¹no - " msgid "package %s was already added, replacing with %s\n" msgstr "paket %s-%s-%s je ¾e name¹èen" -#: lib/depends.c:367 +#: lib/depends.c:380 msgid "(cached)" msgstr "" -#: lib/depends.c:392 +#: lib/depends.c:405 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s DA (rpmrc ponudbe)\n" -#: lib/depends.c:408 +#: lib/depends.c:421 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s DA (rpmlib ponudbe)\n" -#: lib/depends.c:429 +#: lib/depends.c:442 #, fuzzy msgid "(db files)" msgstr "po¹kodovana zbirka podatkov %s" -#: lib/depends.c:441 +#: lib/depends.c:454 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s DA (db ponudbe)\n" -#: lib/depends.c:454 +#: lib/depends.c:467 #, fuzzy msgid "(db package)" msgstr "ni paketov\n" -#: lib/depends.c:762 +#: lib/depends.c:783 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:903 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstranjujemo seznam skupin\n" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1171 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1277 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1370 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1440 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1475 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1480 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2978 rpmdb/header.c:2999 rpmdb/header.c:3021 +#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 msgid "(not a number)" msgstr "(ni ¹tevilo)" @@ -1679,36 +1679,36 @@ msgstr "" msgid "%s: Fread failed: %s\n" msgstr "%s: branje Fread je bilo neuspe¹no: %s\n" -#: lib/poptI.c:53 +#: lib/poptI.c:49 msgid "exclude paths must begin with a /" msgstr "poti, ki niso obdelane, se morajo zaèeti z /" -#: lib/poptI.c:65 +#: lib/poptI.c:61 msgid "relocations must begin with a /" msgstr "premikanja se morajo zaèeti z /" -#: lib/poptI.c:67 +#: lib/poptI.c:63 msgid "relocations must contain a =" msgstr "premikanja morajo vsebovati =" -#: lib/poptI.c:70 +#: lib/poptI.c:66 msgid "relocations must have a / following the =" msgstr "premikanja morajo imeti /, ki mu sledi =" -#: lib/poptI.c:84 +#: lib/poptI.c:80 msgid "rollback takes a time/date stamp argument" msgstr "" -#: lib/poptI.c:91 +#: lib/poptI.c:87 msgid "malformed rollback time/date stamp argument" msgstr "" -#: lib/poptI.c:110 +#: lib/poptI.c:106 msgid "install all files, even configurations which might otherwise be skipped" msgstr "" "namestitev vseh datotek, vkljuèno z nastavitvenimi, ki so sicer izpu¹èene" -#: lib/poptI.c:114 +#: lib/poptI.c:110 msgid "" "remove all packages which match <package> (normally an error is generated if " "<package> specified multiple packages)" @@ -1716,153 +1716,153 @@ msgstr "" "odstrani vse pakete, ki vsebujejo vzorec <paket> (sicer program izide z " "napako, èe paket <paket> doloèa veè paketov)" -#: lib/poptI.c:120 lib/poptI.c:175 +#: lib/poptI.c:116 lib/poptI.c:171 #, fuzzy msgid "do not execute package scriptlet(s)" msgstr "brez izvajanja skriptov paketa" -#: lib/poptI.c:124 +#: lib/poptI.c:120 msgid "relocate files in non-relocateable package" msgstr "" -#: lib/poptI.c:127 +#: lib/poptI.c:123 msgid "save erased package files by renaming into sub-directory" msgstr "" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "erase (uninstall) package" msgstr "izbri¹i (odstrani) paket" -#: lib/poptI.c:130 +#: lib/poptI.c:126 #, fuzzy msgid "<package>+" msgstr "ni paketov\n" -#: lib/poptI.c:133 +#: lib/poptI.c:129 msgid "do not install documentation" msgstr "brez namestitve dokumentacije" -#: lib/poptI.c:135 +#: lib/poptI.c:131 #, fuzzy msgid "skip files with leading component <path> " msgstr "preskok datotek v navedeni poti" -#: lib/poptI.c:136 +#: lib/poptI.c:132 msgid "<path>" msgstr "" -#: lib/poptI.c:139 +#: lib/poptI.c:135 msgid "short hand for --replacepkgs --replacefiles" msgstr "okraj¹ava za --replacepkgs --replacefiles" -#: lib/poptI.c:142 +#: lib/poptI.c:138 #, fuzzy msgid "upgrade package(s) if already installed" msgstr "paket %s-%s-%s je ¾e name¹èen" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 +#: lib/poptI.c:139 lib/poptI.c:155 lib/poptI.c:236 #, fuzzy msgid "<packagefile>+" msgstr " -p <paket>+ " -#: lib/poptI.c:145 +#: lib/poptI.c:141 msgid "print hash marks as package installs (good with -v)" msgstr "z izpisom znakov # ob namestitvi (uporabno z -v)" -#: lib/poptI.c:148 +#: lib/poptI.c:144 msgid "don't verify package architecture" msgstr "brez preverjanja arhitekture paketa" -#: lib/poptI.c:151 +#: lib/poptI.c:147 msgid "don't verify package operating system" msgstr "brez preverjanja operacijskega sistema paketa" -#: lib/poptI.c:154 +#: lib/poptI.c:150 msgid "don't check disk space before installing" msgstr "brez preverjanja prostora na disku pred name¹èanjem" -#: lib/poptI.c:156 +#: lib/poptI.c:152 msgid "install documentation" msgstr "namesti dokumentacijo" -#: lib/poptI.c:159 +#: lib/poptI.c:155 #, fuzzy msgid "install package(s)" msgstr "name¹èanje paketa" -#: lib/poptI.c:161 +#: lib/poptI.c:157 msgid "update the database, but do not modify the filesystem" msgstr "obnovi podatkovno zbirko, a ne spreminjaj datoteènega sistema" -#: lib/poptI.c:163 +#: lib/poptI.c:159 msgid "do not verify package dependencies" msgstr "brez preverjanja soodvisnosti paketa" -#: lib/poptI.c:166 +#: lib/poptI.c:162 msgid "do not reorder package installation to satisfy dependencies" msgstr "" "brez spreminjanja vrstnega reda paketov z namenom zadovoljevanja soodvisnosti" -#: lib/poptI.c:171 +#: lib/poptI.c:167 msgid "do not suggest missing dependency resolution(s)" msgstr "" -#: lib/poptI.c:178 +#: lib/poptI.c:174 #, fuzzy, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "brez izvajanja katerekoli stopen izgradnje" -#: lib/poptI.c:181 +#: lib/poptI.c:177 #, fuzzy, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "brez izvajanja katerekoli stopen izgradnje" -#: lib/poptI.c:184 +#: lib/poptI.c:180 #, fuzzy, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "brez izvajanja katerekoli stopen izgradnje" -#: lib/poptI.c:187 +#: lib/poptI.c:183 #, fuzzy, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "brez izvajanja katerekoli stopen izgradnje" -#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy msgid "don't verify package digest(s)" msgstr "brez preverjanja datotek v paketu" -#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy msgid "don't verify package signature(s)" msgstr "preveri podpis paketa(-ov)" -#: lib/poptI.c:196 +#: lib/poptI.c:192 #, fuzzy msgid "do not execute any scriptlet(s) triggered by this package" msgstr "brez izvajanja katerihkoli skriptov, ki jih po¾ene ta paket" -#: lib/poptI.c:199 +#: lib/poptI.c:195 #, fuzzy, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "brez izvajanja skriptov paketa" -#: lib/poptI.c:202 +#: lib/poptI.c:198 #, fuzzy, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "brez izvajanja namestitvenih skriptov" -#: lib/poptI.c:205 +#: lib/poptI.c:201 #, fuzzy, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "brez izvajanja namestitvenih skriptov" -#: lib/poptI.c:208 +#: lib/poptI.c:204 #, fuzzy, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "brez izvajanja namestitvenih skriptov" -#: lib/poptI.c:212 +#: lib/poptI.c:208 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1870,49 +1870,49 @@ msgstr "" "nadgraditev na starej¹o razlièico paketa (--force pri nadgradnjah " "avtomatièno vkljuèi to izbiro)" -#: lib/poptI.c:216 +#: lib/poptI.c:212 msgid "print percentages as package installs" msgstr "izpis odstotkov med namestitvijo" -#: lib/poptI.c:218 +#: lib/poptI.c:214 msgid "relocate the package to <dir>, if relocatable" msgstr "èe je mogoèe, bo paket prestavljen v imenik <imenik>" -#: lib/poptI.c:221 +#: lib/poptI.c:217 #, fuzzy msgid "relocate files from path <old> to <new>" msgstr "prestavljanje datoteke iz stare poti v novo" -#: lib/poptI.c:222 +#: lib/poptI.c:218 #, fuzzy msgid "<old>=<new>" msgstr " --relocate <starapot>=<novapot>" -#: lib/poptI.c:225 +#: lib/poptI.c:221 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:228 +#: lib/poptI.c:224 msgid "install even if the package replaces installed files" msgstr "namesti, èetudi paket pi¹e prek ¾e name¹èene datoteke" -#: lib/poptI.c:231 +#: lib/poptI.c:227 msgid "reinstall if the package is already present" msgstr "ponovno namesti, èe paket ¾e obstaja" -#: lib/poptI.c:233 +#: lib/poptI.c:229 msgid "deinstall new, reinstall old, package(s), back to <date>" msgstr "" -#: lib/poptI.c:234 +#: lib/poptI.c:230 msgid "<date>" msgstr "" -#: lib/poptI.c:236 +#: lib/poptI.c:232 msgid "don't install, but tell if it would work or not" msgstr "ne namesti, a ugotovi, èe bi delovalo" -#: lib/poptI.c:239 +#: lib/poptI.c:235 #, fuzzy msgid "upgrade package(s)" msgstr " --upgrade <paket> " @@ -2329,97 +2329,97 @@ msgstr "(brez stanja) " msgid "package has neither file owner or id lists\n" msgstr "paket ne vsebuje ne lastnika datotek niti seznamov id" -#: lib/query.c:463 +#: lib/query.c:464 #, fuzzy, c-format msgid "can't query %s: %s\n" msgstr "ni mo¾no poizvedeti o %s: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/query.c:618 lib/query.c:656 lib/rpminstall.c:352 lib/rpminstall.c:494 #: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "odpiranje %s je bilo neuspe¹no: %s\n" -#: lib/query.c:633 +#: lib/query.c:634 #, c-format msgid "query of %s failed\n" msgstr "poizvedba po %s je bila neuspe¹na\n" -#: lib/query.c:639 +#: lib/query.c:640 msgid "old format source packages cannot be queried\n" msgstr "poizvedba po izvornih paketih v stari obliki ni mo¾na\n" -#: lib/query.c:665 lib/rpminstall.c:507 +#: lib/query.c:666 lib/rpminstall.c:507 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: branje Fread je bilo neuspe¹no: %s\n" -#: lib/query.c:709 +#: lib/query.c:710 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "poizvedba po datoteki spec. %s je bila neuspe¹na, razèlemba ni mo¾na\n" -#: lib/query.c:730 +#: lib/query.c:731 #, fuzzy msgid "no packages\n" msgstr "ni paketov\n" -#: lib/query.c:750 +#: lib/query.c:751 #, c-format msgid "group %s does not contain any packages\n" msgstr "skupina %s ne vsebuje nobenega paketa\n" -#: lib/query.c:760 +#: lib/query.c:761 #, c-format msgid "no package triggers %s\n" msgstr "noben paket ne pro¾i %s\n" -#: lib/query.c:774 lib/query.c:796 lib/query.c:817 lib/query.c:852 +#: lib/query.c:775 lib/query.c:797 lib/query.c:818 lib/query.c:853 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "Neuspe¹no branje %s: %s." -#: lib/query.c:784 lib/query.c:802 lib/query.c:827 lib/query.c:857 +#: lib/query.c:785 lib/query.c:803 lib/query.c:828 lib/query.c:858 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "noben paket ne pro¾i %s\n" -#: lib/query.c:868 +#: lib/query.c:869 #, c-format msgid "no package requires %s\n" msgstr "noben paket ne potrebuje %s\n" -#: lib/query.c:879 +#: lib/query.c:880 #, c-format msgid "no package provides %s\n" msgstr "noben paket ne nudi %s\n" -#: lib/query.c:913 +#: lib/query.c:914 #, c-format msgid "file %s: %s\n" msgstr "datoteka %s: %s\n" -#: lib/query.c:917 +#: lib/query.c:918 #, c-format msgid "file %s is not owned by any package\n" msgstr "datoteka %s ni del nobenega paketa\n" -#: lib/query.c:944 +#: lib/query.c:945 #, c-format msgid "invalid package number: %s\n" msgstr "neveljavna ¹tevilka paketa: %s\n" -#: lib/query.c:947 +#: lib/query.c:948 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "¹tevilka zapisa paketa: %d\n" -#: lib/query.c:952 +#: lib/query.c:953 #, fuzzy, c-format msgid "record %u could not be read\n" msgstr "zapisa %d ni mo¾no prebrati\n" -#: lib/query.c:963 lib/rpminstall.c:675 +#: lib/query.c:964 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "paket %s ni name¹èen\n" @@ -2730,146 +2730,146 @@ msgstr "%s ni mo¾no odpreti za branje: %s." msgid "cannot open Packages database in %s\n" msgstr "zbirko podatkov paketov ni mo¾no odpreti v %s\n" -#: lib/signature.c:123 +#: lib/signature.c:124 msgid "file is not regular -- skipping size check\n" msgstr "datoteka ni navadna datoteka -- preskakujemo preverjanje velikosti\n" -#: lib/signature.c:132 +#: lib/signature.c:142 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:137 +#: lib/signature.c:147 #, fuzzy, c-format msgid " Actual size: %12d\n" msgstr "Dol¾. podpisa : %d\n" -#: lib/signature.c:157 +#: lib/signature.c:167 msgid "No signature\n" msgstr "Podpis manjka\n" -#: lib/signature.c:161 +#: lib/signature.c:171 msgid "Old PGP signature\n" msgstr "Stari podpis PGP\n" -#: lib/signature.c:172 +#: lib/signature.c:182 #, fuzzy msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "Podpis v (interni) stari obliki! Kje ste ga dobili?" -#: lib/signature.c:226 +#: lib/signature.c:232 #, fuzzy, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "Dol¾. podpisa : %d\n" -#: lib/signature.c:305 lib/signature.c:402 lib/signature.c:669 -#: lib/signature.c:702 +#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675 +#: lib/signature.c:708 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Ni mo¾no izvesti %s: %s" -#: lib/signature.c:321 +#: lib/signature.c:327 #, fuzzy msgid "pgp failed\n" msgstr "pgp je bil neuspe¹en" #. PGP failed to write signature #. Just in case -#: lib/signature.c:328 +#: lib/signature.c:334 #, fuzzy msgid "pgp failed to write signature\n" msgstr "pgp je bil neuspe¹en pri zapisu podpisa" -#: lib/signature.c:333 +#: lib/signature.c:339 #, c-format msgid "PGP sig size: %d\n" msgstr "Dol¾. podpisa PGP: %d\n" -#: lib/signature.c:347 lib/signature.c:445 +#: lib/signature.c:353 lib/signature.c:451 #, fuzzy msgid "unable to read the signature\n" msgstr "branje podpisa je bilo neuspe¹no" -#: lib/signature.c:352 +#: lib/signature.c:358 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "Prebrano %d bajtov podpisa PGP\n" -#: lib/signature.c:419 +#: lib/signature.c:425 #, fuzzy msgid "gpg failed\n" msgstr "gpg je bil neuspe¹en" #. GPG failed to write signature #. Just in case -#: lib/signature.c:426 +#: lib/signature.c:432 #, fuzzy msgid "gpg failed to write signature\n" msgstr "gpg je boil neuspe¹en pri zapisu podpisa" -#: lib/signature.c:431 +#: lib/signature.c:437 #, c-format msgid "GPG sig size: %d\n" msgstr "Dol¾. podpisa GnuPG: %d\n" -#: lib/signature.c:450 +#: lib/signature.c:456 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "Prebrano %d bajtov podpisa GnuPG\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:707 lib/signature.c:758 +#: lib/signature.c:713 lib/signature.c:764 #, fuzzy, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "Neveljaven %%_signature v makro-datoteki.\n" -#: lib/signature.c:737 +#: lib/signature.c:743 #, fuzzy, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\"" -#: lib/signature.c:750 +#: lib/signature.c:756 #, fuzzy, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\"" -#: lib/signature.c:794 +#: lib/signature.c:800 #, fuzzy msgid "Header+Payload size: " msgstr "Glava je predolga" -#: lib/signature.c:830 +#: lib/signature.c:836 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:879 +#: lib/signature.c:885 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1066 +#: lib/signature.c:1072 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "preskoèi vse podpise MD5" -#: lib/signature.c:1176 +#: lib/signature.c:1182 msgid "Header " msgstr "" -#: lib/signature.c:1177 +#: lib/signature.c:1183 #, fuzzy msgid "V3 DSA signature: " msgstr "Podpis manjka\n" -#: lib/signature.c:1252 +#: lib/signature.c:1258 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1279 +#: lib/signature.c:1285 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1283 +#: lib/signature.c:1289 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Dol¾. polnila : %d\n" @@ -2904,12 +2904,12 @@ msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: " msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:100 +#: rpmdb/db1.c:98 rpmdb/db3.c:98 #, fuzzy, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "db%d napaka(%d)" -#: rpmdb/db1.c:101 rpmdb/db3.c:103 +#: rpmdb/db1.c:101 rpmdb/db3.c:101 #, fuzzy, c-format msgid "db%d error(%d): %s\n" msgstr "db%d napaka(%d)" @@ -2952,70 +2952,70 @@ msgstr "odpiranje datoteke %s v naèinu 0x%x\n" msgid "cannot get %s lock on database\n" msgstr "datoteke ni mo¾no %s zakleniti" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "exclusive" msgstr "izkljuèujoèe" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "shared" msgstr "skupno" -#: rpmdb/db3.c:129 +#: rpmdb/db3.c:127 #, fuzzy, c-format msgid "closed db environment %s/%s\n" msgstr "zaprto db okolje %s/%s\n" -#: rpmdb/db3.c:147 +#: rpmdb/db3.c:145 #, fuzzy, c-format msgid "removed db environment %s/%s\n" msgstr "odstranjeno db okolje %s/%s\n" -#: rpmdb/db3.c:187 +#: rpmdb/db3.c:185 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "odpiranje db okolja %s/%s %s\n" -#: rpmdb/db3.c:711 +#: rpmdb/db3.c:614 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "zaprto db kazalo %s/%s\n" -#: rpmdb/db3.c:778 +#: rpmdb/db3.c:681 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "zaprto db kazalo %s/%s\n" -#: rpmdb/db3.c:1001 +#: rpmdb/db3.c:903 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "odpiranje db kazala %s/%s %s naèin=0x%x\n" -#: rpmdb/db3.c:1226 +#: rpmdb/db3.c:1119 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "ni mo¾no zakleniti z %s datotek %s/%s\n" -#: rpmdb/db3.c:1232 +#: rpmdb/db3.c:1125 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "zaklenjeno db kazalo %s/%s\n" -#: rpmdb/dbconfig.c:404 +#: rpmdb/dbconfig.c:400 #, fuzzy, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "dbiSetConfig: neprepoznana izbira db: \"%s\" prezrto\n" -#: rpmdb/dbconfig.c:442 +#: rpmdb/dbconfig.c:438 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s ima neveljavno ¹tevilèno vrednost, prezrto\n" -#: rpmdb/dbconfig.c:451 +#: rpmdb/dbconfig.c:447 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s ima preveliko ali premajhno dolgo (long) vrednost, prezrto\n" -#: rpmdb/dbconfig.c:460 +#: rpmdb/dbconfig.c:456 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3132,161 +3132,153 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:163 +#: rpmdb/rpmdb.c:165 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: neprepoznano ime znaèke: \"%s\" prezrto\n" -#: rpmdb/rpmdb.c:440 +#: rpmdb/rpmdb.c:258 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "ni mo¾no odpreti kazala %s z uporabo db%d - %s (%d)" -#: rpmdb/rpmdb.c:462 +#: rpmdb/rpmdb.c:280 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "ni mo¾no odpreti kazala %s:" -#: rpmdb/rpmdb.c:554 +#: rpmdb/rpmdb.c:379 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s" -#: rpmdb/rpmdb.c:685 +#: rpmdb/rpmdb.c:516 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "napaka(%d) pri pisanju zapisa %s v %s" -#: rpmdb/rpmdb.c:695 +#: rpmdb/rpmdb.c:529 #, fuzzy, c-format msgid "error(%d) removing record %s from %s\n" msgstr "napaka(%d) pri brisanju zapisa %s iz %s" -#: rpmdb/rpmdb.c:954 +#: rpmdb/rpmdb.c:788 #, fuzzy msgid "no dbpath has been set\n" msgstr "dbpath ni nastavljena" -#: rpmdb/rpmdb.c:1102 -#, fuzzy -msgid "" -"old format database is present; use --rebuilddb to generate a new format " -"database\n" -msgstr "" -"da bi staro obliko zbirke podatkov pretvorili v novo po¾enite --rebuilddb" - #. error -#: rpmdb/rpmdb.c:1367 +#: rpmdb/rpmdb.c:1174 #, fuzzy, c-format msgid "error(%d) counting packages\n" msgstr "napaka(%d) pri ¹tetju paketov" -#: rpmdb/rpmdb.c:2146 rpmdb/rpmdb.c:3507 +#: rpmdb/rpmdb.c:1971 rpmdb/rpmdb.c:3357 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "zapis ¹t. %d v zbirki je po¹kodovan -- preskoèeno." -#: rpmdb/rpmdb.c:2199 +#: rpmdb/rpmdb.c:2034 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2478 +#: rpmdb/rpmdb.c:2306 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: ni mo¾no prebrati glave pri 0x%x" -#: rpmdb/rpmdb.c:2639 +#: rpmdb/rpmdb.c:2472 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstranjevanje \"%s\" iz kazala %s.\n" -#: rpmdb/rpmdb.c:2643 +#: rpmdb/rpmdb.c:2476 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "odstranjevanje %d vnosov iz kazala %s\n" -#: rpmdb/rpmdb.c:2813 +#: rpmdb/rpmdb.c:2663 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "napaka(%d) pri iskanju paketa %s\n" -#: rpmdb/rpmdb.c:3008 +#: rpmdb/rpmdb.c:2858 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "dodajanje \"%s\" v kazalo %s.\n" -#: rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:2862 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "dodajanje %d vnosov v kazalo %s.\n" -#: rpmdb/rpmdb.c:3393 +#: rpmdb/rpmdb.c:3243 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3276 msgid "no dbpath has been set" msgstr "dbpath ni nastavljena" -#: rpmdb/rpmdb.c:3453 +#: rpmdb/rpmdb.c:3303 #, c-format msgid "rebuilding database %s into %s\n" msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n" -#: rpmdb/rpmdb.c:3457 +#: rpmdb/rpmdb.c:3307 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "zaèasna podatkovna zbirka %s ¾e obstaja" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3313 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "ustvarjanje imenika: %s\n" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3315 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "ustvarjanje imenika: %s\n" -#: rpmdb/rpmdb.c:3472 +#: rpmdb/rpmdb.c:3322 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "odpiranje stare podatkovne zbirke\n" -#: rpmdb/rpmdb.c:3483 +#: rpmdb/rpmdb.c:3333 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "odpiramo nove podatkovne zbirke z dbapi %d\n" -#: rpmdb/rpmdb.c:3547 +#: rpmdb/rpmdb.c:3397 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "zapisa ni mo¾no dodati na %d" -#: rpmdb/rpmdb.c:3565 +#: rpmdb/rpmdb.c:3415 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "" "ponovna izgradnja podatkovne zbirke je bila neuspe¹na; stara ostaja na\n" "istem mestu\n" -#: rpmdb/rpmdb.c:3573 +#: rpmdb/rpmdb.c:3423 msgid "failed to replace old database with new database!\n" msgstr "zamenjava stare podatkovne zbirke z novo je bila neuspe¹na!\n" -#: rpmdb/rpmdb.c:3575 +#: rpmdb/rpmdb.c:3425 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "poskus povrnitve z nadomestitvijo datotek v %s z datotekami v %s" -#: rpmdb/rpmdb.c:3585 +#: rpmdb/rpmdb.c:3435 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "odstranjevanje imenika: %s\n" -#: rpmdb/rpmdb.c:3587 +#: rpmdb/rpmdb.c:3437 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspe¹na odstranitev imenika %s: %s\n" @@ -3503,6 +3495,13 @@ msgid "failed to create %s: %s\n" msgstr "neuspe¹no ustvarjanje %s: %s\n" #, fuzzy +#~ msgid "" +#~ "old format database is present; use --rebuilddb to generate a new format " +#~ "database\n" +#~ msgstr "" +#~ "da bi staro obliko zbirke podatkov pretvorili v novo po¾enite --rebuilddb" + +#, fuzzy #~ msgid "don't verify signature(s)" #~ msgstr "brez preverjanja datotek v paketu" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-14 17:43-0400\n" +"POT-Creation-Date: 2002-05-01 18:05-0400\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" @@ -112,7 +112,7 @@ msgstr "" msgid "use <dir> as the top level directory" msgstr "koristi <dir> kao direktorijum najvi¹eg nivoa" -#: rpmqv.c:125 lib/poptI.c:219 +#: rpmqv.c:125 lib/poptI.c:215 msgid "<dir>" msgstr "" @@ -1458,77 +1458,77 @@ msgstr "PGP omanuo" msgid "package %s was already added, replacing with %s\n" msgstr "paket %s nije instaliran\n" -#: lib/depends.c:367 +#: lib/depends.c:380 msgid "(cached)" msgstr "" -#: lib/depends.c:392 +#: lib/depends.c:405 #, fuzzy msgid "(rpmrc provides)" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:408 +#: lib/depends.c:421 #, fuzzy msgid "(rpmlib provides)" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:429 +#: lib/depends.c:442 #, fuzzy msgid "(db files)" msgstr "neuspelo otvaranje %s: %s" -#: lib/depends.c:441 +#: lib/depends.c:454 #, fuzzy msgid "(db provides)" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:454 +#: lib/depends.c:467 #, fuzzy msgid "(db package)" msgstr "upit nad svim paketima" -#: lib/depends.c:762 +#: lib/depends.c:783 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:903 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1171 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1277 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1349 +#: lib/depends.c:1370 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1419 +#: lib/depends.c:1440 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1454 +#: lib/depends.c:1475 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1480 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2978 rpmdb/header.c:2999 rpmdb/header.c:3021 +#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 msgid "(not a number)" msgstr "(nije broj)" @@ -1666,37 +1666,37 @@ msgstr "" msgid "%s: Fread failed: %s\n" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/poptI.c:53 +#: lib/poptI.c:49 #, fuzzy msgid "exclude paths must begin with a /" msgstr "preme¹tanja moraju poèeti znakom '/'" -#: lib/poptI.c:65 +#: lib/poptI.c:61 msgid "relocations must begin with a /" msgstr "preme¹tanja moraju poèeti znakom '/'" -#: lib/poptI.c:67 +#: lib/poptI.c:63 msgid "relocations must contain a =" msgstr "preme¹tanja moraju imati znak =" -#: lib/poptI.c:70 +#: lib/poptI.c:66 msgid "relocations must have a / following the =" msgstr "preme¹tanja moraju imati / praæeno sa =" -#: lib/poptI.c:84 +#: lib/poptI.c:80 msgid "rollback takes a time/date stamp argument" msgstr "" -#: lib/poptI.c:91 +#: lib/poptI.c:87 msgid "malformed rollback time/date stamp argument" msgstr "" -#: lib/poptI.c:110 +#: lib/poptI.c:106 msgid "install all files, even configurations which might otherwise be skipped" msgstr "" "instaliraj sve datoteke, èak i konfiguracije koje bi inaèe bile preskoèene" -#: lib/poptI.c:114 +#: lib/poptI.c:110 msgid "" "remove all packages which match <package> (normally an error is generated if " "<package> specified multiple packages)" @@ -1704,202 +1704,202 @@ msgstr "" "ukloni sve pakete koji odgovaraju <paketu> (normalno, javlja se gre¹ka ako " "<paket> oznaèava vi¹e paketa)" -#: lib/poptI.c:120 lib/poptI.c:175 +#: lib/poptI.c:116 lib/poptI.c:171 #, fuzzy msgid "do not execute package scriptlet(s)" msgstr "nemoj izvr¹iti nijedan skript iz paketa" -#: lib/poptI.c:124 +#: lib/poptI.c:120 #, fuzzy msgid "relocate files in non-relocateable package" msgstr "paket %s nije instaliran\n" -#: lib/poptI.c:127 +#: lib/poptI.c:123 msgid "save erased package files by renaming into sub-directory" msgstr "" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "erase (uninstall) package" msgstr "izbri¹i (deinstaliraj) paket" -#: lib/poptI.c:130 +#: lib/poptI.c:126 #, fuzzy msgid "<package>+" msgstr "upit nad svim paketima" -#: lib/poptI.c:133 +#: lib/poptI.c:129 msgid "do not install documentation" msgstr "nemoj da instalira¹ dokumentaciju" -#: lib/poptI.c:135 +#: lib/poptI.c:131 msgid "skip files with leading component <path> " msgstr "" -#: lib/poptI.c:136 +#: lib/poptI.c:132 msgid "<path>" msgstr "" -#: lib/poptI.c:139 +#: lib/poptI.c:135 msgid "short hand for --replacepkgs --replacefiles" msgstr "skraæenica za --replacepkgs --replacefiles" -#: lib/poptI.c:142 +#: lib/poptI.c:138 #, fuzzy msgid "upgrade package(s) if already installed" msgstr "paket %s nije instaliran\n" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 +#: lib/poptI.c:139 lib/poptI.c:155 lib/poptI.c:236 #, fuzzy msgid "<packagefile>+" msgstr " -b<faza> <spec>\t " -#: lib/poptI.c:145 +#: lib/poptI.c:141 msgid "print hash marks as package installs (good with -v)" msgstr "pi¹i he¹-znak (#) kako odmièe instaliranje paketa (dobro doðe sa -v)" -#: lib/poptI.c:148 +#: lib/poptI.c:144 msgid "don't verify package architecture" msgstr "nemoj proveravati arhitekturu paketa" -#: lib/poptI.c:151 +#: lib/poptI.c:147 msgid "don't verify package operating system" msgstr "nemoj proveravati operativni sistem za paket" -#: lib/poptI.c:154 +#: lib/poptI.c:150 msgid "don't check disk space before installing" msgstr "" -#: lib/poptI.c:156 +#: lib/poptI.c:152 msgid "install documentation" msgstr "instaliraj dokumentaciju" -#: lib/poptI.c:159 +#: lib/poptI.c:155 #, fuzzy msgid "install package(s)" msgstr "instaliraj paket" -#: lib/poptI.c:161 +#: lib/poptI.c:157 msgid "update the database, but do not modify the filesystem" msgstr "a¾uriraj bazu podataka, ali nemoj menjati fajl-sistem" -#: lib/poptI.c:163 +#: lib/poptI.c:159 msgid "do not verify package dependencies" msgstr "nemoj proveravati zavisnosti paketa" -#: lib/poptI.c:166 +#: lib/poptI.c:162 msgid "do not reorder package installation to satisfy dependencies" msgstr "" "nemoj preurediti redosled instalacije paketa kako bi zadovoljio zavisnosti" -#: lib/poptI.c:171 +#: lib/poptI.c:167 msgid "do not suggest missing dependency resolution(s)" msgstr "" -#: lib/poptI.c:178 +#: lib/poptI.c:174 #, fuzzy, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "nemoj izvr¹iti nijednu fazu" -#: lib/poptI.c:181 +#: lib/poptI.c:177 #, fuzzy, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "nemoj izvr¹iti nijednu fazu" -#: lib/poptI.c:184 +#: lib/poptI.c:180 #, fuzzy, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "nemoj izvr¹iti nijednu fazu" -#: lib/poptI.c:187 +#: lib/poptI.c:183 #, fuzzy, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "nemoj izvr¹iti nijednu fazu" -#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy msgid "don't verify package digest(s)" msgstr "instaliraj paket" -#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy msgid "don't verify package signature(s)" msgstr "proveri potpis u paketu" -#: lib/poptI.c:196 +#: lib/poptI.c:192 #, fuzzy msgid "do not execute any scriptlet(s) triggered by this package" msgstr "upit nad paketom koji ima <datoteku>" -#: lib/poptI.c:199 +#: lib/poptI.c:195 #, fuzzy, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "nemoj izvr¹iti nijedan skript iz paketa" -#: lib/poptI.c:202 +#: lib/poptI.c:198 #, fuzzy, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "nemoj izvr¹iti nijedan instalacioni skript" -#: lib/poptI.c:205 +#: lib/poptI.c:201 #, fuzzy, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "nemoj izvr¹iti nijedan instalacioni skript" -#: lib/poptI.c:208 +#: lib/poptI.c:204 #, fuzzy, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "nemoj izvr¹iti nijedan instalacioni skript" -#: lib/poptI.c:212 +#: lib/poptI.c:208 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" msgstr "" "a¾uriraj na staru verziju paketa (--force kod a¾uriranja ovo radi automatski)" -#: lib/poptI.c:216 +#: lib/poptI.c:212 msgid "print percentages as package installs" msgstr "pi¹i procente instalacije paketa" -#: lib/poptI.c:218 +#: lib/poptI.c:214 msgid "relocate the package to <dir>, if relocatable" msgstr "premesti paket u <dir>, ako se mo¾e premestiti" -#: lib/poptI.c:221 +#: lib/poptI.c:217 #, fuzzy msgid "relocate files from path <old> to <new>" msgstr "premesti datoteke iz <starog-puta> u <novi-put>" -#: lib/poptI.c:222 +#: lib/poptI.c:218 #, fuzzy msgid "<old>=<new>" msgstr "premesti datoteke iz <starog-puta> u <novi-put>" -#: lib/poptI.c:225 +#: lib/poptI.c:221 msgid "save erased package files by repackaging" msgstr "" -#: lib/poptI.c:228 +#: lib/poptI.c:224 msgid "install even if the package replaces installed files" msgstr "instaliraj èak iako æe paket zameniti instalirane datoteke" -#: lib/poptI.c:231 +#: lib/poptI.c:227 msgid "reinstall if the package is already present" msgstr "ponovo instaliraj ako je paket veæ prisutan" -#: lib/poptI.c:233 +#: lib/poptI.c:229 msgid "deinstall new, reinstall old, package(s), back to <date>" msgstr "" -#: lib/poptI.c:234 +#: lib/poptI.c:230 msgid "<date>" msgstr "" -#: lib/poptI.c:236 +#: lib/poptI.c:232 msgid "don't install, but tell if it would work or not" msgstr "nemoj instalirati, ali reci da li æe da radi ili ne" -#: lib/poptI.c:239 +#: lib/poptI.c:235 #, fuzzy msgid "upgrade package(s)" msgstr "instaliraj paket" @@ -2323,97 +2323,97 @@ msgstr "" msgid "package has neither file owner or id lists\n" msgstr "paket nema imena" -#: lib/query.c:463 +#: lib/query.c:464 #, fuzzy, c-format msgid "can't query %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/query.c:618 lib/query.c:656 lib/rpminstall.c:352 lib/rpminstall.c:494 #: lib/rpminstall.c:887 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: lib/query.c:633 +#: lib/query.c:634 #, c-format msgid "query of %s failed\n" msgstr "upit nad %s neuspeo\n" -#: lib/query.c:639 +#: lib/query.c:640 msgid "old format source packages cannot be queried\n" msgstr "Upit se ne mo¾e izvesti nad izvorni paketima u starom formatu\n" -#: lib/query.c:665 lib/rpminstall.c:507 +#: lib/query.c:666 lib/rpminstall.c:507 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/query.c:709 +#: lib/query.c:710 #, fuzzy, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "upit nad %s neuspeo\n" -#: lib/query.c:730 +#: lib/query.c:731 #, fuzzy msgid "no packages\n" msgstr "upit nad svim paketima" -#: lib/query.c:750 +#: lib/query.c:751 #, c-format msgid "group %s does not contain any packages\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/query.c:760 +#: lib/query.c:761 #, c-format msgid "no package triggers %s\n" msgstr "nijedan paket ne aktivira %s\n" -#: lib/query.c:774 lib/query.c:796 lib/query.c:817 lib/query.c:852 +#: lib/query.c:775 lib/query.c:797 lib/query.c:818 lib/query.c:853 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "Neuspelo èitanje %s: %s." -#: lib/query.c:784 lib/query.c:802 lib/query.c:827 lib/query.c:857 +#: lib/query.c:785 lib/query.c:803 lib/query.c:828 lib/query.c:858 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "nijedan paket ne aktivira %s\n" -#: lib/query.c:868 +#: lib/query.c:869 #, c-format msgid "no package requires %s\n" msgstr "nijedan paket ne zahteva %s\n" -#: lib/query.c:879 +#: lib/query.c:880 #, c-format msgid "no package provides %s\n" msgstr "nijedan paket ne obezbeðuje %s\n" -#: lib/query.c:913 +#: lib/query.c:914 #, fuzzy, c-format msgid "file %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/query.c:917 +#: lib/query.c:918 #, c-format msgid "file %s is not owned by any package\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/query.c:944 +#: lib/query.c:945 #, c-format msgid "invalid package number: %s\n" msgstr "pogre¹an broj paketa: %s\n" -#: lib/query.c:947 +#: lib/query.c:948 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "pogre¹an broj paketa: %s\n" -#: lib/query.c:952 +#: lib/query.c:953 #, fuzzy, c-format msgid "record %u could not be read\n" msgstr "ne mogu da proèitam slog %d\n" -#: lib/query.c:963 lib/rpminstall.c:675 +#: lib/query.c:964 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "paket %s nije instaliran\n" @@ -2724,147 +2724,147 @@ msgstr "Ne mogu da otvorim %s za èitanje: %s" msgid "cannot open Packages database in %s\n" msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n" -#: lib/signature.c:123 +#: lib/signature.c:124 msgid "file is not regular -- skipping size check\n" msgstr "" -#: lib/signature.c:132 +#: lib/signature.c:142 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:137 +#: lib/signature.c:147 #, c-format msgid " Actual size: %12d\n" msgstr "" -#: lib/signature.c:157 +#: lib/signature.c:167 #, fuzzy msgid "No signature\n" msgstr "%s: Potpis nije na raspolaganju\n" -#: lib/signature.c:161 +#: lib/signature.c:171 #, fuzzy msgid "Old PGP signature\n" msgstr "napravi PGP potpis" -#: lib/signature.c:172 +#: lib/signature.c:182 #, fuzzy msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "Stari (interni) potpis! Odakle vam!?" -#: lib/signature.c:226 +#: lib/signature.c:232 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "" -#: lib/signature.c:305 lib/signature.c:402 lib/signature.c:669 -#: lib/signature.c:702 +#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675 +#: lib/signature.c:708 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Ne mogu da izvr¹im PGP" -#: lib/signature.c:321 +#: lib/signature.c:327 #, fuzzy msgid "pgp failed\n" msgstr "PGP omanuo" #. PGP failed to write signature #. Just in case -#: lib/signature.c:328 +#: lib/signature.c:334 #, fuzzy msgid "pgp failed to write signature\n" msgstr "PGP nije uspeo da zapi¹e potpis" -#: lib/signature.c:333 +#: lib/signature.c:339 #, c-format msgid "PGP sig size: %d\n" msgstr "" -#: lib/signature.c:347 lib/signature.c:445 +#: lib/signature.c:353 lib/signature.c:451 #, fuzzy msgid "unable to read the signature\n" msgstr "ne mogu da proèitam potpis" -#: lib/signature.c:352 +#: lib/signature.c:358 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:419 +#: lib/signature.c:425 #, fuzzy msgid "gpg failed\n" msgstr "PGP omanuo" #. GPG failed to write signature #. Just in case -#: lib/signature.c:426 +#: lib/signature.c:432 #, fuzzy msgid "gpg failed to write signature\n" msgstr "PGP nije uspeo da zapi¹e potpis" -#: lib/signature.c:431 +#: lib/signature.c:437 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:450 +#: lib/signature.c:456 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:707 lib/signature.c:758 +#: lib/signature.c:713 lib/signature.c:764 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:737 +#: lib/signature.c:743 #, fuzzy, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "Morate podesiti \"pgp_name:\" u va¹oj rpmrc datoteci" -#: lib/signature.c:750 +#: lib/signature.c:756 #, fuzzy, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "Morate podesiti \"pgp_name:\" u va¹oj rpmrc datoteci" -#: lib/signature.c:794 +#: lib/signature.c:800 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:830 +#: lib/signature.c:836 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:879 +#: lib/signature.c:885 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1066 +#: lib/signature.c:1072 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "preskoèi sve MD5 potpise" -#: lib/signature.c:1176 +#: lib/signature.c:1182 msgid "Header " msgstr "" -#: lib/signature.c:1177 +#: lib/signature.c:1183 #, fuzzy msgid "V3 DSA signature: " msgstr "%s: Potpis nije na raspolaganju\n" -#: lib/signature.c:1252 +#: lib/signature.c:1258 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1279 +#: lib/signature.c:1285 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1283 +#: lib/signature.c:1289 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" @@ -2899,12 +2899,12 @@ msgstr "Nezadovoljene meðuzavisnosti za %s-%s-%s: " msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:100 +#: rpmdb/db1.c:98 rpmdb/db3.c:98 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:103 +#: rpmdb/db1.c:101 rpmdb/db3.c:101 #, c-format msgid "db%d error(%d): %s\n" msgstr "" @@ -2947,70 +2947,70 @@ msgstr "rekreiraj bazu podataka iz postojeæe baze" msgid "cannot get %s lock on database\n" msgstr "ne mogu da dobijem %s zakljuèavanje baze podataka" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "exclusive" msgstr "ekskluzivno" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "shared" msgstr "deljeno" -#: rpmdb/db3.c:129 +#: rpmdb/db3.c:127 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:147 +#: rpmdb/db3.c:145 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:187 +#: rpmdb/db3.c:185 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/db3.c:711 +#: rpmdb/db3.c:614 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/db3.c:778 +#: rpmdb/db3.c:681 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/db3.c:1001 +#: rpmdb/db3.c:903 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/db3.c:1226 +#: rpmdb/db3.c:1119 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "ne mogu da dobijem %s zakljuèavanje baze podataka" -#: rpmdb/db3.c:1232 +#: rpmdb/db3.c:1125 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/dbconfig.c:404 +#: rpmdb/dbconfig.c:400 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:442 +#: rpmdb/dbconfig.c:438 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:451 +#: rpmdb/dbconfig.c:447 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:460 +#: rpmdb/dbconfig.c:456 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3122,156 +3122,150 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:163 +#: rpmdb/rpmdb.c:165 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:440 +#: rpmdb/rpmdb.c:258 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: rpmdb/rpmdb.c:462 +#: rpmdb/rpmdb.c:280 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" -#: rpmdb/rpmdb.c:554 +#: rpmdb/rpmdb.c:379 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "gre¹ka kod uzimanja sloga %s iz %s" -#: rpmdb/rpmdb.c:685 +#: rpmdb/rpmdb.c:516 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "gre¹ka zapisivanja sloga %s u %s" -#: rpmdb/rpmdb.c:695 +#: rpmdb/rpmdb.c:529 #, fuzzy, c-format msgid "error(%d) removing record %s from %s\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:954 +#: rpmdb/rpmdb.c:788 #, fuzzy msgid "no dbpath has been set\n" msgstr "dbpath nije odreðen" -#: rpmdb/rpmdb.c:1102 -msgid "" -"old format database is present; use --rebuilddb to generate a new format " -"database\n" -msgstr "" - #. error -#: rpmdb/rpmdb.c:1367 +#: rpmdb/rpmdb.c:1174 #, fuzzy, c-format msgid "error(%d) counting packages\n" msgstr "gre¹ka kod potrage za paketom %s\n" -#: rpmdb/rpmdb.c:2146 rpmdb/rpmdb.c:3507 +#: rpmdb/rpmdb.c:1971 rpmdb/rpmdb.c:3357 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "slog broj %d u bazi podataka je neispravan -- preskaèem ga" -#: rpmdb/rpmdb.c:2199 +#: rpmdb/rpmdb.c:2034 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2478 +#: rpmdb/rpmdb.c:2306 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "ne mogu da proèitam zaglavlje na %d za proveru" -#: rpmdb/rpmdb.c:2639 +#: rpmdb/rpmdb.c:2472 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:2643 +#: rpmdb/rpmdb.c:2476 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:2813 +#: rpmdb/rpmdb.c:2663 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "gre¹ka kod potrage za paketom %s\n" -#: rpmdb/rpmdb.c:3008 +#: rpmdb/rpmdb.c:2858 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:2862 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:3393 +#: rpmdb/rpmdb.c:3243 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3276 msgid "no dbpath has been set" msgstr "dbpath nije odreðen" -#: rpmdb/rpmdb.c:3453 +#: rpmdb/rpmdb.c:3303 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3457 +#: rpmdb/rpmdb.c:3307 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "privremena baza podataka %s veæ postoji" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3313 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3315 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3472 +#: rpmdb/rpmdb.c:3322 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3483 +#: rpmdb/rpmdb.c:3333 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3547 +#: rpmdb/rpmdb.c:3397 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "ne mogu da dodam slog originalno na %d" -#: rpmdb/rpmdb.c:3565 +#: rpmdb/rpmdb.c:3415 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3573 +#: rpmdb/rpmdb.c:3423 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3575 +#: rpmdb/rpmdb.c:3425 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3585 +#: rpmdb/rpmdb.c:3435 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3587 +#: rpmdb/rpmdb.c:3437 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspelo otvaranje %s: %s" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-14 17:43-0400\n" +"POT-Creation-Date: 2002-05-01 18:05-0400\n" "PO-Revision-Date: 2001-09-12 14:18+0200\n" "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -114,7 +114,7 @@ msgstr "<kommando>" msgid "use <dir> as the top level directory" msgstr "använd <kat> som toppkatalog" -#: rpmqv.c:125 lib/poptI.c:219 +#: rpmqv.c:125 lib/poptI.c:215 msgid "<dir>" msgstr "<kat>" @@ -1433,52 +1433,52 @@ msgstr " misslyckades - " msgid "package %s was already added, replacing with %s\n" msgstr "paket %s är redan installerat" -#: lib/depends.c:367 +#: lib/depends.c:380 msgid "(cached)" msgstr "" -#: lib/depends.c:392 +#: lib/depends.c:405 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n" -#: lib/depends.c:408 +#: lib/depends.c:421 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s JA (rpmlib tillhandahåller)\n" -#: lib/depends.c:429 +#: lib/depends.c:442 #, fuzzy msgid "(db files)" msgstr "felaktig db-fil %s\n" -#: lib/depends.c:441 +#: lib/depends.c:454 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s JA (db-tillhandahållande)\n" -#: lib/depends.c:454 +#: lib/depends.c:467 #, fuzzy msgid "(db package)" msgstr "inga paket\n" -#: lib/depends.c:762 +#: lib/depends.c:783 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:903 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tar bort %s-%s-%s \"%s\" från tsort-relationer.\n" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1171 msgid "========== recording tsort relations\n" msgstr "========== noterar alla relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1277 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1486,26 +1486,26 @@ msgid "" msgstr "" "========== tsort:erar paket (ordning, #föregångare, #efterföljare, djup)\n" -#: lib/depends.c:1349 +#: lib/depends.c:1370 msgid "========== successors only (presentation order)\n" msgstr "========== endast efterföljare (presentationsordning)\n" -#: lib/depends.c:1419 +#: lib/depends.c:1440 msgid "LOOP:\n" msgstr "LOOP:\n" -#: lib/depends.c:1454 +#: lib/depends.c:1475 msgid "========== continuing tsort ...\n" msgstr "========== fortsätter med tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1480 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2978 rpmdb/header.c:2999 rpmdb/header.c:3021 +#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 msgid "(not a number)" msgstr "(inte ett tal)" @@ -1642,37 +1642,37 @@ msgstr "" msgid "%s: Fread failed: %s\n" msgstr "%s: Fread misslyckades: %s\n" -#: lib/poptI.c:53 +#: lib/poptI.c:49 msgid "exclude paths must begin with a /" msgstr "uteslutna sökvägar måste börja med /" -#: lib/poptI.c:65 +#: lib/poptI.c:61 msgid "relocations must begin with a /" msgstr "omflyttningar måste börja med /" -#: lib/poptI.c:67 +#: lib/poptI.c:63 msgid "relocations must contain a =" msgstr "omflyttningar måste innehålla ett =" -#: lib/poptI.c:70 +#: lib/poptI.c:66 msgid "relocations must have a / following the =" msgstr "omflyttningar måste ha ett / efter =" -#: lib/poptI.c:84 +#: lib/poptI.c:80 msgid "rollback takes a time/date stamp argument" msgstr "" -#: lib/poptI.c:91 +#: lib/poptI.c:87 #, fuzzy msgid "malformed rollback time/date stamp argument" msgstr "felformaterad återgångstid" -#: lib/poptI.c:110 +#: lib/poptI.c:106 msgid "install all files, even configurations which might otherwise be skipped" msgstr "" "installera alla filer, även konfigurationer som annars kunde hoppats över" -#: lib/poptI.c:114 +#: lib/poptI.c:110 msgid "" "remove all packages which match <package> (normally an error is generated if " "<package> specified multiple packages)" @@ -1680,147 +1680,147 @@ msgstr "" "ta bort alla paket som matchar <paket> (normalt ger det ett fel om <paket> " "anger flera paket)" -#: lib/poptI.c:120 lib/poptI.c:175 +#: lib/poptI.c:116 lib/poptI.c:171 msgid "do not execute package scriptlet(s)" msgstr "kör inte paketskript" -#: lib/poptI.c:124 +#: lib/poptI.c:120 msgid "relocate files in non-relocateable package" msgstr "relokera filer i ej relokerbart paket" -#: lib/poptI.c:127 +#: lib/poptI.c:123 msgid "save erased package files by renaming into sub-directory" msgstr "spara raderade paketfiler genom att spara dem i underkatalog" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "erase (uninstall) package" msgstr "radera (avinstallera) paket" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "<package>+" msgstr "<paket>+" -#: lib/poptI.c:133 +#: lib/poptI.c:129 msgid "do not install documentation" msgstr "installera inte dokumentation" -#: lib/poptI.c:135 +#: lib/poptI.c:131 msgid "skip files with leading component <path> " msgstr "hoppa över filer med inledande <sökväg>" -#: lib/poptI.c:136 +#: lib/poptI.c:132 msgid "<path>" msgstr "<sökväg>" -#: lib/poptI.c:139 +#: lib/poptI.c:135 msgid "short hand for --replacepkgs --replacefiles" msgstr "kortform för --replacepkgs --replacefiles" -#: lib/poptI.c:142 +#: lib/poptI.c:138 msgid "upgrade package(s) if already installed" msgstr "uppgradera paket om redan installerat/de" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 +#: lib/poptI.c:139 lib/poptI.c:155 lib/poptI.c:236 msgid "<packagefile>+" msgstr "<paketfil>+" -#: lib/poptI.c:145 +#: lib/poptI.c:141 msgid "print hash marks as package installs (good with -v)" msgstr "" "skriv ut brädgårdar allteftersom paketet installeras (bra tillsammans med -v)" -#: lib/poptI.c:148 +#: lib/poptI.c:144 msgid "don't verify package architecture" msgstr "verifiera inte paketarkitektur" -#: lib/poptI.c:151 +#: lib/poptI.c:147 msgid "don't verify package operating system" msgstr "verifiera inte paketets operativsystem" -#: lib/poptI.c:154 +#: lib/poptI.c:150 msgid "don't check disk space before installing" msgstr "kontrollera inte diskutrymme före installation" -#: lib/poptI.c:156 +#: lib/poptI.c:152 msgid "install documentation" msgstr "installera dokumentation" -#: lib/poptI.c:159 +#: lib/poptI.c:155 #, fuzzy msgid "install package(s)" msgstr "installera paket" -#: lib/poptI.c:161 +#: lib/poptI.c:157 msgid "update the database, but do not modify the filesystem" msgstr "uppdatera databasen, men ändra inte filsystemet" -#: lib/poptI.c:163 +#: lib/poptI.c:159 msgid "do not verify package dependencies" msgstr "verifiera inte paketberoenden" -#: lib/poptI.c:166 +#: lib/poptI.c:162 msgid "do not reorder package installation to satisfy dependencies" msgstr "flytta inte om paketinstallationen för att tillfredsställa beroenden" -#: lib/poptI.c:171 +#: lib/poptI.c:167 msgid "do not suggest missing dependency resolution(s)" msgstr "" -#: lib/poptI.c:178 +#: lib/poptI.c:174 #, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "utför inte (eventuellt) %%pre-skript" -#: lib/poptI.c:181 +#: lib/poptI.c:177 #, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "utför inte (eventuellt) %%post-skript" -#: lib/poptI.c:184 +#: lib/poptI.c:180 #, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "utför inte (eventuellt) %%preun-skript" -#: lib/poptI.c:187 +#: lib/poptI.c:183 #, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "utför inte (eventuellt) %%postun-skript" -#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy msgid "don't verify package digest(s)" msgstr "verifiera inte MD5-summor för filer" -#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy msgid "don't verify package signature(s)" msgstr "verifiera paketsignatur" -#: lib/poptI.c:196 +#: lib/poptI.c:192 msgid "do not execute any scriptlet(s) triggered by this package" msgstr "kör inte skript utlösta av detta paket" -#: lib/poptI.c:199 +#: lib/poptI.c:195 #, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "kör inte %%triggerprein-skript" -#: lib/poptI.c:202 +#: lib/poptI.c:198 #, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "kör inte %%triggerin-skript" -#: lib/poptI.c:205 +#: lib/poptI.c:201 #, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "kör inte %%triggerun-skript" -#: lib/poptI.c:208 +#: lib/poptI.c:204 #, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "kör inte %%triggerpostun-skript" -#: lib/poptI.c:212 +#: lib/poptI.c:208 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1828,49 +1828,49 @@ msgstr "" "uppgradera till en gammal version av paketet (--force vid uppgraderingar gör " "detta automatiskt)" -#: lib/poptI.c:216 +#: lib/poptI.c:212 msgid "print percentages as package installs" msgstr "skriv procent allt eftersom paketet installeras" -#: lib/poptI.c:218 +#: lib/poptI.c:214 msgid "relocate the package to <dir>, if relocatable" msgstr "flytta paketet till <katalog>, om flyttbart" -#: lib/poptI.c:221 +#: lib/poptI.c:217 msgid "relocate files from path <old> to <new>" msgstr "relokera filer från <gammal> till <ny>" -#: lib/poptI.c:222 +#: lib/poptI.c:218 msgid "<old>=<new>" msgstr "<gammal>=<ny>" -#: lib/poptI.c:225 +#: lib/poptI.c:221 msgid "save erased package files by repackaging" msgstr "spara raderade paketfiler genom ompaketering" -#: lib/poptI.c:228 +#: lib/poptI.c:224 msgid "install even if the package replaces installed files" msgstr "installera även om paketet byter ut installerade filer" -#: lib/poptI.c:231 +#: lib/poptI.c:227 msgid "reinstall if the package is already present" msgstr "installera om ifall paketet redan är installerat" -#: lib/poptI.c:233 +#: lib/poptI.c:229 #, fuzzy msgid "deinstall new, reinstall old, package(s), back to <date>" msgstr "" "avinstallera nya paket och ominstallera gamla paket tillbaka till datum" -#: lib/poptI.c:234 +#: lib/poptI.c:230 msgid "<date>" msgstr "<datum>" -#: lib/poptI.c:236 +#: lib/poptI.c:232 msgid "don't install, but tell if it would work or not" msgstr "installera inte, men tala om ifall det skulle fungera eller inte" -#: lib/poptI.c:239 +#: lib/poptI.c:235 msgid "upgrade package(s)" msgstr "uppgradera paket" @@ -2265,96 +2265,96 @@ msgstr "(ej tillstnd) " msgid "package has neither file owner or id lists\n" msgstr "paketet har varken filägare eller id-listor\n" -#: lib/query.c:463 +#: lib/query.c:464 #, c-format msgid "can't query %s: %s\n" msgstr "kan inte fråga %s: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/query.c:618 lib/query.c:656 lib/rpminstall.c:352 lib/rpminstall.c:494 #: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "misslyckades med att öppna %s: %s\n" -#: lib/query.c:633 +#: lib/query.c:634 #, c-format msgid "query of %s failed\n" msgstr "fråga av %s misslyckades\n" -#: lib/query.c:639 +#: lib/query.c:640 msgid "old format source packages cannot be queried\n" msgstr "källpaket i gammalt format går inte att fråga om\n" -#: lib/query.c:665 lib/rpminstall.c:507 +#: lib/query.c:666 lib/rpminstall.c:507 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: läsning av paketlista misslyckades: %s\n" -#: lib/query.c:709 +#: lib/query.c:710 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "fråga av specfil %s misslyckades, kan inte tolka\n" -#: lib/query.c:730 +#: lib/query.c:731 msgid "no packages\n" msgstr "inga paket\n" -#: lib/query.c:750 +#: lib/query.c:751 #, c-format msgid "group %s does not contain any packages\n" msgstr "grupp %s innehåller inga paket\n" -#: lib/query.c:760 +#: lib/query.c:761 #, c-format msgid "no package triggers %s\n" msgstr "inga paketutlösare %s\n" -#: lib/query.c:774 lib/query.c:796 lib/query.c:817 lib/query.c:852 +#: lib/query.c:775 lib/query.c:797 lib/query.c:818 lib/query.c:853 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "Misslyckades med att läsa %s: %s.\n" -#: lib/query.c:784 lib/query.c:802 lib/query.c:827 lib/query.c:857 +#: lib/query.c:785 lib/query.c:803 lib/query.c:828 lib/query.c:858 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "inga paketutlösare %s\n" -#: lib/query.c:868 +#: lib/query.c:869 #, c-format msgid "no package requires %s\n" msgstr "inget paket behöver %s\n" -#: lib/query.c:879 +#: lib/query.c:880 #, c-format msgid "no package provides %s\n" msgstr "inget paket tillhandahåller %s\n" -#: lib/query.c:913 +#: lib/query.c:914 #, c-format msgid "file %s: %s\n" msgstr "fil %s: %s\n" -#: lib/query.c:917 +#: lib/query.c:918 #, c-format msgid "file %s is not owned by any package\n" msgstr "filen %s tillhör inget paket\n" -#: lib/query.c:944 +#: lib/query.c:945 #, c-format msgid "invalid package number: %s\n" msgstr "felaktigt paketnummer: %s\n" -#: lib/query.c:947 +#: lib/query.c:948 #, c-format msgid "package record number: %u\n" msgstr "paketpost nummer: %u\n" -#: lib/query.c:952 +#: lib/query.c:953 #, c-format msgid "record %u could not be read\n" msgstr "post %u kunde inte läsas\n" -#: lib/query.c:963 lib/rpminstall.c:675 +#: lib/query.c:964 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "paket %s är inte installerat\n" @@ -2663,142 +2663,142 @@ msgstr "Kan inte öppna %s för läsning: %s.\n" msgid "cannot open Packages database in %s\n" msgstr "kan inte öppna paketdatabas i %s\n" -#: lib/signature.c:123 +#: lib/signature.c:124 msgid "file is not regular -- skipping size check\n" msgstr "filen är inte en vanlig fil -- hoppar över storlekskontroll\n" -#: lib/signature.c:132 +#: lib/signature.c:142 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" "Förväntad storlek: %12d = inledning(%d)+signaturer(%d)+utfyllnad(%d)+data(%" "d)\n" -#: lib/signature.c:137 +#: lib/signature.c:147 #, c-format msgid " Actual size: %12d\n" msgstr " Faktisk storlek: %12d\n" -#: lib/signature.c:157 +#: lib/signature.c:167 msgid "No signature\n" msgstr "Ingen signatur\n" -#: lib/signature.c:161 +#: lib/signature.c:171 msgid "Old PGP signature\n" msgstr "Gammal PGP-signatur\n" -#: lib/signature.c:172 +#: lib/signature.c:182 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "Gammal (endast intern) signatur! Hur fick du tag i den!?\n" -#: lib/signature.c:226 +#: lib/signature.c:232 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n" -#: lib/signature.c:305 lib/signature.c:402 lib/signature.c:669 -#: lib/signature.c:702 +#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675 +#: lib/signature.c:708 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Kunde inte köra %s: %s\n" -#: lib/signature.c:321 +#: lib/signature.c:327 msgid "pgp failed\n" msgstr "pgp misslyckades\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:328 +#: lib/signature.c:334 msgid "pgp failed to write signature\n" msgstr "pgp misslyckades att skriva en signatur\n" -#: lib/signature.c:333 +#: lib/signature.c:339 #, c-format msgid "PGP sig size: %d\n" msgstr "PGP signaturstorlek: %d\n" -#: lib/signature.c:347 lib/signature.c:445 +#: lib/signature.c:353 lib/signature.c:451 msgid "unable to read the signature\n" msgstr "kan inte läsa signaturen\n" -#: lib/signature.c:352 +#: lib/signature.c:358 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "Fick %d byte PGP-signatur\n" -#: lib/signature.c:419 +#: lib/signature.c:425 msgid "gpg failed\n" msgstr "gpg misslyckades\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:426 +#: lib/signature.c:432 msgid "gpg failed to write signature\n" msgstr "gpg kunde inte skriva signatur\n" -#: lib/signature.c:431 +#: lib/signature.c:437 #, c-format msgid "GPG sig size: %d\n" msgstr "GPG-signaturstorlek: %d\n" -#: lib/signature.c:450 +#: lib/signature.c:456 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "Fick %d byte GPG-signatur\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:707 lib/signature.c:758 +#: lib/signature.c:713 lib/signature.c:764 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "Felaktig %%_signature-spec i makrofil\n" -#: lib/signature.c:737 +#: lib/signature.c:743 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "Du måste sätta \"%%_gpg_name\" i din makrofil\n" -#: lib/signature.c:750 +#: lib/signature.c:756 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "Du måste sätta \"%%_pgp_name\" i din makrofil\n" -#: lib/signature.c:794 +#: lib/signature.c:800 #, fuzzy msgid "Header+Payload size: " msgstr "Huvudstorleken för stor" -#: lib/signature.c:830 +#: lib/signature.c:836 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:879 +#: lib/signature.c:885 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1066 +#: lib/signature.c:1072 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "hoppa över eventuella MD5-signaturer" -#: lib/signature.c:1176 +#: lib/signature.c:1182 msgid "Header " msgstr "" -#: lib/signature.c:1177 +#: lib/signature.c:1183 #, fuzzy msgid "V3 DSA signature: " msgstr "Ingen signatur\n" -#: lib/signature.c:1252 +#: lib/signature.c:1258 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1279 +#: lib/signature.c:1285 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1283 +#: lib/signature.c:1289 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n" @@ -2833,12 +2833,12 @@ msgstr "Ouppfyllda beroenden för %s-%s-%s: " msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "%s-%s-%s: kontrollsumma för oföränderlig huvudregion misslyckades\n" -#: rpmdb/db1.c:98 rpmdb/db3.c:100 +#: rpmdb/db1.c:98 rpmdb/db3.c:98 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "db%d-fel(%d) från %s: %s\n" -#: rpmdb/db1.c:101 rpmdb/db3.c:103 +#: rpmdb/db1.c:101 rpmdb/db3.c:101 #, c-format msgid "db%d error(%d): %s\n" msgstr "db%d-fel(%d): %s\n" @@ -2881,70 +2881,70 @@ msgstr "öppnar db-fil %s rättighet 0x%x\n" msgid "cannot get %s lock on database\n" msgstr "kan inte få %s lås på databas\n" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "exclusive" msgstr "uteslutande" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "shared" msgstr "delat" -#: rpmdb/db3.c:129 +#: rpmdb/db3.c:127 #, c-format msgid "closed db environment %s/%s\n" msgstr "stängde db-miljö %s/%s\n" -#: rpmdb/db3.c:147 +#: rpmdb/db3.c:145 #, c-format msgid "removed db environment %s/%s\n" msgstr "tog bort db-miljö %s/%s\n" -#: rpmdb/db3.c:187 +#: rpmdb/db3.c:185 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "öppnar db-miljö %s/%s %s\n" -#: rpmdb/db3.c:711 +#: rpmdb/db3.c:614 #, c-format msgid "closed db index %s/%s\n" msgstr "stängde db-index %s/%s\n" -#: rpmdb/db3.c:778 +#: rpmdb/db3.c:681 #, c-format msgid "verified db index %s/%s\n" msgstr "verifierade db-index %s/%s\n" -#: rpmdb/db3.c:1001 +#: rpmdb/db3.c:903 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "öppnar db-index %s/%s %s rättighet=0x%x\n" -#: rpmdb/db3.c:1226 +#: rpmdb/db3.c:1119 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "kan inte få %s lås på %s/%s\n" -#: rpmdb/db3.c:1232 +#: rpmdb/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "låste db-index %s/%s\n" -#: rpmdb/dbconfig.c:404 +#: rpmdb/dbconfig.c:400 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "okänd db-flagga: \"%s\" ignorerad\n" -#: rpmdb/dbconfig.c:442 +#: rpmdb/dbconfig.c:438 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s har ogiltigt ogiltigt numeriskt värde, hoppar över\n" -#: rpmdb/dbconfig.c:451 +#: rpmdb/dbconfig.c:447 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s har för stort eller för litet \"long\"-värde, hoppar över\n" -#: rpmdb/dbconfig.c:460 +#: rpmdb/dbconfig.c:456 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "%s har för stort eller för litet heltalsvärde, hoppar över\n" @@ -3057,157 +3057,149 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "generera huvuden kompatibla med (äldre) rpm[23]-paketering" #. @-modfilesys@ -#: rpmdb/rpmdb.c:163 +#: rpmdb/rpmdb.c:165 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: okänt taggnamn: \"%s\" ignorerat\n" -#: rpmdb/rpmdb.c:440 +#: rpmdb/rpmdb.c:258 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "kan inte öppna %s-indexet med db%d - %s (%d)\n" -#: rpmdb/rpmdb.c:462 +#: rpmdb/rpmdb.c:280 #, c-format msgid "cannot open %s index\n" msgstr "kan inte öppna %s-indexet\n" -#: rpmdb/rpmdb.c:554 +#: rpmdb/rpmdb.c:379 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "fel(%d) när \"%s\"-poster hämtades från %s-indexet\n" -#: rpmdb/rpmdb.c:685 +#: rpmdb/rpmdb.c:516 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "fel(%d) när post %s sparades i %s\n" -#: rpmdb/rpmdb.c:695 +#: rpmdb/rpmdb.c:529 #, c-format msgid "error(%d) removing record %s from %s\n" msgstr "fel(%d) när post %s togs bort ur %s\n" -#: rpmdb/rpmdb.c:954 +#: rpmdb/rpmdb.c:788 msgid "no dbpath has been set\n" msgstr "ingen dbpath har satts\n" -#: rpmdb/rpmdb.c:1102 -msgid "" -"old format database is present; use --rebuilddb to generate a new format " -"database\n" -msgstr "" -"databas i gammalt format finns; använd --rebuilddb för att skapa en databas " -"i nytt format\n" - #. error -#: rpmdb/rpmdb.c:1367 +#: rpmdb/rpmdb.c:1174 #, c-format msgid "error(%d) counting packages\n" msgstr "fel(%d) när paket räknades\n" -#: rpmdb/rpmdb.c:2146 rpmdb/rpmdb.c:3507 +#: rpmdb/rpmdb.c:1971 rpmdb/rpmdb.c:3357 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "post nummer %u i databasen är felaktig -- hoppar över.\n" -#: rpmdb/rpmdb.c:2199 +#: rpmdb/rpmdb.c:2034 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "rpmdb: skadad huvudinstans #%u hämtad, hoppar över.\n" -#: rpmdb/rpmdb.c:2478 +#: rpmdb/rpmdb.c:2306 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: kan inte läsa huvud vid 0x%x\n" -#: rpmdb/rpmdb.c:2639 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "tar bort \"%s\" från %s-indexet.\n" -#: rpmdb/rpmdb.c:2643 +#: rpmdb/rpmdb.c:2476 #, c-format msgid "removing %d entries from %s index.\n" msgstr "tar bort %d poster från %s-indexet.\n" -#: rpmdb/rpmdb.c:2813 +#: rpmdb/rpmdb.c:2663 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "fel(%d) vid allokering av ny paketinstans\n" -#: rpmdb/rpmdb.c:3008 +#: rpmdb/rpmdb.c:2858 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "lägger till \"%s\" till %s-indexet.\n" -#: rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:2862 #, c-format msgid "adding %d entries to %s index.\n" msgstr "lägger till %d poster till %s-indexet.\n" -#: rpmdb/rpmdb.c:3393 +#: rpmdb/rpmdb.c:3243 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "tar bort %s efter lyckad db3-ombyggnad.\n" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3276 msgid "no dbpath has been set" msgstr "ingen dbpath har satts" -#: rpmdb/rpmdb.c:3453 +#: rpmdb/rpmdb.c:3303 #, c-format msgid "rebuilding database %s into %s\n" msgstr "bygger om databas %s till %s\n" -#: rpmdb/rpmdb.c:3457 +#: rpmdb/rpmdb.c:3307 #, c-format msgid "temporary database %s already exists\n" msgstr "tillfällig databas %s existerar redan\n" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3313 #, c-format msgid "creating directory %s\n" msgstr "skapar katalog %s\n" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3315 #, c-format msgid "creating directory %s: %s\n" msgstr "skapar katalog %s: %s\n" -#: rpmdb/rpmdb.c:3472 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "opening old database with dbapi %d\n" msgstr "öppnar gammal databas med dbapi %d\n" -#: rpmdb/rpmdb.c:3483 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "opening new database with dbapi %d\n" msgstr "öppnar ny databas med dbapi %d\n" -#: rpmdb/rpmdb.c:3547 +#: rpmdb/rpmdb.c:3397 #, c-format msgid "cannot add record originally at %u\n" msgstr "kan inte lägga till post ursprungligen vid %u\n" -#: rpmdb/rpmdb.c:3565 +#: rpmdb/rpmdb.c:3415 msgid "failed to rebuild database: original database remains in place\n" msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n" -#: rpmdb/rpmdb.c:3573 +#: rpmdb/rpmdb.c:3423 msgid "failed to replace old database with new database!\n" msgstr "kunde inte ersätta gammal databas med ny databas!\n" -#: rpmdb/rpmdb.c:3575 +#: rpmdb/rpmdb.c:3425 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "byt ut filer i %s med filer från %s för att återställa" -#: rpmdb/rpmdb.c:3585 +#: rpmdb/rpmdb.c:3435 #, c-format msgid "removing directory %s\n" msgstr "tar bort katalog %s\n" -#: rpmdb/rpmdb.c:3587 +#: rpmdb/rpmdb.c:3437 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "kunde inte ta bort katalogen %s: %s\n" @@ -3419,6 +3411,13 @@ msgstr "url-port måste vara ett tal\n" msgid "failed to create %s: %s\n" msgstr "kunde inte skapa %s: %s\n" +#~ msgid "" +#~ "old format database is present; use --rebuilddb to generate a new format " +#~ "database\n" +#~ msgstr "" +#~ "databas i gammalt format finns; använd --rebuilddb för att skapa en " +#~ "databas i nytt format\n" + #, fuzzy #~ msgid "don't verify signature(s)" #~ msgstr "verifiera inte sökvägen i symboliska länkar" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-14 17:43-0400\n" +"POT-Creation-Date: 2002-05-01 18:05-0400\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n" "Language-Team: Turkish <tr@li.org>\n" @@ -115,7 +115,7 @@ msgstr "<kmt>" msgid "use <dir> as the top level directory" msgstr "Üst düzey dizin olarak <dizin> kullanýlýr" -#: rpmqv.c:125 lib/poptI.c:219 +#: rpmqv.c:125 lib/poptI.c:215 msgid "<dir>" msgstr "<dizin>" @@ -1453,52 +1453,52 @@ msgstr " baþarýsýz - " msgid "package %s was already added, replacing with %s\n" msgstr "%s zaten kurulu" -#: lib/depends.c:367 +#: lib/depends.c:380 msgid "(cached)" msgstr "" -#: lib/depends.c:392 +#: lib/depends.c:405 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s EVET (rpmrc saðlar)\n" -#: lib/depends.c:408 +#: lib/depends.c:421 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s EVET (rpmlib saðlar)\n" -#: lib/depends.c:429 +#: lib/depends.c:442 #, fuzzy msgid "(db files)" msgstr "db dosyasý %s hatalý\n" -#: lib/depends.c:441 +#: lib/depends.c:454 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s EVET (db saðlar)\n" -#: lib/depends.c:454 +#: lib/depends.c:467 #, fuzzy msgid "(db package)" msgstr "paket yok\n" -#: lib/depends.c:762 +#: lib/depends.c:783 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:882 +#: lib/depends.c:903 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort baðýntýlarýndan %s-%s-%s \"%s\" kaldýrýlýyor\n" #. Record all relations. -#: lib/depends.c:1150 +#: lib/depends.c:1171 msgid "========== recording tsort relations\n" msgstr "========== tsort baðýntýlarý kaydediliyor\n" #. T4. Scan for zeroes. -#: lib/depends.c:1256 +#: lib/depends.c:1277 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1506,26 +1506,26 @@ msgid "" msgstr "" "========== paketler tsort'lanýyor (sýra, #öncüller, #ardýllar, derinlik)\n" -#: lib/depends.c:1349 +#: lib/depends.c:1370 msgid "========== successors only (presentation order)\n" msgstr "========== sadece ardýllar (sunum sýrasý)\n" -#: lib/depends.c:1419 +#: lib/depends.c:1440 msgid "LOOP:\n" msgstr "ÇEVRÝM:\n" -#: lib/depends.c:1454 +#: lib/depends.c:1475 msgid "========== continuing tsort ...\n" msgstr "========== tsort sürüyor ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1459 +#: lib/depends.c:1480 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2978 rpmdb/header.c:2999 rpmdb/header.c:3021 +#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 msgid "(not a number)" msgstr "(bir sayý deðil)" @@ -1664,36 +1664,36 @@ msgstr "" msgid "%s: Fread failed: %s\n" msgstr "%s: Fread baþarýsýz: %s\n" -#: lib/poptI.c:53 +#: lib/poptI.c:49 msgid "exclude paths must begin with a /" msgstr "dýþlanan dosya yolu / ile baþlamalý" -#: lib/poptI.c:65 +#: lib/poptI.c:61 msgid "relocations must begin with a /" msgstr "yeniden konumlandýrma iþlemleri / ile baþlamalý" -#: lib/poptI.c:67 +#: lib/poptI.c:63 msgid "relocations must contain a =" msgstr "yeniden konumlandýrma iþlemleri = içermelidir" -#: lib/poptI.c:70 +#: lib/poptI.c:66 msgid "relocations must have a / following the =" msgstr "yeniden konumlandýrma için = den sonra bir / gerekir" -#: lib/poptI.c:84 +#: lib/poptI.c:80 msgid "rollback takes a time/date stamp argument" msgstr "" -#: lib/poptI.c:91 +#: lib/poptI.c:87 #, fuzzy msgid "malformed rollback time/date stamp argument" msgstr "tekrarlama zamaný bozuk" -#: lib/poptI.c:110 +#: lib/poptI.c:106 msgid "install all files, even configurations which might otherwise be skipped" msgstr "yapýlandýrmalarda atlanmýþ bile olsa tüm dosyalarý kurar" -#: lib/poptI.c:114 +#: lib/poptI.c:110 msgid "" "remove all packages which match <package> (normally an error is generated if " "<package> specified multiple packages)" @@ -1701,148 +1701,148 @@ msgstr "" "<paket> ile eþlenen tüm paketleri kaldýrýr(<paket> ile çok sayýda paket " "belirtilmiþse normalde bir hata oluþur)" -#: lib/poptI.c:120 lib/poptI.c:175 +#: lib/poptI.c:116 lib/poptI.c:171 msgid "do not execute package scriptlet(s)" msgstr "paket betikleri çalýþtýrýlmaz" -#: lib/poptI.c:124 +#: lib/poptI.c:120 msgid "relocate files in non-relocateable package" msgstr "yeniden konumlanamayan paketin dosyalarýný yeniden konumlandýrýr" -#: lib/poptI.c:127 +#: lib/poptI.c:123 msgid "save erased package files by renaming into sub-directory" msgstr "" "ismi deðiþtirilerek alt dizine kaydedilmek suretiyle silinen dosyalarý " "kaydeder" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "erase (uninstall) package" msgstr "paketi kaldýrýr" -#: lib/poptI.c:130 +#: lib/poptI.c:126 msgid "<package>+" msgstr "<paket>+" -#: lib/poptI.c:133 +#: lib/poptI.c:129 msgid "do not install documentation" msgstr "belgeleri kurmaz" -#: lib/poptI.c:135 +#: lib/poptI.c:131 msgid "skip files with leading component <path> " msgstr "<dosyayolu> ile baþlayan dosyalarý atlar " -#: lib/poptI.c:136 +#: lib/poptI.c:132 msgid "<path>" msgstr "<dosyaYolu>" -#: lib/poptI.c:139 +#: lib/poptI.c:135 msgid "short hand for --replacepkgs --replacefiles" msgstr "--replacepkgs --replacefiles için kýsaltma" -#: lib/poptI.c:142 +#: lib/poptI.c:138 msgid "upgrade package(s) if already installed" msgstr "paket(ler) kurulu ise paket(ler)i günceller" -#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:240 +#: lib/poptI.c:139 lib/poptI.c:155 lib/poptI.c:236 msgid "<packagefile>+" msgstr "<paketDosyasý>+" -#: lib/poptI.c:145 +#: lib/poptI.c:141 msgid "print hash marks as package installs (good with -v)" msgstr "paketin kurulma sürecini gösteren imler basar (-v ile)" -#: lib/poptI.c:148 +#: lib/poptI.c:144 msgid "don't verify package architecture" msgstr "paket mimarisi denetlenmez" -#: lib/poptI.c:151 +#: lib/poptI.c:147 msgid "don't verify package operating system" msgstr "paketin ait olduðu iþletim sistemini doðrulamaz" -#: lib/poptI.c:154 +#: lib/poptI.c:150 msgid "don't check disk space before installing" msgstr "yüklemeden önce yeterli disk alaný kontrolu yapmaz" -#: lib/poptI.c:156 +#: lib/poptI.c:152 msgid "install documentation" msgstr "paket ile gelen belgeleri kurar" -#: lib/poptI.c:159 +#: lib/poptI.c:155 #, fuzzy msgid "install package(s)" msgstr "paketi kurar" -#: lib/poptI.c:161 +#: lib/poptI.c:157 msgid "update the database, but do not modify the filesystem" msgstr "veri tabanýný günceller, ama dosya sistemini deðiþtirmez" -#: lib/poptI.c:163 +#: lib/poptI.c:159 msgid "do not verify package dependencies" msgstr "paket baðýmlýlýklarýný denetlemez" -#: lib/poptI.c:166 +#: lib/poptI.c:162 msgid "do not reorder package installation to satisfy dependencies" msgstr "paket kurulum sýrasýný baðýmlýlýklara göre düzenlemez" -#: lib/poptI.c:171 +#: lib/poptI.c:167 msgid "do not suggest missing dependency resolution(s)" msgstr "" -#: lib/poptI.c:178 +#: lib/poptI.c:174 #, c-format msgid "do not execute %%pre scriptlet (if any)" msgstr "%%pre betiði (varsa) çalýþtýrýlmaz" -#: lib/poptI.c:181 +#: lib/poptI.c:177 #, c-format msgid "do not execute %%post scriptlet (if any)" msgstr "%%post betiði (varsa) çalýþtýrýlmaz" -#: lib/poptI.c:184 +#: lib/poptI.c:180 #, c-format msgid "do not execute %%preun scriptlet (if any)" msgstr "%%preun betiði (varsa) çalýþtýrýlmaz" -#: lib/poptI.c:187 +#: lib/poptI.c:183 #, c-format msgid "do not execute %%postun scriptlet (if any)" msgstr "%%postun betiði (varsa) çalýþtýrýlmaz" -#: lib/poptI.c:190 lib/poptQV.c:272 lib/poptQV.c:309 +#: lib/poptI.c:186 lib/poptQV.c:272 lib/poptQV.c:309 #, fuzzy msgid "don't verify package digest(s)" msgstr "dosyalarýn MD5 özümlemesi doðrulanmaz" -#: lib/poptI.c:192 lib/poptQV.c:275 lib/poptQV.c:311 +#: lib/poptI.c:188 lib/poptQV.c:275 lib/poptQV.c:311 #, fuzzy msgid "don't verify package signature(s)" msgstr "paket imzasýný denetler" -#: lib/poptI.c:196 +#: lib/poptI.c:192 msgid "do not execute any scriptlet(s) triggered by this package" msgstr "bu paket tarafýndan tetiklenen hiç bir betik çalýþtýrýlmaz" -#: lib/poptI.c:199 +#: lib/poptI.c:195 #, c-format msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "hiçbir %%triggerprein betiði çalýþtýrýlmaz" -#: lib/poptI.c:202 +#: lib/poptI.c:198 #, c-format msgid "do not execute any %%triggerin scriptlet(s)" msgstr "hiçbir %%triggerin betiði çalýþtýrýlmaz." -#: lib/poptI.c:205 +#: lib/poptI.c:201 #, c-format msgid "do not execute any %%triggerun scriptlet(s)" msgstr "hiçbir %%triggerun betiði çalýþtýrýlmaz." -#: lib/poptI.c:208 +#: lib/poptI.c:204 #, c-format msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "hiçbir %%triggerpostun betiði çalýþtýrýlmaz." -#: lib/poptI.c:212 +#: lib/poptI.c:208 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -1850,49 +1850,49 @@ msgstr "" "paketin eski bir sürüme güncellenmesini saðlar (--force ayný iþi otomatik " "yapar)" -#: lib/poptI.c:216 +#: lib/poptI.c:212 msgid "print percentages as package installs" msgstr "kurulumun geliþimi yüzde olarak gösterilir" -#: lib/poptI.c:218 +#: lib/poptI.c:214 msgid "relocate the package to <dir>, if relocatable" msgstr "eðer deðitirilebiliyorsa paketin yerini <dizin>'e deðiþtirir" -#: lib/poptI.c:221 +#: lib/poptI.c:217 msgid "relocate files from path <old> to <new>" msgstr "dosyalarý <eski> dizininden kaldýrýp <yeni> dizinine yerleþtirir" -#: lib/poptI.c:222 +#: lib/poptI.c:218 msgid "<old>=<new>" msgstr "<eski>=<yeni>" -#: lib/poptI.c:225 +#: lib/poptI.c:221 msgid "save erased package files by repackaging" msgstr "yeniden paketleme sýrasýnda silinen paket dosyalarýný kaydeder" -#: lib/poptI.c:228 +#: lib/poptI.c:224 msgid "install even if the package replaces installed files" msgstr "paket dosyalarý mevcut dosyalarla yer deðiþtirse bile paketi kurar" -#: lib/poptI.c:231 +#: lib/poptI.c:227 msgid "reinstall if the package is already present" msgstr "paketi yeniden kurar" -#: lib/poptI.c:233 +#: lib/poptI.c:229 #, fuzzy msgid "deinstall new, reinstall old, package(s), back to <date>" msgstr "" "yeni paket(ler) kaldýrýlýr, geriye dönük eski paket(ler) yeniden kurulur" -#: lib/poptI.c:234 +#: lib/poptI.c:230 msgid "<date>" msgstr "<tarih>" -#: lib/poptI.c:236 +#: lib/poptI.c:232 msgid "don't install, but tell if it would work or not" msgstr "yükleme yapmaz, sadece çalýþýp çalýþmayacaðýný belirtir" -#: lib/poptI.c:239 +#: lib/poptI.c:235 msgid "upgrade package(s)" msgstr "paket günceller" @@ -2288,96 +2288,96 @@ msgstr "(durumsuz) " msgid "package has neither file owner or id lists\n" msgstr "paket ne dosya sahibi ne de kimlik listesi içeriyor\n" -#: lib/query.c:463 +#: lib/query.c:464 #, c-format msgid "can't query %s: %s\n" msgstr "%s sorgulanamýyor: %s\n" -#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 +#: lib/query.c:618 lib/query.c:656 lib/rpminstall.c:352 lib/rpminstall.c:494 #: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "%s açýlamadý: %s\n" -#: lib/query.c:633 +#: lib/query.c:634 #, c-format msgid "query of %s failed\n" msgstr "%s 'nin sorgulamasý baþarýsýzlýkla sonuçlandý\n" -#: lib/query.c:639 +#: lib/query.c:640 msgid "old format source packages cannot be queried\n" msgstr "eski biçem kaynak paketleri sorgulanamaz\n" -#: lib/query.c:665 lib/rpminstall.c:507 +#: lib/query.c:666 lib/rpminstall.c:507 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: bildirge okuma baþarýsýz: %s\n" -#: lib/query.c:709 +#: lib/query.c:710 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "%s spec dosyasýnýn sorgulanmasý baþarýsýz, çözümlenemiyor\n" -#: lib/query.c:730 +#: lib/query.c:731 msgid "no packages\n" msgstr "paket yok\n" -#: lib/query.c:750 +#: lib/query.c:751 #, c-format msgid "group %s does not contain any packages\n" msgstr "%s grubu hiç paket içermiyor\n" -#: lib/query.c:760 +#: lib/query.c:761 #, c-format msgid "no package triggers %s\n" msgstr "%s tetikleyen paket yok\n" -#: lib/query.c:774 lib/query.c:796 lib/query.c:817 lib/query.c:852 +#: lib/query.c:775 lib/query.c:797 lib/query.c:818 lib/query.c:853 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "%s okunamadý: %s.\n" -#: lib/query.c:784 lib/query.c:802 lib/query.c:827 lib/query.c:857 +#: lib/query.c:785 lib/query.c:803 lib/query.c:828 lib/query.c:858 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "%s tetikleyen paket yok\n" -#: lib/query.c:868 +#: lib/query.c:869 #, c-format msgid "no package requires %s\n" msgstr "%s gerektiren paket yok\n" -#: lib/query.c:879 +#: lib/query.c:880 #, c-format msgid "no package provides %s\n" msgstr "%s saðlayan paket yok\n" -#: lib/query.c:913 +#: lib/query.c:914 #, c-format msgid "file %s: %s\n" msgstr "dosya %s: %s\n" -#: lib/query.c:917 +#: lib/query.c:918 #, c-format msgid "file %s is not owned by any package\n" msgstr "%s dosyasý, hiç bir pakete ait deðil\n" -#: lib/query.c:944 +#: lib/query.c:945 #, c-format msgid "invalid package number: %s\n" msgstr "geçersiz paket numarasý: %s\n" -#: lib/query.c:947 +#: lib/query.c:948 #, c-format msgid "package record number: %u\n" msgstr "paket kayýt numarasý: %u\n" -#: lib/query.c:952 +#: lib/query.c:953 #, c-format msgid "record %u could not be read\n" msgstr "%u. kayýt okunamadý\n" -#: lib/query.c:963 lib/rpminstall.c:675 +#: lib/query.c:964 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "%s paketi kurulu deðil\n" @@ -2686,140 +2686,140 @@ msgstr "%s okuma eriþimi için açýlamadý: %s.\n" msgid "cannot open Packages database in %s\n" msgstr "%s de Paket veritabaný açýlamadý\n" -#: lib/signature.c:123 +#: lib/signature.c:124 msgid "file is not regular -- skipping size check\n" msgstr "dosya normal deðil -- uzunluk denetimi atlanýyor\n" -#: lib/signature.c:132 +#: lib/signature.c:142 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "gereken boyut: %12d = (%d)uç+(%d)imza+(%d)iz+(%d)veri\n" -#: lib/signature.c:137 +#: lib/signature.c:147 #, c-format msgid " Actual size: %12d\n" msgstr " Gerçek boyut: %12d\n" -#: lib/signature.c:157 +#: lib/signature.c:167 msgid "No signature\n" msgstr "Ýmza yok\n" -#: lib/signature.c:161 +#: lib/signature.c:171 msgid "Old PGP signature\n" msgstr "Eski PGP imzasý\n" -#: lib/signature.c:172 +#: lib/signature.c:182 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "Eski imza !!! Bunu nasýl aldýn!?\n" -#: lib/signature.c:226 +#: lib/signature.c:232 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "Ýmza: boyut(%d)+iz(%d)\n" -#: lib/signature.c:305 lib/signature.c:402 lib/signature.c:669 -#: lib/signature.c:702 +#: lib/signature.c:311 lib/signature.c:408 lib/signature.c:675 +#: lib/signature.c:708 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "%s icra edilemedi: %s\n" -#: lib/signature.c:321 +#: lib/signature.c:327 msgid "pgp failed\n" msgstr "pgp hata verdi\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:328 +#: lib/signature.c:334 msgid "pgp failed to write signature\n" msgstr "pgp imzasýnýn yazýlmasý baþarýsýz\n" -#: lib/signature.c:333 +#: lib/signature.c:339 #, c-format msgid "PGP sig size: %d\n" msgstr "PGP imza uzunluðu: %d\n" -#: lib/signature.c:347 lib/signature.c:445 +#: lib/signature.c:353 lib/signature.c:451 msgid "unable to read the signature\n" msgstr "imza okunamadý\n" -#: lib/signature.c:352 +#: lib/signature.c:358 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "GPG imzasýnýn %d baytý alýndý\n" -#: lib/signature.c:419 +#: lib/signature.c:425 msgid "gpg failed\n" msgstr "gpg hata verdi\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:426 +#: lib/signature.c:432 msgid "gpg failed to write signature\n" msgstr "imzanýn yazýlmasý sýrasýnda gpg hata verdi\n" -#: lib/signature.c:431 +#: lib/signature.c:437 #, c-format msgid "GPG sig size: %d\n" msgstr "GPG imza uzunluðu: %d\n" -#: lib/signature.c:450 +#: lib/signature.c:456 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "GPG imzasýnýn %d baytý alýndý\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:707 lib/signature.c:758 +#: lib/signature.c:713 lib/signature.c:764 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "Makro dosyasýnda %%_signature spec geçersiz\n" -#: lib/signature.c:737 +#: lib/signature.c:743 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "Makro dosyanýzda \"%%_pgp_name\" tanýmlanmýþ olmalý\n" -#: lib/signature.c:750 +#: lib/signature.c:756 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "Makro dosyanýzda \"%%_pgp_name\" belirtmelisiniz\n" -#: lib/signature.c:794 +#: lib/signature.c:800 #, fuzzy msgid "Header+Payload size: " msgstr "Baþlýk çok uzun" -#: lib/signature.c:830 +#: lib/signature.c:836 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:879 +#: lib/signature.c:885 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1066 +#: lib/signature.c:1072 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "tüm MD5 imzalarýný atlar" -#: lib/signature.c:1176 +#: lib/signature.c:1182 msgid "Header " msgstr "" -#: lib/signature.c:1177 +#: lib/signature.c:1183 #, fuzzy msgid "V3 DSA signature: " msgstr "Ýmza yok\n" -#: lib/signature.c:1252 +#: lib/signature.c:1258 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1279 +#: lib/signature.c:1285 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1283 +#: lib/signature.c:1289 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Ýmza: boyut(%d)+iz(%d)\n" @@ -2854,12 +2854,12 @@ msgstr "%s-%s-%s için tatmin edici olmayan baðýmlýlýklar: " msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "%s-%s-%s: deðiþmez baþlýk alaný özet denetimi baþarýsýz\n" -#: rpmdb/db1.c:98 rpmdb/db3.c:100 +#: rpmdb/db1.c:98 rpmdb/db3.c:98 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "db%d hata(%d) %s'den: %s\n" -#: rpmdb/db1.c:101 rpmdb/db3.c:103 +#: rpmdb/db1.c:101 rpmdb/db3.c:101 #, c-format msgid "db%d error(%d): %s\n" msgstr "db%d hata(%d): %s\n" @@ -2904,70 +2904,70 @@ msgstr "açýlan db dosyasý %s kip 0x%x\n" msgid "cannot get %s lock on database\n" msgstr "Veritabaný için %s kilit alýnamadý\n" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "exclusive" msgstr "baðdaþýk" -#: rpmdb/db1.c:573 rpmdb/db3.c:1228 +#: rpmdb/db1.c:573 rpmdb/db3.c:1121 msgid "shared" msgstr "paylaþýmlý" -#: rpmdb/db3.c:129 +#: rpmdb/db3.c:127 #, c-format msgid "closed db environment %s/%s\n" msgstr "kapandý db ortamý %s/%s\n" -#: rpmdb/db3.c:147 +#: rpmdb/db3.c:145 #, c-format msgid "removed db environment %s/%s\n" msgstr "silindi db ortamý %s/%s\n" -#: rpmdb/db3.c:187 +#: rpmdb/db3.c:185 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "açýlýyor db ortamý %s/%s %s\n" -#: rpmdb/db3.c:711 +#: rpmdb/db3.c:614 #, c-format msgid "closed db index %s/%s\n" msgstr "kapandý db endeks %s/%s\n" -#: rpmdb/db3.c:778 +#: rpmdb/db3.c:681 #, c-format msgid "verified db index %s/%s\n" msgstr "doðrulandý db endeks %s/%s\n" -#: rpmdb/db3.c:1001 +#: rpmdb/db3.c:903 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "açýlýyor db endeks %s/%s %s kip=0x%x\n" -#: rpmdb/db3.c:1226 +#: rpmdb/db3.c:1119 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "%s kilit %s/%s'den alýnamadý\n" -#: rpmdb/db3.c:1232 +#: rpmdb/db3.c:1125 #, c-format msgid "locked db index %s/%s\n" msgstr "kilitli db endeks %s/%s\n" -#: rpmdb/dbconfig.c:404 +#: rpmdb/dbconfig.c:400 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "tanýnmayan db seçeneði: \"%s\" yoksayýldý\n" -#: rpmdb/dbconfig.c:442 +#: rpmdb/dbconfig.c:438 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s geçersiz sayýsal deðer içeriyor, atlandý\n" -#: rpmdb/dbconfig.c:451 +#: rpmdb/dbconfig.c:447 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s ya çok büyük ya da çok küçük 'long' deðer içeriyor, atlandý\n" -#: rpmdb/dbconfig.c:460 +#: rpmdb/dbconfig.c:456 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "%s ya çok büyük ya da çok küçük 'integer' deðer içeriyor, atlandý\n" @@ -3079,159 +3079,151 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "(eski) rpm[23] paketleme ile uyumlu baþlýklarý üretir" #. @-modfilesys@ -#: rpmdb/rpmdb.c:163 +#: rpmdb/rpmdb.c:165 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: tanýmlanmamýþ etiket adý: \"%s\" yoksayýldý\n" -#: rpmdb/rpmdb.c:440 +#: rpmdb/rpmdb.c:258 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "%s indeksi db%d - %s (%d) kullanarak açýlamadý\n" -#: rpmdb/rpmdb.c:462 +#: rpmdb/rpmdb.c:280 #, c-format msgid "cannot open %s index\n" msgstr "%s indeksi açýlamadý\n" -#: rpmdb/rpmdb.c:554 +#: rpmdb/rpmdb.c:379 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "hata(%d): \"%s\" kayýt %s indeksinden alýnýyor\n" -#: rpmdb/rpmdb.c:685 +#: rpmdb/rpmdb.c:516 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n" -#: rpmdb/rpmdb.c:695 +#: rpmdb/rpmdb.c:529 #, c-format msgid "error(%d) removing record %s from %s\n" msgstr "hata(%d) %s kaydýn %s dosyasýndan silinmesi\n" -#: rpmdb/rpmdb.c:954 +#: rpmdb/rpmdb.c:788 msgid "no dbpath has been set\n" msgstr "belirtilmiþ bir dbpath deðeri yok\n" -#: rpmdb/rpmdb.c:1102 -msgid "" -"old format database is present; use --rebuilddb to generate a new format " -"database\n" -msgstr "" -"veritabaný eski sürüme ait; yeni sürüm bir veritabaný oluþturmak için --" -"rebuilddb kullanýn\n" - #. error -#: rpmdb/rpmdb.c:1367 +#: rpmdb/rpmdb.c:1174 #, c-format msgid "error(%d) counting packages\n" msgstr "paketler taranýrken hata(%d)\n" -#: rpmdb/rpmdb.c:2146 rpmdb/rpmdb.c:3507 +#: rpmdb/rpmdb.c:1971 rpmdb/rpmdb.c:3357 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "veritabanýndaki %u. kayýt hatalý -- atlanýyor\n" -#: rpmdb/rpmdb.c:2199 +#: rpmdb/rpmdb.c:2034 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "rpmdb: bozuk baþlýk örneði #%u alýndý, atlanýyor.\n" -#: rpmdb/rpmdb.c:2478 +#: rpmdb/rpmdb.c:2306 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: 0x%x de baþlýk okunamadý\n" -#: rpmdb/rpmdb.c:2639 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "\"%s\" %s indeksinden siliniyor.\n" -#: rpmdb/rpmdb.c:2643 +#: rpmdb/rpmdb.c:2476 #, c-format msgid "removing %d entries from %s index.\n" msgstr "%d girdi %s indeksinden siliniyor.\n" -#: rpmdb/rpmdb.c:2813 +#: rpmdb/rpmdb.c:2663 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "yeni paket örneðini tutma hatasý(%d)\n" -#: rpmdb/rpmdb.c:3008 +#: rpmdb/rpmdb.c:2858 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "\"%s\" %s indeksine ekleniyor.\n" -#: rpmdb/rpmdb.c:3012 +#: rpmdb/rpmdb.c:2862 #, c-format msgid "adding %d entries to %s index.\n" msgstr "%d girdi %s indeksine ekleniyor.\n" -#: rpmdb/rpmdb.c:3393 +#: rpmdb/rpmdb.c:3243 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "baþarýlý db3 yeniden oluþturma ertesinde %s kaldýrýlýyor\n" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3276 msgid "no dbpath has been set" msgstr "belirtilmiþ bir dbpath yok" -#: rpmdb/rpmdb.c:3453 +#: rpmdb/rpmdb.c:3303 #, c-format msgid "rebuilding database %s into %s\n" msgstr "%s veritabaný %s içinde yeniden oluþturuluyor\n" -#: rpmdb/rpmdb.c:3457 +#: rpmdb/rpmdb.c:3307 #, c-format msgid "temporary database %s already exists\n" msgstr "geçici veritabaný %s zaten mevcut\n" -#: rpmdb/rpmdb.c:3463 +#: rpmdb/rpmdb.c:3313 #, c-format msgid "creating directory %s\n" msgstr "%s dizini oluþturuluyor\n" -#: rpmdb/rpmdb.c:3465 +#: rpmdb/rpmdb.c:3315 #, c-format msgid "creating directory %s: %s\n" msgstr "%s dizini oluþturuluyor: %s\n" -#: rpmdb/rpmdb.c:3472 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "opening old database with dbapi %d\n" msgstr "eski veritabaný dbapi %d ile açýlýyor\n" -#: rpmdb/rpmdb.c:3483 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "opening new database with dbapi %d\n" msgstr "yeni veritabaný dbapi %d ile açýlýyor\n" -#: rpmdb/rpmdb.c:3547 +#: rpmdb/rpmdb.c:3397 #, c-format msgid "cannot add record originally at %u\n" msgstr "kayýt özgün olarak %u e eklenemedi\n" -#: rpmdb/rpmdb.c:3565 +#: rpmdb/rpmdb.c:3415 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "veritabaný yeniden oluþturulamadý: mevcut veritabaný deðiþmeden\n" "yerinde býrakýldý\n" -#: rpmdb/rpmdb.c:3573 +#: rpmdb/rpmdb.c:3423 msgid "failed to replace old database with new database!\n" msgstr "eski veritabanýnýn yenisiyle deðiþtirilirmesi baþarýsýz!\n" -#: rpmdb/rpmdb.c:3575 +#: rpmdb/rpmdb.c:3425 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "kurtarmak için %s içindeki dosyalar %s deki dosyalarla deðiþtiriliyor" -#: rpmdb/rpmdb.c:3585 +#: rpmdb/rpmdb.c:3435 #, c-format msgid "removing directory %s\n" msgstr "%s dizini siliniyor\n" -#: rpmdb/rpmdb.c:3587 +#: rpmdb/rpmdb.c:3437 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "%s dizininin silinmesi baþarýsýz: %s\n" @@ -3443,6 +3435,13 @@ msgstr "url portu bir sayý olmalý\n" msgid "failed to create %s: %s\n" msgstr "%s oluþturulamadý: %s\n" +#~ msgid "" +#~ "old format database is present; use --rebuilddb to generate a new format " +#~ "database\n" +#~ msgstr "" +#~ "veritabaný eski sürüme ait; yeni sürüm bir veritabaný oluþturmak için --" +#~ "rebuilddb kullanýn\n" + #, fuzzy #~ msgid "don't verify signature(s)" #~ msgstr "dosyalarýn sembolik bað dosya yollarý doðrulanmaz" diff --git a/popt/.cvsignore b/popt/.cvsignore index 57687cd30..bfe95bdee 100644 --- a/popt/.cvsignore +++ b/popt/.cvsignore @@ -5,6 +5,7 @@ Doxyfile Makefile Makefile.in aclocal.m4 +autom4te-*.cache config.cache config.guess config.h @@ -14,10 +15,14 @@ config.status config.sub configure doxygen +depcomp +install-sh libtool ltconfig ltmain.sh +missing stamp-h +stamp-h1 stamp-h.in test1 test2 diff --git a/popt/acconfig.h b/popt/acconfig.h deleted file mode 100644 index 591a9c114..000000000 --- a/popt/acconfig.h +++ /dev/null @@ -1,32 +0,0 @@ -/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING - file accompanying popt source distributions, available from - ftp://ftp.rpm.org/pub/rpm/dist. */ - -/* acconfig.h - This file is in the public domain. - - Descriptive text for the C preprocessor macros that - the distributed Autoconf macros can define. - No software package will use all of them; autoheader copies the ones - your configure.in uses into your configuration header file templates. - - The entries are in sort -df order: alphabetical, case insensitive, - ignoring punctuation (such as underscores). Although this order - can split up related entries, it makes it easier to check whether - a given entry is in the file. - - Leave the following blank line there!! Autoheader needs it. */ - - -/* Define to 1 if ANSI function prototypes are usable. */ -#undef PROTOTYPES - -/* Absolute path to popt top_sourcedir. */ -#undef POPT_SOURCE_PATH - - -/* Leave that blank line there!! Autoheader needs it. - If you're adding to this file, keep in mind: - The entries are in sort -df order: alphabetical, case insensitive, - ignoring punctuation (such as underscores). */ - diff --git a/popt/autogen.sh b/popt/autogen.sh index 198b94b53..0ccf99700 100755 --- a/popt/autogen.sh +++ b/popt/autogen.sh @@ -9,7 +9,7 @@ cd "$srcdir" libtoolize --copy --force aclocal autoheader -automake +automake -a -c autoconf if [ "$1" = "--noconfigure" ]; then diff --git a/popt/configure.in b/popt/configure.in index b00ba2127..1cc70f6b4 100755 --- a/popt/configure.in +++ b/popt/configure.in @@ -1,6 +1,7 @@ AC_INIT(popt.h) AC_CANONICAL_SYSTEM AC_PREREQ(2.12) +AC_CONFIG_HEADERS AM_INIT_AUTOMAKE(popt, 1.7) AM_CONFIG_HEADER(config.h) @@ -80,7 +81,8 @@ AC_CHECK_FUNC(setreuid, [], [ AM_GNU_GETTEXT POPT_SOURCE_PATH="`pwd`" -AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH") +AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH", + [Full path to popt top_sourcedir.]) AC_SUBST(POPT_SOURCE_PATH) AC_OUTPUT([Doxyfile Makefile intl/Makefile po/Makefile.in]) diff --git a/popt/depcomp b/popt/depcomp deleted file mode 100755 index 65899658e..000000000 --- a/popt/depcomp +++ /dev/null @@ -1,411 +0,0 @@ -#! /bin/sh - -# depcomp - compile a program generating dependencies as side-effects -# Copyright 1999, 2000 Free Software Foundation, Inc. - -# 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, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# 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. - -# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>. - -if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -fi -# `libtool' can also be set to `yes' or `no'. - -depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`} -tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} - -rm -f "$tmpdepfile" - -# Some modes work just like other modes, but use different flags. We -# parameterize here, but still list the modes in the big case below, -# to make depend.m4 easier to write. Note that we *cannot* use a case -# here, because this file can only contain one case statement. -if test "$depmode" = hp; then - # HP compiler uses -M and no extra arg. - gccflag=-M - depmode=gcc -fi - -if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout -fi - -case "$depmode" in -gcc3) -## gcc 3 implements dependency tracking that does exactly what -## we want. Yay! Note: for some reason libtool 1.4 doesn't like -## it if -MD -MP comes after the -MF stuff. Hmm. - "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## There are various ways to get dependency output from gcc. Here's -## why we pick this rather obscure method: -## - Don't want to use -MD because we'd like the dependencies to end -## up in a subdir. Having to rename by hand is ugly. -## (We might end up doing this anyway to support other compilers.) -## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). -## - Using -M directly means running the compiler twice (even worse -## than renaming). - if test -z "$gccflag"; then - gccflag=-MD, - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. -## The problem is that when a header file which appears in a .P file -## is deleted, the dependency causes make to die (because there is -## typically no way to rebuild the header). We avoid this by adding -## dummy dependencies for each header file. Too bad gcc doesn't do -## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory -## that the space means something, we add a space to the output as -## well. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -sgi) - if test "$libtool" = yes; then - "$@" "-Wp,-MDupdate,$tmpdepfile" - else - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" - - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the - # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> $depfile - echo >> $depfile - - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -aix) - # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. This file always lives in the current directory. - # Also, the AIX compiler puts `$object:' at the start of each line; - # $object doesn't have directory information. - stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'` - tmpdepfile="$stripped.u" - outname="$stripped.o" - if test "$libtool" = yes; then - "$@" -Wc,-M - else - "$@" -M - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" - sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -tru64) - # The Tru64 AIX compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - - tmpdepfile1="$object.d" - tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` - if test "$libtool" = yes; then - "$@" -Wc,-MD - else - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" - exit $stat - fi - - if test -f "$tmpdepfile1"; then - tmpdepfile="$tmpdepfile1" - else - tmpdepfile="$tmpdepfile2" - fi - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a space and a tab in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -#nosideeffect) - # This comment above is used by automake to tell side-effect - # dependency tracking mechanisms from slower ones. - -dashmstdout) - # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - test -z "$dashmflag" && dashmflag=-M - ( IFS=" " - case " $* " in - *" --mode=compile "*) # this is libtool, let us make it quiet - for arg - do # cycle over the arguments - case "$arg" in - "--mode=compile") - # insert --quiet before "--mode=compile" - set fnord "$@" --quiet - shift # fnord - ;; - esac - set fnord "$@" "$arg" - shift # fnord - shift # "$arg" - done - ;; - esac - "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -dashXmstdout) - # This case only exists to satisfy depend.m4. It is never actually - # run, as this mode is specially recognized in the preamble. - exit 1 - ;; - -makedepend) - # X makedepend - ( - shift - cleared=no - for arg in "$@"; do - case $cleared in no) - set ""; shift - cleared=yes - esac - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift;; - -*) - ;; - *) - set fnord "$@" "$arg"; shift;; - esac - done - obj_suffix="`echo $object | sed 's/^.*\././'`" - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tail +3 "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" "$tmpdepfile".bak - ;; - -cpp) - # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - ( IFS=" " - case " $* " in - *" --mode=compile "*) - for arg - do # cycle over the arguments - case $arg in - "--mode=compile") - # insert --quiet before "--mode=compile" - set fnord "$@" --quiet - shift # fnord - ;; - esac - set fnord "$@" "$arg" - shift # fnord - shift # "$arg" - done - ;; - esac - "$@" -E | - sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - cat < "$tmpdepfile" >> "$depfile" - sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvisualcpp) - # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - ( IFS=" " - case " $* " in - *" --mode=compile "*) - for arg - do # cycle over the arguments - case $arg in - "--mode=compile") - # insert --quiet before "--mode=compile" - set fnord "$@" --quiet - shift # fnord - ;; - esac - set fnord "$@" "$arg" - shift # fnord - shift # "$arg" - done - ;; - esac - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -none) - exec "$@" - ;; - -*) - echo "Unknown depmode $depmode" 1>&2 - exit 1 - ;; -esac - -exit 0 diff --git a/popt/install-sh b/popt/install-sh deleted file mode 100755 index e9de23842..000000000 --- a/popt/install-sh +++ /dev/null @@ -1,251 +0,0 @@ -#!/bin/sh -# -# install - install a program, script, or datafile -# This comes from X11R5 (mit/util/scripts/install.sh). -# -# Copyright 1991 by the Massachusetts Institute of Technology -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of M.I.T. not be used in advertising or -# publicity pertaining to distribution of the software without specific, -# written prior permission. M.I.T. makes no representations about the -# suitability of this software for any purpose. It is provided "as is" -# without express or implied warranty. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. - - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -transformbasename="" -transform_arg="" -instcmd="$mvprog" -chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd="$cpprog" - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd="$stripprog" - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done - -if [ x"$src" = x ] -then - echo "install: no input file specified" - exit 1 -else - true -fi - -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d $dst ]; then - instcmd=: - chmodcmd="" - else - instcmd=mkdir - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f $src -o -d $src ] - then - true - else - echo "install: $src does not exist" - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "install: no destination specified" - exit 1 - else - true - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d $dst ] - then - dst="$dst"/`basename $src` - else - true - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' -' -IFS="${IFS-${defaultIFS}}" - -oIFS="${IFS}" -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS="${oIFS}" - -pathcomp='' - -while [ $# -ne 0 ] ; do - pathcomp="${pathcomp}${1}" - shift - - if [ ! -d "${pathcomp}" ] ; - then - $mkdirprog "${pathcomp}" - else - true - fi - - pathcomp="${pathcomp}/" -done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd $dst && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi -else - -# If we're going to rename the final executable, determine the name now. - - if [ x"$transformarg" = x ] - then - dstfile=`basename $dst` - else - dstfile=`basename $dst $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename $dst` - else - true - fi - -# Make a temp file name in the proper directory. - - dsttmp=$dstdir/#inst.$$# - -# Move or copy the file name to the temp name - - $doit $instcmd $src $dsttmp && - - trap "rm -f ${dsttmp}" 0 && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && - -# Now rename the file to the real destination. - - $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile - -fi && - - -exit 0 diff --git a/popt/missing b/popt/missing deleted file mode 100755 index 0a7fb5a2a..000000000 --- a/popt/missing +++ /dev/null @@ -1,283 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. -# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# 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, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# 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. - -if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 -fi - -run=: - -# 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 ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - ;; -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 "\ -$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. - -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' - 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 - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch]" - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.3 - GNU automake" - ;; - - -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 - ;; - - aclocal) - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. 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 missing on your system. 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 missing on your system. 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 - ;; - - automake) - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. 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 - ;; - - bison|yacc) - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. 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 - eval LASTARG="\${$#}" - case "$LASTARG" in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if [ ! -f y.tab.h ]; then - echo >y.tab.h - fi - if [ ! -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 - 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 - eval LASTARG="\${$#}" - case "$LASTARG" in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if [ ! -f lex.yy.c ]; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man) - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. 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 - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit 1 - fi - ;; - - 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 - 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'` - if test -z "$file"; then - file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` - fi - 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 - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar ${1+"$@"} && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar ${1+"$@"} && exit 0 - fi - firstarg="$1" - if shift; then - case "$firstarg" in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" ${1+"$@"} && exit 0 - ;; - esac - case "$firstarg" in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" ${1+"$@"} && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - 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 - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequirements 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 - -exit 0 diff --git a/python/Makefile.in b/python/Makefile.in index b7b07ca45..cf4fc6808 100644 --- a/python/Makefile.in +++ b/python/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +15,6 @@ @SET_MAKE@ # Makefile for rpm library. - SHELL = @SHELL@ srcdir = @srcdir@ @@ -45,9 +45,12 @@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -63,6 +66,10 @@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ @@ -81,7 +88,6 @@ DBLIBSRCS = @DBLIBSRCS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ -EXEEXT = @EXEEXT@ FINDPROVIDES = @FINDPROVIDES@ FINDREQUIRES = @FINDREQUIRES@ FIXPERMS = @FIXPERMS@ @@ -103,7 +109,6 @@ LIBDIR = @LIBDIR@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBMISC = @LIBMISC@ -LIBOBJS = @LIBOBJS@ LIBRPMALIAS_FILENAME = @LIBRPMALIAS_FILENAME@ LIBRPMRC_FILENAME = @LIBRPMRC_FILENAME@ LIBTOOL = @LIBTOOL@ @@ -117,7 +122,6 @@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PGPBIN = @PGPBIN@ POSUB = @POSUB@ @@ -256,9 +260,10 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/depcomp -@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/db-py.Plo $(DEPDIR)/hash.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/header-py.Plo $(DEPDIR)/poptmodule.Po \ -@AMDEP_TRUE@ $(DEPDIR)/rpmmodule.Plo $(DEPDIR)/upgrade.Plo +am__depfiles_maybe = depfiles +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/db-py.Plo ./$(DEPDIR)/hash.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/header-py.Plo ./$(DEPDIR)/poptmodule.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/rpmmodule.Plo ./$(DEPDIR)/upgrade.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ @@ -276,27 +281,17 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --foreign python/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) librpmmodule.la: $(librpmmodule_la_OBJECTS) $(librpmmodule_la_DEPENDENCIES) $(LINK) $(librpmmodule_la_LDFLAGS) $(librpmmodule_la_OBJECTS) $(librpmmodule_la_LIBADD) $(LIBS) +pythonPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-pythonPROGRAMS: $(python_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pythondir) @@ -305,9 +300,10 @@ install-pythonPROGRAMS: $(python_PROGRAMS) if test -f $$p \ || test -f $$p1 \ ; then \ + p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pythondir)/$$f"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pythondir)/$$f; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(pythonPROGRAMS_INSTALL) $$p $(DESTDIR)$(pythondir)/$$f"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(pythonPROGRAMS_INSTALL) $$p $(DESTDIR)$(pythondir)/$$f; \ else :; fi; \ done @@ -315,6 +311,7 @@ uninstall-pythonPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(python_PROGRAMS)'; for p in $$list; do \ f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$f" | sed -e 's,^.*/,,'`; \ echo " rm -f $(DESTDIR)$(pythondir)/$$f"; \ rm -f $(DESTDIR)$(pythondir)/$$f; \ done @@ -328,21 +325,21 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/db-py.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/hash.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/header-py.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/poptmodule.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rpmmodule.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/upgrade.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db-py.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/header-py.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/poptmodule.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpmmodule.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upgrade.Plo@am__quote@ distclean-depend: - -rm -rf $(DEPDIR) + -rm -rf ./$(DEPDIR) .c.o: @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< + $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @@ -354,42 +351,54 @@ distclean-depend: @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< CCDEPMODE = @CCDEPMODE@ + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool uninstall-info-am: +ETAGS = etags +ETAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - mkid -fID $$unique $(LISP) + mkid -fID $$unique TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique GTAGS: - here=`CDPATH=: && cd $(top_builddir) && pwd` \ + here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. @@ -397,14 +406,19 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -429,6 +443,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: diff --git a/rpm.spec b/rpm.spec deleted file mode 100644 index fb6db1d91..000000000 --- a/rpm.spec +++ /dev/null @@ -1,548 +0,0 @@ -%define with_python_subpackage 0%{nil} -%define with_python_version 2.2%{nil} -%define with_perl_subpackage 0 -%define with_bzip2 1%{nil} -%define with_apidocs 1%{nil} -%define with_internal_db 1%{nil} -%define strip_binaries 1 - -# XXX enable at your own risk, CDB access to rpmdb isn't cooked yet. -%define enable_cdb create cdb - -# XXX legacy requires './' payload prefix to be omitted from rpm packages. -%define _noPayloadPrefix 1 - -%define __prefix /usr -%{expand: %%define __share %(if [ -d %{__prefix}/share/man ]; then echo /share ; else echo %%{nil} ; fi)} - -Summary: The RPM package management system. -Name: rpm -%define version 4.1 -Version: %{version} -%{expand: %%define rpm_version %{version}} -Release: 0.08 -Group: System Environment/Base -Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz -Copyright: GPL -Conflicts: patch < 2.5 -%ifos linux -Prereq: gawk fileutils textutils mktemp shadow-utils -%endif -Requires: popt = 1.7 - -%if !%{with_internal_db} -BuildRequires: db3-devel - -# XXX glibc-2.1.92 has incompatible locale changes that affect statically -# XXX linked binaries like /bin/rpm. -%ifnarch ia64 -Requires: glibc >= 2.1.92 -%endif -%endif - -BuildRequires: zlib-devel -# XXX Red Hat 5.2 has not bzip2 or python -%if %{with_bzip2} -BuildRequires: bzip2 >= 0.9.0c-2 -%endif -%if %{with_python_subpackage} -BuildRequires: python-devel >= %{with_python_version} -%endif -%if %{with_perl_subpackage} -BuildRequires: perl >= 0:5.00503 -%endif - -BuildRoot: %{_tmppath}/%{name}-root - -%description -The RPM Package Manager (RPM) is a powerful command line driven -package management system capable of installing, uninstalling, -verifying, querying, and updating software packages. Each software -package consists of an archive of files along with information about -the package like its version, a description, etc. - -%package devel -Summary: Development files for manipulating RPM packages. -Group: Development/Libraries -Requires: rpm = %{rpm_version}, popt = 1.7 - -%description devel -This package contains the RPM C library and header files. These -development files will simplify the process of writing programs that -manipulate RPM packages and databases. These files are intended to -simplify the process of creating graphical package managers or any -other tools that need an intimate knowledge of RPM packages in order -to function. - -This package should be installed if you want to develop programs that -will manipulate RPM packages and databases. - -%package build -Summary: Scripts and executable programs used to build packages. -Group: Development/Tools -Requires: rpm = %{rpm_version} - -%description build -The rpm-build package contains the scripts and executable programs -that are used to build packages using the RPM Package Manager. - -%if %{with_python_subpackage} -%package python -Summary: Python bindings for apps which will manipulate RPM packages. -Group: Development/Libraries -Requires: rpm = %{rpm_version} -Requires: python >= %{with_python_version} -Requires: popt = 1.7 - -%description python -The rpm-python package contains a module that permits applications -written in the Python programming language to use the interface -supplied by RPM Package Manager libraries. - -This package should be installed if you want to develop Python -programs that will manipulate RPM packages and databases. -%endif - -%if %{with_perl_subpackage} -%package perl -Summary: Native bindings to the RPM API for Perl. -Group: Development/Languages -URL: http://www.cpan.org -Provides: perl(RPM::Database) = %{rpm_version} -Provides: perl(RPM::Header) = %{rpm_version} -Requires: rpm = %{rpm_version} -Requires: perl >= 0:5.00503 -Requires: popt = 1.7 -Obsoletes: perl-Perl-RPM - -%description perl -The Perl-RPM module is an attempt to provide Perl-level access to the -complete application programming interface that is a part of the Red -Hat Package Manager (RPM). Rather than have scripts rely on executing -RPM commands and parse the resulting output, this module aims to give -Perl programmers the ability to do anything that would otherwise have -been done in C or C++. - -The interface is being designed and laid out as a collection of -classes, at least some of which are also available as tied-hash -implementations. - -At this time, the interface only provides access to the database of -installed packages, and header data retrieval for RPM and SRPM files -is not yet installed. Error management and the export of most defined -constants, through RPM::Error and RPM::Constants, respectively, are -also available. - -%endif - -%package -n popt -Summary: A C library for parsing command line parameters. -Group: Development/Libraries -Version: 1.7 - -%description -n popt -Popt is a C library for parsing command line parameters. Popt was -heavily influenced by the getopt() and getopt_long() functions, but it -improves on them by allowing more powerful argument expansion. Popt -can parse arbitrary argv[] style arrays and automatically set -variables based on command line arguments. Popt allows command line -arguments to be aliased via configuration files and includes utility -functions for parsing arbitrary strings into argv[] arrays using -shell-like rules. - -%prep -%setup -q - -%build - -%ifos linux -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{__prefix} --sysconfdir=/etc --localstatedir=/var --infodir='${prefix}%{__share}/info' --mandir='${prefix}%{__share}/man' --with-python=%{with_python_version} --without-javaglue -%else -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{__prefix} -%endif - -# XXX workaround ia64 gcc-3.1-0.18 miscompilation -%ifarch ia64 -make CFLAGS="-g -O0 -DIA64_SUCKS_ROCKS" files.o files.lo -C build -%endif - -make - -%if %{with_perl_subpackage} -{ cd Perl-RPM - CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL RPM_BUILD=1 - export SUBDIR="%{_builddir}/%{buildsubdir}" - make INC="-I. -I$SUBDIR/lib -I$SUBDIR/rpmdb -I$SUBDIR/rpmio -I$SUBDIR/popt" \ - LDDLFLAGS="-shared -L$SUBDIR/lib/.libs -L$SUBDIR/rpmdb/.libs -L$SUBDIR/rpmio/.libs -L$SUBDIR/popt/.libs" %{?_smp_mflags} -} -%endif - -%install -rm -rf $RPM_BUILD_ROOT - -make DESTDIR="$RPM_BUILD_ROOT" install - -%ifos linux - -# Save list of packages through cron -mkdir -p ${RPM_BUILD_ROOT}/etc/cron.daily -install -m 755 scripts/rpm.daily ${RPM_BUILD_ROOT}/etc/cron.daily/rpm - -mkdir -p ${RPM_BUILD_ROOT}/etc/logrotate.d -install -m 644 scripts/rpm.log ${RPM_BUILD_ROOT}/etc/logrotate.d/rpm - -mkdir -p $RPM_BUILD_ROOT/etc/rpm -cat << E_O_F > $RPM_BUILD_ROOT/etc/rpm/macros.db1 -%%_dbapi 1 -E_O_F -cat << E_O_F > $RPM_BUILD_ROOT/etc/rpm/macros.cdb -%{?enable_cdb:#%%__dbi_cdb %{enable_cdb}} -E_O_F - -mkdir -p $RPM_BUILD_ROOT/var/lib/rpm -for dbi in \ - Basenames Conflictname Dirnames Group Installtid Name Providename \ - Provideversion Removetid Requirename Requireversion Triggername \ - Sigmd5 Sha1header Filemd5s Packages \ - __db.001 __db.002 __db.003 __db.004 __db.005 __db.006 __db.007 \ - __db.008 __db.009 -do - touch $RPM_BUILD_ROOT/var/lib/rpm/$dbi -done - -%endif - -%if %{with_apidocs} -gzip -9n apidocs/man/man*/* || : -%endif - -%if %{with_perl_subpackage} -{ cd Perl-RPM - eval `perl '-V:installsitearch'` - eval `perl '-V:installarchlib'` - mkdir -p $RPM_BUILD_ROOT/$installarchlib - make PREFIX=${RPM_BUILD_ROOT}%{__prefix} \ - INSTALLMAN1DIR=${RPM_BUILD_ROOT}%{__prefix}%{__share}/man/man1 \ - INSTALLMAN3DIR=${RPM_BUILD_ROOT}%{__prefix}%{__share}/man/man3 \ - install - rm -f $RPM_BUILD_ROOT/$installarchlib/perllocal.pod - rm -f $RPM_BUILD_ROOT/$installsitearch/auto/RPM/.packlist - cd .. -} -%endif - -%if %{strip_binaries} -{ cd $RPM_BUILD_ROOT - %{__strip} ./bin/rpm - %{__strip} .%{__prefix}/bin/rpm2cpio -} -%endif - -%clean -rm -rf $RPM_BUILD_ROOT - -%pre -%ifos linux -if [ -f /var/lib/rpm/Packages -a -f /var/lib/rpm/packages.rpm ]; then - echo " -You have both - /var/lib/rpm/packages.rpm db1 format installed package headers - /var/lib/rpm/Packages db3 format installed package headers -Please remove (or at least rename) one of those files, and re-install. -" - exit 1 -fi -/usr/sbin/groupadd -g 37 rpm > /dev/null 2>&1 -/usr/sbin/useradd -r -d /var/lib/rpm -u 37 -g 37 rpm > /dev/null 2>&1 -%endif -exit 0 - -%post -%ifos linux -/sbin/ldconfig -if [ -f /var/lib/rpm/packages.rpm ]; then - /bin/chown rpm.rpm /var/lib/rpm/*.rpm -elif [ -f /var/lib/rpm/Packages ]; then - # undo db1 configuration - rm -f /etc/rpm/macros.db1 - /bin/chown rpm.rpm /var/lib/rpm/[A-Z]* -else - # initialize db3 database - rm -f /etc/rpm/macros.db1 - /bin/rpm --initdb -fi -%endif -exit 0 - -%ifos linux -%postun -/sbin/ldconfig -if [ $1 = 0 ]; then - /usr/sbin/userdel rpm - /usr/sbin/groupdel rpm -fi - - -%post devel -p /sbin/ldconfig -%postun devel -p /sbin/ldconfig - -%post -n popt -p /sbin/ldconfig -%postun -n popt -p /sbin/ldconfig -%endif - -%if %{with_python_subpackage} -%post python -p /sbin/ldconfig -%postun python -p /sbin/ldconfig -%endif - -%define rpmattr %attr(0755, rpm, rpm) - -%files -%defattr(-,root,root) -%doc RPM-PGP-KEY RPM-GPG-KEY CHANGES GROUPS doc/manual/[a-z]* -%attr(0755, rpm, rpm) /bin/rpm - -%ifos linux -%config(noreplace,missingok) /etc/cron.daily/rpm -%config(noreplace,missingok) /etc/logrotate.d/rpm -%dir /etc/rpm -%config(noreplace,missingok) /etc/rpm/macros.* -%attr(0755, rpm, rpm) %dir /var/lib/rpm - -%define rpmdbattr %attr(0644, rpm, rpm) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) -%rpmdbattr /var/lib/rpm/Basenames -%rpmdbattr /var/lib/rpm/Conflictname -%rpmdbattr /var/lib/rpm/__db.0* -%rpmdbattr /var/lib/rpm/Dirnames -%rpmdbattr /var/lib/rpm/Filemd5s -%rpmdbattr /var/lib/rpm/Group -%rpmdbattr /var/lib/rpm/Installtid -%rpmdbattr /var/lib/rpm/Name -%rpmdbattr /var/lib/rpm/Packages -%rpmdbattr /var/lib/rpm/Providename -%rpmdbattr /var/lib/rpm/Provideversion -%rpmdbattr /var/lib/rpm/Removetid -%rpmdbattr /var/lib/rpm/Requirename -%rpmdbattr /var/lib/rpm/Requireversion -%rpmdbattr /var/lib/rpm/Sigmd5 -%rpmdbattr /var/lib/rpm/Sha1header -%rpmdbattr /var/lib/rpm/Triggername - -%endif - -%rpmattr %{__prefix}/bin/rpm2cpio -%rpmattr %{__prefix}/bin/gendiff -%rpmattr %{__prefix}/bin/rpmdb -#%rpmattr %{__prefix}/bin/rpm[eiu] -%rpmattr %{__prefix}/bin/rpmsign -%rpmattr %{__prefix}/bin/rpmquery -%rpmattr %{__prefix}/bin/rpmverify - -%{__prefix}/lib/librpm-4.1.so -%{__prefix}/lib/librpmdb-4.1.so -%{__prefix}/lib/librpmio-4.1.so -%{__prefix}/lib/librpmbuild-4.1.so - -%attr(0755, rpm, rpm) %dir %{__prefix}/lib/rpm -%rpmattr %{__prefix}/lib/rpm/config.guess -%rpmattr %{__prefix}/lib/rpm/config.sub -%rpmattr %{__prefix}/lib/rpm/convertrpmrc.sh -%attr(0644, rpm, rpm) %{__prefix}/lib/rpm/macros -%rpmattr %{__prefix}/lib/rpm/mkinstalldirs -%rpmattr %{__prefix}/lib/rpm/rpm.* -%rpmattr %{__prefix}/lib/rpm/rpm2cpio.sh -%rpmattr %{__prefix}/lib/rpm/rpm[deiukqv] -%attr(0644, rpm, rpm) %{__prefix}/lib/rpm/rpmpopt* -%attr(0644, rpm, rpm) %{__prefix}/lib/rpm/rpmrc - -%ifarch i386 i486 i586 i686 athlon -%attr(-, rpm, rpm) %{__prefix}/lib/rpm/i[3456]86* -%attr(-, rpm, rpm) %{__prefix}/lib/rpm/athlon* -%endif -%ifarch alpha alphaev5 alphaev56 alphapca56 alphaev6 alphaev67 -%attr(-, rpm, rpm) %{__prefix}/lib/rpm/alpha* -%endif -%ifarch sparc sparcv9 sparc64 -%attr(-, rpm, rpm) %{__prefix}/lib/rpm/sparc* -%endif -%ifarch ia64 -%attr(-, rpm, rpm) %{__prefix}/lib/rpm/ia64* -%endif -%ifarch powerpc ppc ppciseries ppcpseries ppcmac -%attr(-, rpm, rpm) %{__prefix}/lib/rpm/ppc* -%endif -%ifarch s390 s390x -%attr(-, rpm, rpm) %{__prefix}/lib/rpm/s390* -%endif -%ifarch armv3l armv4l -%attr(-, rpm, rpm) %{__prefix}/lib/rpm/armv[34][lb]* -%endif -%ifarch mips mipsel mipseb -%attr(-, rpm, rpm) %{__prefix}/lib/rpm/mips* -%endif -%attr(-, rpm, rpm) %{__prefix}/lib/rpm/noarch* - -%lang(cs) %{__prefix}/*/locale/cs/LC_MESSAGES/rpm.mo -%lang(da) %{__prefix}/*/locale/da/LC_MESSAGES/rpm.mo -%lang(de) %{__prefix}/*/locale/de/LC_MESSAGES/rpm.mo -%lang(fi) %{__prefix}/*/locale/fi/LC_MESSAGES/rpm.mo -%lang(fr) %{__prefix}/*/locale/fr/LC_MESSAGES/rpm.mo -%lang(is) %{__prefix}/*/locale/is/LC_MESSAGES/rpm.mo -%lang(ja) %{__prefix}/*/locale/ja/LC_MESSAGES/rpm.mo -%lang(ko) %{__prefix}/*/locale/ko/LC_MESSAGES/rpm.mo -%lang(no) %{__prefix}/*/locale/no/LC_MESSAGES/rpm.mo -%lang(pl) %{__prefix}/*/locale/pl/LC_MESSAGES/rpm.mo -%lang(pt) %{__prefix}/*/locale/pt/LC_MESSAGES/rpm.mo -%lang(pt_BR) %{__prefix}/*/locale/pt_BR/LC_MESSAGES/rpm.mo -%lang(ro) %{__prefix}/*/locale/ro/LC_MESSAGES/rpm.mo -%lang(ru) %{__prefix}/*/locale/ru/LC_MESSAGES/rpm.mo -%lang(sk) %{__prefix}/*/locale/sk/LC_MESSAGES/rpm.mo -%lang(sl) %{__prefix}/*/locale/sl/LC_MESSAGES/rpm.mo -%lang(sr) %{__prefix}/*/locale/sr/LC_MESSAGES/rpm.mo -%lang(sv) %{__prefix}/*/locale/sv/LC_MESSAGES/rpm.mo -%lang(tr) %{__prefix}/*/locale/tr/LC_MESSAGES/rpm.mo - -%{__prefix}%{__share}/man/man1/gendiff.1* -%{__prefix}%{__share}/man/man8/rpm.8* -%{__prefix}%{__share}/man/man8/rpm2cpio.8* -%lang(pl) %{__prefix}%{__share}/man/pl/man[18]/*.[18]* -%lang(ru) %{__prefix}%{__share}/man/ru/man[18]/*.[18]* -%lang(sk) %{__prefix}%{__share}/man/sk/man[18]/*.[18]* - -%files build -%defattr(-,root,root) -%dir %{__prefix}/src/redhat -%dir %{__prefix}/src/redhat/BUILD -%dir %{__prefix}/src/redhat/SPECS -%dir %{__prefix}/src/redhat/SOURCES -%dir %{__prefix}/src/redhat/SRPMS -%dir %{__prefix}/src/redhat/RPMS -%{__prefix}/src/redhat/RPMS/* -%rpmattr %{__prefix}/bin/rpmbuild -%rpmattr %{__prefix}/lib/rpm/brp-* -%rpmattr %{__prefix}/lib/rpm/check-prereqs -%rpmattr %{__prefix}/lib/rpm/config.site -%rpmattr %{__prefix}/lib/rpm/cpanflute -%rpmattr %{__prefix}/lib/rpm/cpanflute2 -%rpmattr %{__prefix}/lib/rpm/cross-build -%rpmattr %{__prefix}/lib/rpm/find-lang.sh -%rpmattr %{__prefix}/lib/rpm/find-prov.pl -%rpmattr %{__prefix}/lib/rpm/find-provides -%rpmattr %{__prefix}/lib/rpm/find-provides.perl -%rpmattr %{__prefix}/lib/rpm/find-req.pl -%rpmattr %{__prefix}/lib/rpm/find-requires -%rpmattr %{__prefix}/lib/rpm/find-requires.perl -%rpmattr %{__prefix}/lib/rpm/get_magic.pl -%rpmattr %{__prefix}/lib/rpm/getpo.sh -%rpmattr %{__prefix}/lib/rpm/http.req -%rpmattr %{__prefix}/lib/rpm/javadeps -%rpmattr %{__prefix}/lib/rpm/magic.prov -%rpmattr %{__prefix}/lib/rpm/magic.req -%rpmattr %{__prefix}/lib/rpm/perl.prov -%rpmattr %{__prefix}/lib/rpm/Specfile.pm - -# XXX remove executable bit to disable autogenerated perl requires for now. -%rpmattr %{__prefix}/lib/rpm/perl.req -#%attr(0644, rpm, rpm) %{__prefix}/lib/rpm/perl.req - -%rpmattr %{__prefix}/lib/rpm/rpm[bt] -%rpmattr %{__prefix}/lib/rpm/rpmdiff -%rpmattr %{__prefix}/lib/rpm/rpmdiff.cgi -%rpmattr %{__prefix}/lib/rpm/trpm -%rpmattr %{__prefix}/lib/rpm/u_pkg.sh -%rpmattr %{__prefix}/lib/rpm/vpkg-provides.sh -%rpmattr %{__prefix}/lib/rpm/vpkg-provides2.sh - -%{__prefix}%{__share}/man/man8/rpmbuild.8* - -%if %{with_python_subpackage} -%files python -%defattr(-,root,root) -%{__prefix}/lib/python%{with_python_version}/site-packages/rpmmodule.so -#%{__prefix}/lib/python%{with_python_version}/site-packages/poptmodule.so -%endif - -%if %{with_perl_subpackage} -%files perl -%defattr(-,root,root) -%rpmattr %{__prefix}/bin/rpmprune -%{perl_sitearch}/auto/* -%{perl_sitearch}/RPM -%{perl_sitearch}/RPM.pm -%{__prefix}%{__share}/man/man1/rpmprune.1* -%{__prefix}%{__share}/man/man3/RPM* -%endif - -%files devel -%defattr(-,root,root) -%if %{with_apidocs} -%doc apidocs -%endif -%{__prefix}/include/rpm -%{__prefix}/lib/librpm.a -%{__prefix}/lib/librpm.la -%{__prefix}/lib/librpm.so -%{__prefix}/lib/librpmdb.a -%{__prefix}/lib/librpmdb.la -%{__prefix}/lib/librpmdb.so -%{__prefix}/lib/librpmio.a -%{__prefix}/lib/librpmio.la -%{__prefix}/lib/librpmio.so -%{__prefix}/lib/librpmbuild.a -%{__prefix}/lib/librpmbuild.la -%{__prefix}/lib/librpmbuild.so - -%files -n popt -%defattr(-,root,root) -%{__prefix}/lib/libpopt.so.* -%{__prefix}%{__share}/man/man3/popt.3* -%lang(cs) %{__prefix}/*/locale/cs/LC_MESSAGES/popt.mo -%lang(da) %{__prefix}/*/locale/da/LC_MESSAGES/popt.mo -%lang(gl) %{__prefix}/*/locale/gl/LC_MESSAGES/popt.mo -%lang(hu) %{__prefix}/*/locale/hu/LC_MESSAGES/popt.mo -%lang(is) %{__prefix}/*/locale/is/LC_MESSAGES/popt.mo -%lang(ko) %{__prefix}/*/locale/ko/LC_MESSAGES/popt.mo -%lang(no) %{__prefix}/*/locale/no/LC_MESSAGES/popt.mo -%lang(pt) %{__prefix}/*/locale/pt/LC_MESSAGES/popt.mo -%lang(ro) %{__prefix}/*/locale/ro/LC_MESSAGES/popt.mo -%lang(ru) %{__prefix}/*/locale/ru/LC_MESSAGES/popt.mo -%lang(sk) %{__prefix}/*/locale/sk/LC_MESSAGES/popt.mo -%lang(sl) %{__prefix}/*/locale/sl/LC_MESSAGES/popt.mo -%lang(sv) %{__prefix}/*/locale/sv/LC_MESSAGES/popt.mo -%lang(tr) %{__prefix}/*/locale/tr/LC_MESSAGES/popt.mo -%lang(uk) %{__prefix}/*/locale/uk/LC_MESSAGES/popt.mo -%lang(wa) %{__prefix}/*/locale/wa/LC_MESSAGES/popt.mo -%lang(zh_CN) %{__prefix}/*/locale/zh_CN.GB2312/LC_MESSAGES/popt.mo - -# XXX These may end up in popt-devel but it hardly seems worth the effort now. -%{__prefix}/lib/libpopt.a -%{__prefix}/lib/libpopt.la -%{__prefix}/lib/libpopt.so -%{__prefix}/include/popt.h - -%changelog -* Sun Apr 14 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.08 -- use build time to choose one of multiple alternative suggestions. -- add --nosuggests to disable suggested resolutions. - -* Sat Apr 13 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.07 -- merge conflicts into problems, handle as transaction set variable. - -* Fri Apr 12 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.06 -- use rpmdb-redhat to suggest dependency resolution(s). - -* Thu Apr 11 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.05 -- rescusitate --rebuild. - -* Wed Apr 10 2002 Jeff Johnsion <jbj@redhat.com> 4.1-0.04 -- beecrypt: add types.h, eliminate need for config.gnu.h. - -* Sat Mar 16 2002 Jeff Johnson <jbj@redhat.com> -- *really* dump signature header immutable region. - -* Sun Mar 10 2002 Jeff Johnson <jbj@redhat.com> -- make --addsign and --resign behave exactly the same. -- splint annotationsm, signature cleanup. -- drill ts/fi through verify mode, add methods to keep fi abstract. -- use mmap when calculating file digests on verify, ~20% faster. -- permit --dbpath and --root with signature (i.e. --import) modes. diff --git a/rpm.spec.in b/rpm.spec.in index faf58a6d0..43eec9976 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -20,7 +20,7 @@ Name: rpm %define version @VERSION@ Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 0.08 +Release: 0.10 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Copyright: GPL @@ -196,7 +196,7 @@ cat << E_O_F > $RPM_BUILD_ROOT/etc/rpm/macros.db1 %%_dbapi 1 E_O_F cat << E_O_F > $RPM_BUILD_ROOT/etc/rpm/macros.cdb -%{?enable_cdb:#%%__dbi_cdb %{enable_cdb}} +%{?enable_cdb:%%__dbi_cdb %{enable_cdb}} E_O_F mkdir -p $RPM_BUILD_ROOT/var/lib/rpm @@ -521,8 +521,16 @@ fi %{__prefix}/include/popt.h %changelog +* Wed May 1 2002 Jeff Johnson <jbj@redhat.com> +- attempt to make peace with automake-1.6.1, autoconf-2.53. +- rip out two layers of dbN gook, internal Berkeley db is here to stay. + +* Fri Apr 19 2002 Jeff Johnson <jbj@redhat.com> +- fix: queries that evaluated to "" incorrectly returned NULL. +- fix: packages produced by rpm-4.0 dinna merge signature tags. + * Sun Apr 14 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.08 -- use build time to choose one of multiple alternative suggestions. +- use build time to choose one of multiple alternative suggestions. - add --nosuggests to disable suggested resolutions. * Sat Apr 13 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.07 @@ -542,7 +550,7 @@ fi * Sun Mar 10 2002 Jeff Johnson <jbj@redhat.com> - make --addsign and --resign behave exactly the same. -- splint annotationsm, signature cleanup. +- splint annotations, signature cleanup. - drill ts/fi through verify mode, add methods to keep fi abstract. - use mmap when calculating file digests on verify, ~20% faster. - permit --dbpath and --root with signature (i.e. --import) modes. diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am index dd14fc771..beb4b61d4 100644 --- a/rpmdb/Makefile.am +++ b/rpmdb/Makefile.am @@ -20,7 +20,7 @@ tjfn_LDFLAGS = -all-static tjfn_LDADD = librpmdb.la pkgincdir = $(pkgincludedir) -pkginc_HEADERS = header.h hdrinline.h rpmdb.h +pkginc_HEADERS = db.h header.h hdrinline.h rpmdb.h noinst_HEADERS = falloc.h fprint.h header_internal.h legacy.h rpmhash.h mylibpaths = \ @@ -68,7 +68,10 @@ tagtbl.c: $(top_srcdir)/lib/rpmlib.h @echo '/*@unchecked@*/' >> $@ @echo 'const int rpmTagTableSize = sizeof(rpmTagTbl) / sizeof(rpmTagTbl[0]) - 1;' >> $@ -.created: +db.h: + ln -sf ../$(WITH_DB_SUBDIR)/db.h $@ + +.created: db.h for lo in $(DB3LOBJS); do \ [ -f $$lo ] || $(LN_S) $(top_builddir)/$(WITH_DB_SUBDIR)/$$lo $$lo ; \ done diff --git a/rpmdb/db3.c b/rpmdb/db3.c index 56cbd5e99..83644011e 100644 --- a/rpmdb/db3.c +++ b/rpmdb/db3.c @@ -23,19 +23,17 @@ typedef int int32_t; /*@=redef@*/ #endif -#include <db3/db.h> - #include <rpmlib.h> #include <rpmmacro.h> #include <rpmurl.h> /* XXX urlPath proto */ -#include "rpmdb.h" +#include <rpmdb.h> #include "debug.h" -/*@access rpmdb@*/ -/*@access dbiIndex@*/ -/*@access dbiIndexSet@*/ +/*@access rpmdb @*/ +/*@access dbiIndex @*/ +/*@access dbiIndexSet @*/ /** \ingroup dbi * Hash database statistics. @@ -315,17 +313,6 @@ static int db3sync(dbiIndex dbi, unsigned int flags) return rc; } -static int db3c_del(dbiIndex dbi, DBC * dbcursor, u_int32_t flags) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/ -{ - int rc; - - rc = dbcursor->c_del(dbcursor, flags); - rc = cvtdberr(dbi, "dbcursor->c_del", rc, _debug); - return rc; -} - /*@unused@*/ static int db3c_dup(dbiIndex dbi, DBC * dbcursor, DBC ** dbcp, u_int32_t flags) /*@globals fileSystem @*/ @@ -341,43 +328,6 @@ static int db3c_del(dbiIndex dbi, DBC * dbcursor, u_int32_t flags) /*@=nullstate @*/ } -static int db3c_get(dbiIndex dbi, DBC * dbcursor, - DBT * key, DBT * data, u_int32_t flags) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/ -{ - int _printit; - int rc; - int rmw; - -#ifdef NOTYET - if ((dbi->dbi_eflags & DB_INIT_CDB) && !(dbi->dbi_oflags & DB_RDONLY)) - rmw = DB_RMW; - else -#endif - rmw = 0; - - rc = dbcursor->c_get(dbcursor, key, data, rmw | flags); - - /* XXX DB_NOTFOUND can be returned */ - _printit = (rc == DB_NOTFOUND ? 0 : _debug); - rc = cvtdberr(dbi, "dbcursor->c_get", rc, _printit); - return rc; -} - -static int db3c_put(dbiIndex dbi, DBC * dbcursor, - DBT * key, DBT * data, u_int32_t flags) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/ -{ - int rc; - - rc = dbcursor->c_put(dbcursor, key, data, flags); - - rc = cvtdberr(dbi, "dbcursor->c_put", rc, _debug); - return rc; -} - static inline int db3c_close(dbiIndex dbi, /*@only@*/ /*@null@*/ DBC * dbcursor) /*@globals fileSystem @*/ /*@modifies fileSystem @*/ @@ -391,13 +341,12 @@ static inline int db3c_close(dbiIndex dbi, /*@only@*/ /*@null@*/ DBC * dbcursor) return rc; } -static inline int db3c_open(dbiIndex dbi, /*@null@*/ /*@out@*/ DBC ** dbcp, - int dbiflags) +static inline int db3c_open(dbiIndex dbi, DB_TXN * txnid, + /*@null@*/ /*@out@*/ DBC ** dbcp, int dbiflags) /*@globals fileSystem @*/ /*@modifies *dbcp, fileSystem @*/ { DB * db = dbi->dbi_db; - DB_TXN * txnid = NULL; int flags; int rc; @@ -429,21 +378,13 @@ static int db3cclose(dbiIndex dbi, /*@only@*/ /*@null@*/ DBC * dbcursor, if (!dbi->dbi_use_cursors) return 0; - /*@-branchstate@*/ - if (dbcursor == NULL) - dbcursor = dbi->dbi_rmw; - /*@=branchstate@*/ if (dbcursor) { - /*@-branchstate@*/ - if (dbcursor == dbi->dbi_rmw) - dbi->dbi_rmw = NULL; - /*@=branchstate@*/ rc = db3c_close(dbi, dbcursor); } /*@-usereleased -compdef@*/ return rc; /*@=usereleased =compdef@*/ } -static int db3copen(dbiIndex dbi, +static int db3copen(dbiIndex dbi, DB_TXN * txnid, /*@null@*/ /*@out@*/ DBC ** dbcp, unsigned int flags) /*@globals fileSystem @*/ /*@modifies dbi, *dbcp, fileSystem @*/ @@ -453,84 +394,66 @@ static int db3copen(dbiIndex dbi, /* XXX per-iterator cursors */ if (flags & DBI_ITERATOR) - return db3c_open(dbi, dbcp, flags); + return db3c_open(dbi, txnid, dbcp, flags); if (!dbi->dbi_use_cursors) { if (dbcp) *dbcp = NULL; return 0; } - if ((dbcursor = dbi->dbi_rmw) == NULL) { - if ((rc = db3c_open(dbi, &dbcursor, flags)) == 0) - dbi->dbi_rmw = dbcursor; - } + rc = db3c_open(dbi, txnid, &dbcursor, flags); if (dbcp) - /*@-onlytrans@*/ *dbcp = dbi->dbi_rmw; /*@=onlytrans@*/ + /*@-onlytrans@*/ *dbcp = dbcursor; /*@=onlytrans@*/ return rc; } -static int db3cput(dbiIndex dbi, DBC * dbcursor, - const void * keyp, size_t keylen, - const void * datap, size_t datalen, - /*@unused@*/ unsigned int flags) +static int db3cput(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data) /*@globals fileSystem @*/ /*@modifies fileSystem @*/ { DB * db = dbi->dbi_db; - DB_TXN * txnid = NULL; - DBT key, data; int rc; - memset(&key, 0, sizeof(key)); - memset(&data, 0, sizeof(data)); - key.data = (void *)keyp; - key.size = keylen; - data.data = (void *)datap; - data.size = datalen; - if (dbcursor == NULL) { if (db == NULL) return -2; - rc = db->put(db, txnid, &key, &data, 0); + rc = db->put(db, dbi->dbi_txnid, key, data, 0); rc = cvtdberr(dbi, "db->put", rc, _debug); } else { - - rc = db3c_put(dbi, dbcursor, &key, &data, DB_KEYLAST); - + rc = dbcursor->c_put(dbcursor, key, data, DB_KEYLAST); + rc = cvtdberr(dbi, "dbcursor->c_put", rc, _debug); } return rc; } -static int db3cdel(dbiIndex dbi, DBC * dbcursor, - const void * keyp, size_t keylen, - /*@unused@*/ unsigned int flags) +static int db3cdel(dbiIndex dbi, DBC * dbcursor, DBT * key, unsigned int flags) /*@globals fileSystem @*/ - /*@modifies fileSystem @*/ + /*@modifies *dbcursor, fileSystem @*/ { DB * db = dbi->dbi_db; - DB_TXN * txnid = NULL; - DBT key, data; int rc; - memset(&key, 0, sizeof(key)); - memset(&data, 0, sizeof(data)); - - key.data = (void *)keyp; - key.size = keylen; - if (dbcursor == NULL) { if (db == NULL) return -2; - rc = db->del(db, txnid, &key, 0); + rc = db->del(db, dbi->dbi_txnid, key, flags); rc = cvtdberr(dbi, "db->del", rc, _debug); } else { + DBT * data = alloca(sizeof(*data)); + int _printit; + + memset(data, 0, sizeof(*data)); - rc = db3c_get(dbi, dbcursor, &key, &data, DB_SET); + rc = dbcursor->c_get(dbcursor, key, data, DB_SET); + /* XXX DB_NOTFOUND can be returned */ + _printit = (rc == DB_NOTFOUND ? 0 : _debug); + rc = cvtdberr(dbi, "dbcursor->c_get", rc, _printit); if (rc == 0) { /* XXX TODO: loop over duplicates */ - rc = db3c_del(dbi, dbcursor, 0); + rc = dbcursor->c_del(dbcursor, flags); + rc = cvtdberr(dbi, "dbcursor->c_del", rc, _debug); } } @@ -538,53 +461,36 @@ static int db3cdel(dbiIndex dbi, DBC * dbcursor, return rc; } -static int db3cget(dbiIndex dbi, DBC * dbcursor, - /*@null@*/ void ** keyp, /*@null@*/ size_t * keylen, - /*@null@*/ void ** datap, /*@null@*/ size_t * datalen, - /*@unused@*/ unsigned int flags) +static int db3cget(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data) /*@globals fileSystem @*/ - /*@modifies *keyp, *keylen, *datap, *datalen, fileSystem @*/ + /*@modifies *dbcursor, *key, *data, fileSystem @*/ { DB * db = dbi->dbi_db; - DB_TXN * txnid = NULL; - DBT key, data; int rc; - memset(&key, 0, sizeof(key)); - memset(&data, 0, sizeof(data)); - /*@-unqualifiedtrans@*/ - if (keyp) key.data = *keyp; - if (keylen) key.size = *keylen; - if (datap) data.data = *datap; - if (datalen) data.size = *datalen; - /*@=unqualifiedtrans@*/ - if (dbcursor == NULL) { int _printit; + /*@-compmempass@*/ if (db == NULL) return -2; /*@=compmempass@*/ - rc = db->get(db, txnid, &key, &data, 0); + + rc = db->get(db, dbi->dbi_txnid, key, data, 0); /* XXX DB_NOTFOUND can be returned */ _printit = (rc == DB_NOTFOUND ? 0 : _debug); rc = cvtdberr(dbi, "db->get", rc, _printit); } else { + int _printit; /* XXX db3 does DB_FIRST on uninitialized cursor */ - rc = db3c_get(dbi, dbcursor, &key, &data, - key.data == NULL ? DB_NEXT : DB_SET); + rc = dbcursor->c_get(dbcursor, key, data, + key->data == NULL ? DB_NEXT : DB_SET); + /* XXX DB_NOTFOUND can be returned */ + _printit = (rc == DB_NOTFOUND ? 0 : _debug); + rc = cvtdberr(dbi, "dbcursor->c_get", rc, _printit); } - if (rc == 0) { - /*@-onlytrans@*/ - if (keyp) *keyp = key.data; - if (keylen) *keylen = key.size; - if (datap) *datap = data.data; - if (datalen) *datalen = data.size; - /*@=onlytrans@*/ - } - /*@-compmempass -nullstate@*/ return rc; /*@=compmempass =nullstate@*/ @@ -700,9 +606,6 @@ static int db3close(/*@only@*/ dbiIndex dbi, /*@unused@*/ unsigned int flags) #endif } - if (dbi->dbi_rmw) - rc = db3cclose(dbi, NULL, 0); - if (db) { rc = db->close(db, 0); rc = cvtdberr(dbi, "db->close", rc, _debug); @@ -822,7 +725,6 @@ static int db3open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip) DB * db = NULL; DB_ENV * dbenv = NULL; - DB_TXN * txnid = NULL; u_int32_t oflags; int _printit; @@ -1173,16 +1075,7 @@ static int db3open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip) _printit = (rc > 0 ? 0 : _debug); xx = cvtdberr(dbi, "db->open", rc, _printit); - if (rc == 0 && dbi->dbi_use_dbenv - && (dbi->dbi_eflags & DB_INIT_CDB) && dbi->dbi_get_rmw_cursor) - { - DBC * dbcursor = NULL; - xx = db->cursor(db, txnid, &dbcursor, - ((oflags & DB_RDONLY) ? 0 : DB_WRITECURSOR)); - xx = cvtdberr(dbi, "db->cursor", xx, _debug); - dbi->dbi_rmw = dbcursor; - } else - dbi->dbi_rmw = NULL; + dbi->dbi_txnid = NULL; /* * Lock a file using fcntl(2). Traditionally this is Packages, diff --git a/rpmdb/dbconfig.c b/rpmdb/dbconfig.c index fe7142fb9..efd32e8fc 100644 --- a/rpmdb/dbconfig.c +++ b/rpmdb/dbconfig.c @@ -15,8 +15,6 @@ typedef int int32_t; /*@=redef@*/ #endif -#include <db3/db.h> - #include <rpmlib.h> #include <rpmmacro.h> @@ -157,8 +155,6 @@ struct dbOption rdbOptions[] = { NULL, NULL }, { "usedbenv", 0,POPT_ARG_NONE, &db3dbi.dbi_use_dbenv, 0, NULL, NULL }, - { "rmwcursor", 0,POPT_ARG_NONE, &db3dbi.dbi_get_rmw_cursor, 0, - NULL, NULL }, { "nofsync", 0,POPT_ARG_NONE, &db3dbi.dbi_no_fsync, 0, NULL, NULL }, { "nodbsync", 0,POPT_ARG_NONE, &db3dbi.dbi_no_dbsync, 0, diff --git a/rpmdb/header.c b/rpmdb/header.c index 79b0422ef..5cc6c18d0 100644 --- a/rpmdb/header.c +++ b/rpmdb/header.c @@ -293,7 +293,7 @@ unsigned int headerSizeof(/*@null@*/ Header h, enum hMagic magicp) /* XXX Legacy regions do not include the region tag and data. */ /*@-sizeoftype@*/ if (i == 0 && (h->flags & HEADERFLAG_LEGACY)) - size += sizeof(struct entryInfo) + entry->info.count; + size += sizeof(struct entryInfo_s) + entry->info.count; /*@=sizeoftype@*/ continue; } @@ -313,7 +313,7 @@ unsigned int headerSizeof(/*@null@*/ Header h, enum hMagic magicp) } /*@-sizeoftype@*/ - size += sizeof(struct entryInfo) + entry->length; + size += sizeof(struct entryInfo_s) + entry->length; /*@=sizeoftype@*/ } @@ -421,11 +421,11 @@ static int regionSwab(/*@null@*/ indexEntry entry, int il, int dl, char * tprev = NULL; char * t = NULL; int tdel, tl = dl; - struct indexEntry ieprev; + struct indexEntry_s ieprev; memset(&ieprev, 0, sizeof(ieprev)); for (; il > 0; il--, pe++) { - struct indexEntry ie; + struct indexEntry_s ie; int_32 type; ie.info.tag = ntohl(pe->tag); @@ -786,7 +786,7 @@ indexEntry findEntry(/*@null@*/ Header h, int_32 tag, int_32 type) /*@modifies h @*/ { indexEntry entry, entry2, last; - struct indexEntry key; + struct indexEntry_s key; if (h == NULL) return NULL; if (!(h->flags & HEADERFLAG_SORTED)) headerSort(h); @@ -882,7 +882,7 @@ Header headerLoad(/*@kept@*/ void * uh) int_32 dl = ntohl(ei[1]); /* data length */ /*@-sizeoftype@*/ size_t pvlen = sizeof(il) + sizeof(dl) + - (il * sizeof(struct entryInfo)) + dl; + (il * sizeof(struct entryInfo_s)) + dl; /*@=sizeoftype@*/ void * pv = uh; Header h = NULL; @@ -979,7 +979,7 @@ Header headerLoad(/*@kept@*/ void * uh) } else { ril = il; /*@-sizeoftype@*/ - rdl = (ril * sizeof(struct entryInfo)); + rdl = (ril * sizeof(struct entryInfo_s)); /*@=sizeoftype@*/ entry->info.tag = HEADER_IMAGE; } @@ -1099,7 +1099,7 @@ Header headerCopyLoad(const void * uh) int_32 dl = ntohl(ei[1]); /* data length */ /*@-sizeoftype@*/ size_t pvlen = sizeof(il) + sizeof(dl) + - (il * sizeof(struct entryInfo)) + dl; + (il * sizeof(struct entryInfo_s)) + dl; /*@=sizeoftype@*/ void * nuh = NULL; Header h = NULL; @@ -1162,7 +1162,7 @@ Header headerRead(FD_t fd, enum hMagic magicp) dl = ntohl(block[i]); i++; /*@-sizeoftype@*/ - len = sizeof(il) + sizeof(dl) + (il * sizeof(struct entryInfo)) + dl; + len = sizeof(il) + sizeof(dl) + (il * sizeof(struct entryInfo_s)) + dl; /*@=sizeoftype@*/ /* Sanity checks on header intro. */ @@ -1465,7 +1465,7 @@ headerFindI18NString(Header h, indexEntry entry) /* XXX Drepper sez' this is the order. */ if ((lang = getenv("LANGUAGE")) == NULL && (lang = getenv("LC_ALL")) == NULL && - (lang = getenv("LC_MESSAGES")) == NULL && + (lang = getenv("LC_MESSAGES")) == NULL && (lang = getenv("LANG")) == NULL) return entry->data; @@ -1763,16 +1763,16 @@ int headerAppendEntry(Header h, int_32 tag, int_32 type, indexEntry entry; int length; - /* First find the tag */ - entry = findEntry(h, tag, type); - if (!entry) - return 0; - if (type == RPM_STRING_TYPE || type == RPM_I18NSTRING_TYPE) { /* we can't do this */ return 0; } + /* Find the tag entry in the header. */ + entry = findEntry(h, tag, type); + if (!entry) + return 0; + length = dataLength(type, p, c, 0); if (ENTRY_IN_REGION(entry)) { @@ -1951,7 +1951,7 @@ int headerAddI18NString(Header h, int_32 tag, const char * string, t += en; /*@=mayaliasunique@*/ - /* Replace I18N string array */ + /* Replace i18N string array */ entry->length -= strlen(be) + 1; entry->length += sn; @@ -2949,6 +2949,7 @@ char * headerSprintf(Header h, const char * fmt, extCache = allocateExtensionCache(exts); + val = xstrdup(""); for (i = 0; i < numTokens; i++) { /*@-mods@*/ t = singleSprintf(h, format + i, exts, extCache, 0, diff --git a/rpmdb/header_internal.h b/rpmdb/header_internal.h index 88fb9a15f..296efe2eb 100644 --- a/rpmdb/header_internal.h +++ b/rpmdb/header_internal.h @@ -22,8 +22,8 @@ /** \ingroup header * Description of tag data. */ -typedef /*@abstract@*/ struct entryInfo * entryInfo; -struct entryInfo { +typedef /*@abstract@*/ struct entryInfo_s * entryInfo; +struct entryInfo_s { int_32 tag; /*!< Tag identifier. */ int_32 type; /*!< Tag data type. */ int_32 offset; /*!< Offset into data segment (ondisk only). */ @@ -31,7 +31,7 @@ struct entryInfo { }; #define REGION_TAG_TYPE RPM_BIN_TYPE -#define REGION_TAG_COUNT sizeof(struct entryInfo) +#define REGION_TAG_COUNT sizeof(struct entryInfo_s) #define ENTRY_IS_REGION(_e) \ (((_e)->info.tag >= HEADER_IMAGE) && ((_e)->info.tag < HEADER_REGIONS)) @@ -40,9 +40,9 @@ struct entryInfo { /** \ingroup header * A single tag from a Header. */ -typedef /*@abstract@*/ struct indexEntry * indexEntry; -struct indexEntry { - struct entryInfo info; /*!< Description of tag data. */ +typedef /*@abstract@*/ struct indexEntry_s * indexEntry; +struct indexEntry_s { + struct entryInfo_s info; /*!< Description of tag data. */ /*@owned@*/ void * data; /*!< Location of tag data. */ int length; /*!< No. bytes of data. */ int rdlen; /*!< No. bytes of data in region. */ diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c index 3a6c19c73..927a5e8b0 100644 --- a/rpmdb/rpmdb.c +++ b/rpmdb/rpmdb.c @@ -81,6 +81,7 @@ static inline unsigned char nibble(char c) return 0; } +#ifdef DYING /** * Check key for printable characters. * @param ptr key value pointer @@ -95,6 +96,7 @@ static int printable(const void * ptr, size_t len) /*@*/ if (!(*s >= ' ' && *s <= '~')) return 0; return 1; } +#endif /** * Return dbi index used for rpm tag. @@ -213,190 +215,6 @@ static struct _dbiVec *mydbvecs[] = { }; /*@=nullassign@*/ -INLINE int dbiSync(dbiIndex dbi, unsigned int flags) -{ -if (_debug < 0 || dbi->dbi_debug) -fprintf(stderr, " Sync %s\n", tagName(dbi->dbi_rpmtag)); - return (*dbi->dbi_vec->sync) (dbi, flags); -} - -INLINE int dbiByteSwapped(dbiIndex dbi) -{ -/*@-mods@*/ /* FIX: shrug */ - if (dbi->dbi_byteswapped == -1) - dbi->dbi_byteswapped = (*dbi->dbi_vec->byteswapped) (dbi); -/*@=mods@*/ - return dbi->dbi_byteswapped; -} - -INLINE int dbiCopen(dbiIndex dbi, /*@out@*/ DBC ** dbcp, unsigned int flags) -{ -if (_debug < 0 || dbi->dbi_debug) -fprintf(stderr, "+++ RMW %s %s\n", tagName(dbi->dbi_rpmtag), ((flags & DBI_WRITECURSOR) ? "WRITECURSOR" : "")); - return (*dbi->dbi_vec->copen) (dbi, dbcp, flags); -} - -INLINE int dbiCclose(dbiIndex dbi, /*@only@*/DBC * dbcursor, unsigned int flags) -{ -if (_debug < 0 || dbi->dbi_debug) -fprintf(stderr, "--- RMW %s\n", tagName(dbi->dbi_rpmtag)); - return (*dbi->dbi_vec->cclose) (dbi, dbcursor, flags); -} - -INLINE int dbiDel(dbiIndex dbi, DBC * dbcursor, - const void * keyp, size_t keylen, unsigned int flags) -{ - int NULkey; - int rc; - - /* Make sure that keylen is correct for "" lookup. */ - NULkey = (keyp && *((char *)keyp) == '\0' && keylen == 0); - if (NULkey) keylen++; - rc = (*dbi->dbi_vec->cdel) (dbi, dbcursor, keyp, keylen, flags); - if (NULkey) keylen--; - -if (_debug < 0 || dbi->dbi_debug) -fprintf(stderr, " Del %s key (%p,%ld) %s rc %d\n", tagName(dbi->dbi_rpmtag), keyp, (long)keylen, (dbi->dbi_rpmtag != RPMDBI_PACKAGES ? (char *)keyp : ""), rc); - - return rc; -} - -INLINE int dbiGet(dbiIndex dbi, DBC * dbcursor, void ** keypp, size_t * keylenp, - void ** datapp, size_t * datalenp, unsigned int flags) -{ - int NULkey; - int rc; - - /* Make sure that keylen is correct for "" lookup. */ - NULkey = (keypp && *keypp && *((char *)(*keypp)) == '\0'); - NULkey = (keylenp && *keylenp == 0 && NULkey); - if (keylenp && NULkey) (*keylenp)++; - rc = (*dbi->dbi_vec->cget) (dbi, dbcursor, - keypp, keylenp, datapp, datalenp, flags); - if (keylenp && NULkey) (*keylenp)--; - -/*@-nullderef -nullpass@*/ -if (_debug < 0 || dbi->dbi_debug) { - int dataval = 0xdeadbeef; - const char * kvp; - char keyval[64]; - keyval[0] = '\0'; - if (keypp && *keypp && keylenp) { - if (printable(*keypp, *keylenp)) { - kvp = *keypp; - } else if (*keylenp <= sizeof(int)) { - int keyint = 0; - memcpy(&keyint, *keypp, sizeof(keyint)); - sprintf(keyval, "#%d", keyint); - kvp = keyval; - } else { - static const char hex[] = "0123456789abcdef"; - const byte * s = *keypp; - char * t = keyval; - int i; - for (i = 0; i < *keylenp && t < (keyval+sizeof(keyval)-2); i++) { - *t++ = hex[ (unsigned)((*s >> 4) & 0x0f) ]; - *t++ = hex[ (unsigned)((*s++ ) & 0x0f) ]; - } - *t = '\0'; - kvp = keyval; - } - } else - kvp = keyval; - if (rc == 0 && datapp && *datapp && datalenp && *datalenp >= sizeof(dataval)) { - memcpy(&dataval, *datapp, sizeof(dataval)); - } - fprintf(stderr, " Get %s key (%p,%ld) data (%p,%ld) \"%s\" %x rc %d\n", - tagName(dbi->dbi_rpmtag), *keypp, (long)*keylenp, *datapp, (long)*datalenp, - kvp, (unsigned)dataval, rc); -} -/*@=nullderef =nullpass@*/ - return rc; -} - -INLINE int dbiPut(dbiIndex dbi, DBC * dbcursor, - const void * keyp, size_t keylen, - const void * datap, size_t datalen, unsigned int flags) -{ - int NULkey; - int rc; - - /* XXX make sure that keylen is correct for "" lookup */ - NULkey = (keyp && *((char *)keyp) == '\0' && keylen == 0); - if (NULkey) keylen++; - rc = (*dbi->dbi_vec->cput) (dbi, dbcursor, keyp, keylen, datap, datalen, flags); - if (NULkey) keylen--; - -/*@-nullderef -nullpass@*/ -if (_debug < 0 || dbi->dbi_debug) { - int dataval = 0xdeadbeef; - const char * kvp; - char keyval[64]; - keyval[0] = '\0'; - if (keyp) { - if (printable(keyp, keylen)) { - kvp = keyp; - } else if (keylen <= sizeof(int)) { - int keyint = 0; - memcpy(&keyint, keyp, sizeof(keyint)); - sprintf(keyval, "#%d", keyint); - kvp = keyval; - } else { - static const char hex[] = "0123456789abcdef"; - const byte * s = keyp; - char * t = keyval; - int i; - for (i = 0; i < keylen && t < (keyval+sizeof(keyval)-2); i++) { - *t++ = hex[ (unsigned)((*s >> 4) & 0x0f) ]; - *t++ = hex[ (unsigned)((*s++ ) & 0x0f) ]; - } - *t = '\0'; - kvp = keyval; - } - } else - kvp = keyval; - if (rc == 0 && datap && datalen >= sizeof(dataval)) { - memcpy(&dataval, datap, sizeof(dataval)); - } - fprintf(stderr, " Put %s key (%p,%ld) data (%p,%ld) \"%s\" %x rc %d\n", tagName(dbi->dbi_rpmtag), keyp, (long)keylen, (datap ? datap : NULL), (long)datalen, kvp, (unsigned)dataval, rc); -} -/*@=nullderef =nullpass@*/ - - return rc; -} - -INLINE int dbiCount(dbiIndex dbi, DBC * dbcursor, - unsigned int * countp, unsigned int flags) -{ - int rc = (*dbi->dbi_vec->ccount) (dbi, dbcursor, countp, flags); - -if (rc == 0 && countp && *countp > 1) -fprintf(stderr, " Count %s: %u rc %d\n", tagName(dbi->dbi_rpmtag), *countp, rc); - - return rc; -} - -INLINE int dbiVerify(dbiIndex dbi, unsigned int flags) -{ - int dbi_debug = dbi->dbi_debug; - int dbi_rpmtag = dbi->dbi_rpmtag; - int rc; - - dbi->dbi_verify_on_close = 1; - rc = (*dbi->dbi_vec->close) (dbi, flags); - -if (_debug < 0 || dbi_debug) -fprintf(stderr, " Verify %s rc %d\n", tagName(dbi_rpmtag), rc); - - return rc; -} - -INLINE int dbiClose(dbiIndex dbi, unsigned int flags) { -if (_debug < 0 || dbi->dbi_debug) -fprintf(stderr, " Close %s\n", tagName(dbi->dbi_rpmtag)); - return (*dbi->dbi_vec->close) (dbi, flags); -} - dbiIndex dbiOpen(rpmdb db, int rpmtag, /*@unused@*/ unsigned int flags) { int dbix; @@ -536,18 +354,25 @@ static int dbiSearch(dbiIndex dbi, DBC * dbcursor, /*@globals fileSystem @*/ /*@modifies *dbcursor, *setp, fileSystem @*/ { - unsigned int gflags = 0; /* dbiGet() flags */ + DBT * key = alloca(sizeof(*key)); + DBT * data = alloca(sizeof(*data)); void * datap = NULL; size_t datalen = 0; int rc; - if (setp) *setp = NULL; if (keylen == 0) keylen = strlen(keyp); - /*@-mods@*/ /* FIX: indirection @*/ - rc = dbiGet(dbi, dbcursor, (void **)&keyp, &keylen, &datap, &datalen, - gflags); - /*@=mods@*/ + memset(key, 0, sizeof(*key)); + key->data = (void *) keyp; + key->size = keylen; + memset(data, 0, sizeof(*data)); + data->data = datap; + data->size = datalen; + rc = dbiGet(dbi, dbcursor, key, data); + keyp = key->data; + keylen = key->size; + datap = data->data; + datalen = data->size; if (rc > 0) { rpmError(RPMERR_DBGETINDEX, @@ -626,8 +451,8 @@ static int dbiUpdateIndex(dbiIndex dbi, DBC * dbcursor, /*@globals fileSystem @*/ /*@modifies *dbcursor, set, fileSystem @*/ { - unsigned int pflags = 0; /* dbiPut() flags */ - unsigned int dflags = 0; /* dbiDel() flags */ + DBT * key = alloca(sizeof(*key)); + DBT * data = alloca(sizeof(*data)); void * datap; size_t datalen; int rc; @@ -678,7 +503,13 @@ static int dbiUpdateIndex(dbiIndex dbi, DBC * dbcursor, break; } - rc = dbiPut(dbi, dbcursor, keyp, keylen, datap, datalen, pflags); + memset(key, 0, sizeof(*key)); + key->data = (void *) keyp; + key->size = keylen; + memset(data, 0, sizeof(*data)); + data->data = datap; + data->size = datalen; + rc = dbiPut(dbi, dbcursor, key, data); if (rc) { rpmError(RPMERR_DBPUTINDEX, @@ -688,7 +519,10 @@ static int dbiUpdateIndex(dbiIndex dbi, DBC * dbcursor, } else { - rc = dbiDel(dbi, dbcursor, keyp, keylen, dflags); + memset(key, 0, sizeof(*key)); + key->data = (void *) keyp; + key->size = keylen; + rc = dbiDel(dbi, dbcursor, key, 0); if (rc) { rpmError(RPMERR_DBPUTINDEX, @@ -981,7 +815,6 @@ static int openDatabase(/*@null@*/ const char * prefix, { rpmdb db; int rc, xx; - unsigned int gflags = 0; /* dbiGet() flags */ static int _tags_initialized = 0; static int _dbenv_removed = 0; int justCheck = flags & RPMDB_FLAG_JUSTCHECK; @@ -1081,32 +914,6 @@ static int openDatabase(/*@null@*/ const char * prefix, if (minimal) goto exit; /*@switchbreak@*/ break; - case RPMTAG_BASENAMES: - { void * keyp = NULL; - DBC * dbcursor; - - /* We used to store the fileindexes as complete paths, rather then - plain basenames. Let's see which version we are... */ - /* - * XXX FIXME: db->fileindex can be NULL under pathological (e.g. mixed - * XXX db1/db2 linkage) conditions. - */ - if (justCheck) - /*@switchbreak@*/ break; - dbcursor = NULL; - xx = dbiCopen(dbi, &dbcursor, 0); - xx = dbiGet(dbi, dbcursor, &keyp, NULL, NULL, NULL, gflags); - if (xx == 0) { - const char * akey = keyp; - if (akey && strchr(akey, '/')) { - rpmError(RPMERR_OLDDB, _("old format database is present; " - "use --rebuilddb to generate a new format database\n")); - rc |= 1; - } - } - xx = dbiCclose(dbi, dbcursor, 0); - dbcursor = NULL; - } /*@switchbreak@*/ break; default: /*@switchbreak@*/ break; } @@ -1255,7 +1062,7 @@ static int rpmdbFindByFile(rpmdb db, /*@null@*/ const char * filespec, dbi = dbiOpen(db, RPMTAG_BASENAMES, 0); if (dbi != NULL) { dbcursor = NULL; - xx = dbiCopen(dbi, &dbcursor, 0); + xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, 0); rc = dbiSearch(dbi, dbcursor, baseName, strlen(baseName), &allMatches); xx = dbiCclose(dbi, dbcursor, 0); dbcursor = NULL; @@ -1354,7 +1161,7 @@ int rpmdbCountPackages(rpmdb db, const char * name) dbi = dbiOpen(db, RPMTAG_NAME, 0); if (dbi) { DBC * dbcursor = NULL; - xx = dbiCopen(dbi, &dbcursor, 0); + xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, 0); rc = dbiSearch(dbi, dbcursor, name, strlen(name), &matches); xx = dbiCclose(dbi, dbcursor, 0); dbcursor = NULL; @@ -1579,7 +1386,6 @@ static int dbiUpdateRecord(dbiIndex dbi, DBC * dbcursor, int offset, Header h) void * uh; size_t uhlen; int rc = EINVAL; /* XXX W2DO? */ - unsigned int pflags = 0; /* dbiPut() flags */ int xx; if (_noDirTokens) @@ -1588,10 +1394,21 @@ static int dbiUpdateRecord(dbiIndex dbi, DBC * dbcursor, int offset, Header h) uhlen = headerSizeof(h, HEADER_MAGIC_NO); uh = headerUnload(h); if (uh) { + DBT * key = alloca(sizeof(*key)); + DBT * data = alloca(sizeof(*data)); + + memset(key, 0, sizeof(*key)); + key->data = (void *) &offset; + key->size = sizeof(offset); + memset(data, 0, sizeof(*data)); + data->data = uh; + data->size = uhlen; + (void) blockSignals(dbi->dbi_rpmdb, &signalMask); - rc = dbiPut(dbi, dbcursor, &offset, sizeof(offset), uh, uhlen, pflags); + rc = dbiPut(dbi, dbcursor, key, data); xx = dbiSync(dbi, 0); (void) unblockSignals(dbi->dbi_rpmdb, &signalMask); + uh = _free(uh); } else fprintf(stderr, "*** dbiUpdateRecord: uh is NULL\n"); @@ -1651,11 +1468,6 @@ rpmdbMatchIterator rpmdbFreeIterator(rpmdbMatchIterator mi) mi->mi_h = headerFree(mi->mi_h, "mi->mi_h"); } /*@=branchstate@*/ - if (dbi) { - if (dbi->dbi_rmw) - xx = dbiCclose(dbi, dbi->dbi_rmw, 0); - dbi->dbi_rmw = NULL; - } if (mi->mi_re != NULL) for (i = 0; i < mi->mi_nre; i++) { @@ -2103,7 +1915,8 @@ Header rpmdbNextIterator(rpmdbMatchIterator mi) dbiIndex dbi; void * uh = NULL; size_t uhlen = 0; - unsigned int gflags = 0; /* dbiGet() flags */ + DBT * key; + DBT * data; void * keyp; size_t keylen; int rc; @@ -2123,10 +1936,13 @@ Header rpmdbNextIterator(rpmdbMatchIterator mi) * marked with DB_WRITECURSOR as well. */ if (mi->mi_dbc == NULL) - xx = dbiCopen(dbi, &mi->mi_dbc, (mi->mi_cflags | DBI_ITERATOR)); + xx = dbiCopen(dbi, dbi->dbi_txnid, &mi->mi_dbc, (mi->mi_cflags | DBI_ITERATOR)); dbi->dbi_lastoffset = mi->mi_prevoffset; + key = alloca(sizeof(*key)); + data = alloca(sizeof(*data)); top: + /* XXX skip over instances with 0 join key */ do { if (mi->mi_set) { @@ -2137,10 +1953,19 @@ top: keyp = &mi->mi_offset; keylen = sizeof(mi->mi_offset); } else { - keyp = (void *)mi->mi_keyp; /* XXX FIXME const */ - keylen = mi->mi_keylen; - rc = dbiGet(dbi, mi->mi_dbc, &keyp, &keylen, &uh, &uhlen, gflags); + memset(key, 0, sizeof(*key)); + key->data = keyp = (void *)mi->mi_keyp; + key->size = keylen = mi->mi_keylen; + memset(data, 0, sizeof(*data)); + data->data = uh; + data->size = uhlen; + rc = dbiGet(dbi, mi->mi_dbc, key, data); + keyp = key->data; + keylen = key->size; + uh = data->data; + uhlen = data->size; + if (dbi->dbi_api == 1 && dbi->dbi_rpmtag == RPMDBI_PACKAGES && rc == EFAULT) { rpmError(RPMERR_INTERNAL, _("record number %u in database is bad -- skipping.\n"), dbi->dbi_lastoffset); @@ -2171,7 +1996,17 @@ if (dbi->dbi_api == 1 && dbi->dbi_rpmtag == RPMDBI_PACKAGES && rc == EFAULT) { /* Retrieve next header */ if (uh == NULL) { - rc = dbiGet(dbi, mi->mi_dbc, &keyp, &keylen, &uh, &uhlen, gflags); + memset(key, 0, sizeof(*key)); + key->data = keyp; + key->size = keylen; + memset(data, 0, sizeof(*data)); + uh = data->data; + uhlen = data->size; + rc = dbiGet(dbi, mi->mi_dbc, key, data); + keyp = key->data; + keylen = key->size; + uh = data->data; + uhlen = data->size; if (rc) return NULL; } @@ -2268,7 +2103,7 @@ static int rpmdbGrowIterator(/*@null@*/ rpmdbMatchIterator mi, if (keylen == 0) keylen = strlen(keyp); - xx = dbiCopen(dbi, &dbcursor, 0); + xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, 0); rc = dbiSearch(dbi, dbcursor, keyp, keylen, &set); xx = dbiCclose(dbi, dbcursor, 0); dbcursor = NULL; @@ -2339,14 +2174,6 @@ rpmdbMatchIterator rpmdbInitIterator(rpmdb db, int rpmtag, if (dbi == NULL) return NULL; -#if 0 - assert(dbi->dbi_rmw == NULL); /* db3: avoid "lost" cursors */ - assert(dbi->dbi_lastoffset == 0); /* db0: avoid "lost" cursors */ -#else -if (dbi->dbi_rmw) -fprintf(stderr, "*** RMW %s %p\n", tagName(rpmtag), dbi->dbi_rmw); -#endif - dbi->dbi_lastoffset = 0; /* db0: rewind to beginning */ if (rpmtag != RPMDBI_PACKAGES && keyp) { @@ -2356,14 +2183,14 @@ fprintf(stderr, "*** RMW %s %p\n", tagName(rpmtag), dbi->dbi_rmw); if (isLabel) { /* XXX HACK to get rpmdbFindByLabel out of the API */ - xx = dbiCopen(dbi, &dbcursor, 0); + xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, 0); rc = dbiFindByLabel(dbi, dbcursor, keyp, &set); xx = dbiCclose(dbi, dbcursor, 0); dbcursor = NULL; } else if (rpmtag == RPMTAG_BASENAMES) { rc = rpmdbFindByFile(db, keyp, &set); } else { - xx = dbiCopen(dbi, &dbcursor, 0); + xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, 0); /*@-nullpass@*/ /* LCL: keyp != NULL here. */ rc = dbiSearch(dbi, dbcursor, keyp, keylen, &set); /*@=nullpass@*/ @@ -2458,6 +2285,7 @@ static INLINE int removeIndexEntry(dbiIndex dbi, DBC * dbcursor, /* XXX install.c uninstall.c */ int rpmdbRemove(rpmdb db, /*@unused@*/ int rid, unsigned int hdrNum) { + DBT * key = alloca(sizeof(*key)); HGE_t hge = (HGE_t)headerGetEntryMinMemory; HFD_t hfd = headerFreeData; Header h; @@ -2526,8 +2354,13 @@ int rpmdbRemove(rpmdb db, /*@unused@*/ int rid, unsigned int hdrNum) case RPMDBI_PACKAGES: dbi = dbiOpen(db, rpmtag, 0); if (dbi != NULL) { - xx = dbiCopen(dbi, &dbcursor, DBI_WRITECURSOR); - xx = dbiDel(dbi, dbcursor, &hdrNum, sizeof(hdrNum), 0); + + memset(key, 0, sizeof(*key)); + key->data = &hdrNum; + key->size = sizeof(hdrNum); + + xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, DBI_WRITECURSOR); + xx = dbiDel(dbi, dbcursor, key, 0); xx = dbiCclose(dbi, dbcursor, DBI_WRITECURSOR); dbcursor = NULL; if (!dbi->dbi_no_dbsync) @@ -2553,7 +2386,7 @@ int rpmdbRemove(rpmdb db, /*@unused@*/ int rid, unsigned int hdrNum) } printed = 0; - xx = dbiCopen(dbi, &dbcursor, DBI_WRITECURSOR); + xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, DBI_WRITECURSOR); for (i = 0; i < rpmcnt; i++) { const void * valp; size_t vallen; @@ -2732,8 +2565,6 @@ int rpmdbAdd(rpmdb db, int iid, Header h) int count = 0; dbiIndex dbi; int dbix; - unsigned int gflags = 0; /* dbiGet() flags */ - unsigned int pflags = 0; /* dbiPut() flags */ unsigned int hdrNum = 0; int rc = 0; int xx; @@ -2766,6 +2597,8 @@ int rpmdbAdd(rpmdb db, int iid, Header h) { unsigned int firstkey = 0; DBC * dbcursor = NULL; + DBT * key = alloca(sizeof(*key)); + DBT * data = alloca(sizeof(*data)); void * keyp = &firstkey; size_t keylen = sizeof(firstkey); void * datap = NULL; @@ -2779,11 +2612,21 @@ int rpmdbAdd(rpmdb db, int iid, Header h) datap = h; datalen = headerSizeof(h, HEADER_MAGIC_NO); - xx = dbiCopen(dbi, &dbcursor, DBI_WRITECURSOR); + xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, DBI_WRITECURSOR); /* Retrieve join key for next header instance. */ - rc = dbiGet(dbi, dbcursor, &keyp, &keylen, &datap, &datalen, gflags); + memset(key, 0, sizeof(*key)); + key->data = keyp; + key->size = keylen; + memset(data, 0, sizeof(*data)); + data->data = datap; + data->size = datalen; + rc = dbiGet(dbi, dbcursor, key, data); + keyp = key->data; + keylen = key->size; + datap = data->data; + datalen = data->size; hdrNum = 0; if (rc == 0 && datap) @@ -2798,7 +2641,14 @@ int rpmdbAdd(rpmdb db, int iid, Header h) datalen = sizeof(hdrNum); } - rc = dbiPut(dbi, dbcursor, keyp, keylen, datap, datalen, pflags); + memset(key, 0, sizeof(*key)); + key->data = keyp; + key->size = keylen; + memset(data, 0, sizeof(*data)); + data->data = datap; + data->size = datalen; + + rc = dbiPut(dbi, dbcursor, key, data); xx = dbiSync(dbi, 0); xx = dbiCclose(dbi, dbcursor, DBI_WRITECURSOR); @@ -2846,7 +2696,7 @@ int rpmdbAdd(rpmdb db, int iid, Header h) case RPMDBI_PACKAGES: dbi = dbiOpen(db, rpmtag, 0); if (dbi != NULL) { - xx = dbiCopen(dbi, &dbcursor, DBI_WRITECURSOR); + xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, DBI_WRITECURSOR); xx = dbiUpdateRecord(dbi, dbcursor, hdrNum, h); xx = dbiCclose(dbi, dbcursor, DBI_WRITECURSOR); dbcursor = NULL; @@ -2900,7 +2750,7 @@ int rpmdbAdd(rpmdb db, int iid, Header h) } printed = 0; - xx = dbiCopen(dbi, &dbcursor, DBI_WRITECURSOR); + xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, DBI_WRITECURSOR); for (i = 0; i < rpmcnt; i++) { const void * valp; size_t vallen; diff --git a/rpmdb/rpmdb.h b/rpmdb/rpmdb.h index f1e5f610a..e9fdde843 100644 --- a/rpmdb/rpmdb.h +++ b/rpmdb/rpmdb.h @@ -7,6 +7,7 @@ */ #include <rpmlib.h> +#include <db.h> /** */ @@ -37,15 +38,6 @@ struct _dbiIndexSet { int count; /*!< number of records */ }; -/* XXX hack to get prototypes correct */ -#if !defined(DB_VERSION_MAJOR) -#define DB void -#define DB_ENV void -#define DBC void -#define DBT void -#define DB_LSN void -#endif - /** \ingroup dbi * Private methods for accessing an index database. */ @@ -87,18 +79,22 @@ struct _dbiVec { /** \ingroup dbi * Open database cursor. * @param dbi index database handle - * @param dbcp address of database cursor + * @param txnid database transaction handle + * @retval dbcp address of database cursor * @param flags (unused) + * @return 0 on success */ - int (*copen) (dbiIndex dbi, /*@out@*/ DBC ** dbcp, unsigned int flags) + int (*copen) (dbiIndex dbi, /*@null@*/ DB_TXN * txnid, + /*@out@*/ DBC ** dbcp, unsigned int flags) /*@globals fileSystem@*/ - /*@modifies dbi, *dbcp, fileSystem @*/; + /*@modifies dbi, *txnidp, *dbcp, fileSystem @*/; /** \ingroup dbi * Close database cursor. * @param dbi index database handle * @param dbcursor database cursor * @param flags (unused) + * @return 0 on success */ int (*cclose) (dbiIndex dbi, /*@only@*/ DBC * dbcursor, unsigned int flags) /*@globals fileSystem@*/ @@ -107,51 +103,37 @@ struct _dbiVec { /** \ingroup dbi * Delete (key,data) pair(s) using db->del or dbcursor->c_del. * @param dbi index database handle - * @param dbcursor database cursor - * @param keyp key data - * @param keylen key data length + * @param dbcursor database cursor (NULL will use db->del) + * @param key delete key value/length/flags * @param flags (unused) * @return 0 on success */ - int (*cdel) (dbiIndex dbi, DBC * dbcursor, - const void * keyp, size_t keylen, unsigned int flags) + int (*cdel) (dbiIndex dbi, /*@null@*/ DBC * dbcursor, DBT * key, + unsigned int flags) /*@globals fileSystem@*/ /*@modifies *dbcursor, fileSystem @*/; /** \ingroup dbi * Retrieve (key,data) pair using db->get or dbcursor->c_get. * @param dbi index database handle - * @param dbcursor database cursor - * @param keypp address of key data - * @param keylenp address of key data length - * @param datapp address of data pointer - * @param datalenp address of data length - * @param flags (unused) + * @param dbcursor database cursor (NULL will use db->get) + * @param key retrieve key value/length/flags + * @param data retrieve data value/length/flags * @return 0 on success */ - int (*cget) (dbiIndex dbi, DBC * dbcursor, - /*@null@*/ void ** keypp, /*@null@*/ size_t * keylenp, - /*@null@*/ void ** datapp, /*@null@*/ size_t * datalenp, - unsigned int flags) + int (*cget) (dbiIndex dbi, /*@null@*/ DBC * dbcursor, DBT * key, DBT * data) /*@globals fileSystem@*/ - /*@modifies *dbcursor, *keypp, *keylenp, *datapp, *datalenp, - fileSystem @*/; + /*@modifies *dbcursor, *key, *data, fileSystem @*/; /** \ingroup dbi * Store (key,data) pair using db->put or dbcursor->c_put. * @param dbi index database handle - * @param dbcursor database cursor - * @param keyp key data - * @param keylen key data length - * @param datap data pointer - * @param datalen data length - * @param flags (unused) + * @param dbcursor database cursor (NULL will use db->put) + * @param key store key value/length/flags + * @param data store data value/length/flags * @return 0 on success */ - int (*cput) (dbiIndex dbi, DBC * dbcursor, - const void * keyp, size_t keylen, - const void * datap, size_t datalen, - unsigned int flags) + int (*cput) (dbiIndex dbi, /*@null@*/ DBC * dbcursor, DBT * key, DBT * data) /*@globals fileSystem@*/ /*@modifies *dbcursor, fileSystem @*/; @@ -194,108 +176,126 @@ struct _dbiVec { * Describes an index database (implemented on Berkeley db3 functionality). */ struct _dbiIndex { -/*@null@*/ const char * dbi_root; /*!< chroot(2) component of path */ -/*@null@*/ const char * dbi_home; /*!< directory component of path */ -/*@null@*/ const char * dbi_file; /*!< file component of path */ -/*@null@*/ const char * dbi_subfile; -/*@null@*/ const char * dbi_tmpdir; /*!< temporary directory */ - - int dbi_ecflags; /*!< db_env_create flags */ - int dbi_cflags; /*!< db_create flags */ - int dbi_oeflags; /*!< common (db,dbenv}->open flags */ - int dbi_eflags; /*!< dbenv->open flags */ - int dbi_oflags; /*!< db->open flags */ - int dbi_tflags; /*!< dbenv->txn_begin flags */ - - int dbi_type; /*!< db index type */ - unsigned dbi_mode; /*!< mode to use on open */ - int dbi_perms; /*!< file permission to use on open */ - long dbi_shmkey; /*!< shared memory base key */ - int dbi_api; /*!< Berkeley API type */ - - int dbi_verify_on_close; - int dbi_tear_down; /*!< tear down dbenv on close */ - int dbi_use_cursors;/*!< access with cursors? (always) */ - int dbi_use_dbenv; /*!< use db environment? */ - int dbi_permit_dups;/*!< permit duplicate entries? */ - int dbi_get_rmw_cursor; - int dbi_no_fsync; /*!< no-op fsync for db */ - int dbi_no_dbsync; /*!< don't call dbiSync */ - int dbi_lockdbfd; /*!< do fcntl lock on db fd */ - int dbi_temporary; /*!< non-persistent */ - int dbi_debug; - int dbi_byteswapped; - -/*@null@*/ char * dbi_host; - long dbi_cl_timeout; - long dbi_sv_timeout; +/*@null@*/ + const char * dbi_root; /*!< chroot(2) component of path */ +/*@null@*/ + const char * dbi_home; /*!< directory component of path */ +/*@null@*/ + const char * dbi_file; /*!< file component of path */ +/*@null@*/ + const char * dbi_subfile; +/*@null@*/ + const char * dbi_tmpdir; /*!< temporary directory */ + + int dbi_ecflags; /*!< db_env_create flags */ + int dbi_cflags; /*!< db_create flags */ + int dbi_oeflags; /*!< common (db,dbenv}->open flags */ + int dbi_eflags; /*!< dbenv->open flags */ + int dbi_oflags; /*!< db->open flags */ + int dbi_tflags; /*!< dbenv->txn_begin flags */ + + int dbi_type; /*!< db index type */ + unsigned dbi_mode; /*!< mode to use on open */ + int dbi_perms; /*!< file permission to use on open */ + long dbi_shmkey; /*!< shared memory base key */ + int dbi_api; /*!< Berkeley API type */ + + int dbi_verify_on_close; + int dbi_tear_down; /*!< tear down dbenv on close */ + int dbi_use_cursors; /*!< access with cursors? (always) */ + int dbi_use_dbenv; /*!< use db environment? */ + int dbi_permit_dups; /*!< permit duplicate entries? */ + int dbi_no_fsync; /*!< no-op fsync for db */ + int dbi_no_dbsync; /*!< don't call dbiSync */ + int dbi_lockdbfd; /*!< do fcntl lock on db fd */ + int dbi_temporary; /*!< non-persistent */ + int dbi_debug; + int dbi_byteswapped; + +/*@null@*/ char * dbi_host; + long dbi_cl_timeout; + long dbi_sv_timeout; /* dbenv parameters */ - int dbi_lorder; -/*@unused@*/ /*@null@*/ void (*db_errcall) (const char *db_errpfx, char *buffer) + int dbi_lorder; +/*@unused@*/ + void (*db_errcall) (const char *db_errpfx, char *buffer) /*@globals fileSystem@*/ /*@modifies fileSystem @*/; -/*@unused@*/ /*@shared@*/ FILE * dbi_errfile; - const char * dbi_errpfx; - int dbi_verbose; - int dbi_region_init; - int dbi_tas_spins; +/*@unused@*/ /*@shared@*/ + FILE * dbi_errfile; + const char * dbi_errpfx; + int dbi_verbose; + int dbi_region_init; + int dbi_tas_spins; /* mpool sub-system parameters */ - int dbi_mp_mmapsize; /*!< (10Mb) */ - int dbi_mp_size; /*!< (128Kb) */ + int dbi_mp_mmapsize; /*!< (10Mb) */ + int dbi_mp_size; /*!< (128Kb) */ /* lock sub-system parameters */ - unsigned int dbi_lk_max; - unsigned int dbi_lk_detect; -/*@unused@*/ int dbi_lk_nmodes; + unsigned int dbi_lk_max; + unsigned int dbi_lk_detect; +/*@unused@*/ int dbi_lk_nmodes; /*@unused@*/ unsigned char * dbi_lk_conflicts; /* log sub-system parameters */ - unsigned int dbi_lg_max; - unsigned int dbi_lg_bsize; + unsigned int dbi_lg_max; + unsigned int dbi_lg_bsize; /* transaction sub-system parameters */ - unsigned int dbi_tx_max; + unsigned int dbi_tx_max; #if 0 - int (*dbi_tx_recover) (DB_ENV *dbenv, DBT *log_rec, + int (*dbi_tx_recover) (DB_ENV *dbenv, DBT *log_rec, DB_LSN *lsnp, int redo, void *info) /*@globals fileSystem@*/ /*@modifies fileSystem @*/; #endif /* dbinfo parameters */ - int dbi_cachesize; /*!< */ - int dbi_pagesize; /*!< (fs blksize) */ -/*@unused@*/ /*@null@*/ void * (*dbi_malloc) (size_t nbytes) + int dbi_cachesize; /*!< */ + int dbi_pagesize; /*!< (fs blksize) */ +/*@unused@*/ /*@null@*/ + void * (*dbi_malloc) (size_t nbytes) /*@*/; /* hash access parameters */ - unsigned int dbi_h_ffactor; /*!< */ -/*@null@*/ unsigned int (*dbi_h_hash_fcn) (DB *, const void *bytes, unsigned int length) /*@*/; - unsigned int dbi_h_nelem; /*!< */ - unsigned int dbi_h_flags; /*!< DB_DUP, DB_DUPSORT */ -/*@null@*/ int (*dbi_h_dup_compare_fcn) (DB *, const DBT *, const DBT *) /*@*/; + unsigned int dbi_h_ffactor; /*!< */ + unsigned int (*dbi_h_hash_fcn) (DB *, const void *bytes, + unsigned int length) + /*@*/; + unsigned int dbi_h_nelem; /*!< */ + unsigned int dbi_h_flags; /*!< DB_DUP, DB_DUPSORT */ + int (*dbi_h_dup_compare_fcn) (DB *, const DBT *, const DBT *) + /*@*/; /* btree access parameters */ - int dbi_bt_flags; - int dbi_bt_minkey; -/*@null@*/ int (*dbi_bt_compare_fcn) (DB *, const DBT *, const DBT *) /*@*/; -/*@null@*/ int (*dbi_bt_dup_compare_fcn) (DB *, const DBT *, const DBT *) /*@*/; -/*@null@*/ size_t (*dbi_bt_prefix_fcn) (DB *, const DBT *, const DBT *) /*@*/; + int dbi_bt_flags; + int dbi_bt_minkey; + int (*dbi_bt_compare_fcn) (DB *, const DBT *, const DBT *) + /*@*/; + int (*dbi_bt_dup_compare_fcn) (DB *, const DBT *, const DBT *) + /*@*/; + size_t (*dbi_bt_prefix_fcn) (DB *, const DBT *, const DBT *) + /*@*/; /* recno access parameters */ - int dbi_re_flags; - int dbi_re_delim; - unsigned int dbi_re_len; - int dbi_re_pad; - const char * dbi_re_source; + int dbi_re_flags; + int dbi_re_delim; + unsigned int dbi_re_len; + int dbi_re_pad; + const char * dbi_re_source; /* queue access parameters */ - unsigned int dbi_q_extentsize; + unsigned int dbi_q_extentsize; -/*@refcounted@*/ rpmdb dbi_rpmdb; - rpmTag dbi_rpmtag; /*!< rpm tag used for index */ - int dbi_jlen; /*!< size of join key */ +/*@refcounted@*/ + rpmdb dbi_rpmdb; + rpmTag dbi_rpmtag; /*!< rpm tag used for index */ + int dbi_jlen; /*!< size of join key */ unsigned int dbi_lastoffset; /*!< db1 with falloc.c needs this */ -/*@only@*//*@null@*/ void * dbi_db; /*!< Berkeley DB handle */ -/*@only@*//*@null@*/ void * dbi_rmw; /*!< db cursor (with DB_WRITECURSOR) */ -/*@only@*//*@null@*/ void * dbi_stats; /*!< Berkeley db statistics */ +/*@only@*//*@null@*/ + DB * dbi_db; /*!< Berkeley DB * handle */ +/*@only@*//*@null@*/ + DB_TXN * dbi_txnid; /*!< Bekerley DB_TXN * transaction id */ +/*@only@*//*@null@*/ + void * dbi_stats; /*!< Berkeley db statistics */ -/*@observer@*/ const struct _dbiVec * dbi_vec; /*!< private methods */ +/*@observer@*/ + const struct _dbiVec * dbi_vec; /*!< private methods */ }; @@ -395,13 +395,19 @@ extern const char *const prDbiOpenFlags(int dbflags, /** \ingroup dbi * Open a database cursor. * @param dbi index database handle + * @param txnid database transaction handle * @retval dbcp returned database cursor * @param flags DBI_WRITECURSOR, DBI_ITERATOR or 0 * @return 0 on success */ -int dbiCopen(dbiIndex dbi, /*@out@*/ DBC ** dbcp, unsigned int flags) +/*@unused@*/ static inline +int dbiCopen(dbiIndex dbi, /*@null@*/ DB_TXN * txnid, + /*@out@*/ DBC ** dbcp, unsigned int flags) /*@globals fileSystem@*/ - /*@modifies dbi, *dbcp, fileSystem @*/; + /*@modifies dbi, *dbcp, fileSystem @*/ +{ + return (*dbi->dbi_vec->copen) (dbi, txnid, dbcp, flags); +} #define DBI_WRITECURSOR (1 << 0) #define DBI_ITERATOR (1 << 1) @@ -413,59 +419,84 @@ int dbiCopen(dbiIndex dbi, /*@out@*/ DBC ** dbcp, unsigned int flags) * @param flags (unused) * @return 0 on success */ +/*@unused@*/ static inline int dbiCclose(dbiIndex dbi, /*@only@*/ DBC * dbcursor, unsigned int flags) /*@globals fileSystem@*/ - /*@modifies dbi, *dbcursor, fileSystem @*/; + /*@modifies dbi, *dbcursor, fileSystem @*/ +{ + return (*dbi->dbi_vec->cclose) (dbi, dbcursor, flags); +} /** \ingroup dbi * Delete (key,data) pair(s) from index database. * @param dbi index database handle - * @param dbcursor database cursor - * @param keyp key data - * @param keylen key data length + * @param dbcursor database cursor (NULL will use db->del) + * @param key delete key value/length/flags * @param flags (unused) * @return 0 on success */ -int dbiDel(dbiIndex dbi, DBC * dbcursor, const void * keyp, size_t keylen, +/*@unused@*/ static inline +int dbiDel(dbiIndex dbi, /*@null@*/ DBC * dbcursor, DBT * key, unsigned int flags) /*@globals fileSystem@*/ - /*@modifies *dbcursor, fileSystem @*/; + /*@modifies *dbcursor, fileSystem @*/ +{ + int NULkey = + (key && key->data && *((char *)key->data) == '\0' && key->size == 0); + int rc; + + if (NULkey) key->size++; + rc = (dbi->dbi_vec->cdel) (dbi, dbcursor, key, flags); + if (NULkey) key->size--; + return rc; +} + /** \ingroup dbi * Retrieve (key,data) pair from index database. * @param dbi index database handle - * @param dbcursor database cursor - * @param keypp address of key data - * @param keylenp address of key data length - * @param datapp address of data pointer - * @param datalenp address of data length - * @param flags (unused) + * @param dbcursor database cursor (NULL will use db->get) + * @param key retrieve key value/length/flags + * @param data retrieve data value/length/flags * @return 0 on success */ -int dbiGet(dbiIndex dbi, DBC * dbcursor, void ** keypp, - /*@null@*/ size_t * keylenp, - /*@null@*/ void ** datapp, - /*@null@*/ size_t * datalenp, - unsigned int flags) +/*@unused@*/ static inline +int dbiGet(dbiIndex dbi, /*@null@*/ DBC * dbcursor, DBT * key, DBT * data) /*@globals fileSystem@*/ - /*@modifies *dbcursor, **keypp, *keylenp, **datapp, *datalenp, - fileSystem @*/; + /*@modifies *dbcursor, *key, *data, fileSystem @*/ +{ + int NULkey = + (key && key->data && *((char *)key->data) == '\0' && key->size == 0); + int rc; + + if (NULkey) key->size++; + rc = (dbi->dbi_vec->cget) (dbi, dbcursor, key, data); + if (NULkey) key->size--; + return rc; +} /** \ingroup dbi * Store (key,data) pair in index database. * @param dbi index database handle - * @param dbcursor database cursor - * @param keyp key data - * @param keylen key data length - * @param datap data pointer - * @param datalen data length - * @param flags (unused) + * @param dbcursor database cursor (NULL will use db->put) + * @param key store key value/length/flags + * @param data store data value/length/flags * @return 0 on success */ -int dbiPut(dbiIndex dbi, DBC * dbcursor, const void * keyp, size_t keylen, - const void * datap, size_t datalen, unsigned int flags) +/*@unused@*/ static inline +int dbiPut(dbiIndex dbi, /*@null@*/ DBC * dbcursor, DBT * key, DBT * data) /*@globals fileSystem@*/ - /*@modifies *dbcursor, fileSystem @*/; + /*@modifies *dbcursor, *key, fileSystem @*/ +{ + int NULkey = + (key && key->data && *((char *)key->data) == '\0' && key->size == 0); + int rc; + + if (NULkey) key->size++; + rc = (dbi->dbi_vec->cput) (dbi, dbcursor, key, data); + if (NULkey) key->size--; + return rc; +} /** \ingroup dbi * Retrieve count of (possible) duplicate items. @@ -475,11 +506,14 @@ int dbiPut(dbiIndex dbi, DBC * dbcursor, const void * keyp, size_t keylen, * @param flags (unused) * @return 0 on success */ -/*@unused@*/ +/*@unused@*/ static inline int dbiCount(dbiIndex dbi, DBC * dbcursor, /*@out@*/ unsigned int * countp, unsigned int flags) /*@globals fileSystem@*/ - /*@modifies *dbcursor, fileSystem @*/; + /*@modifies *dbcursor, fileSystem @*/ +{ + return (*dbi->dbi_vec->ccount) (dbi, dbcursor, countp, flags); +} /** \ingroup dbi * Verify (and close) index database. @@ -487,9 +521,14 @@ int dbiCount(dbiIndex dbi, DBC * dbcursor, /*@out@*/ unsigned int * countp, * @param flags (unused) * @return 0 on success */ +/*@unused@*/ static inline int dbiVerify(/*@only@*/ dbiIndex dbi, unsigned int flags) /*@globals fileSystem@*/ - /*@modifies dbi, fileSystem @*/; + /*@modifies dbi, fileSystem @*/ +{ + dbi->dbi_verify_on_close = 1; + return (*dbi->dbi_vec->close) (dbi, flags); +} /** \ingroup dbi * Close index database. @@ -497,9 +536,13 @@ int dbiVerify(/*@only@*/ dbiIndex dbi, unsigned int flags) * @param flags (unused) * @return 0 on success */ +/*@unused@*/ static inline int dbiClose(/*@only@*/ dbiIndex dbi, unsigned int flags) /*@globals fileSystem@*/ - /*@modifies dbi, fileSystem @*/; + /*@modifies dbi, fileSystem @*/ +{ + return (*dbi->dbi_vec->close) (dbi, flags); +} /** \ingroup dbi * Flush pending operations to disk. @@ -507,17 +550,29 @@ int dbiClose(/*@only@*/ dbiIndex dbi, unsigned int flags) * @param flags (unused) * @return 0 on success */ +/*@unused@*/ static inline int dbiSync (dbiIndex dbi, unsigned int flags) /*@globals fileSystem@*/ - /*@modifies fileSystem @*/; + /*@modifies fileSystem @*/ +{ + return (*dbi->dbi_vec->sync) (dbi, flags); +} /** \ingroup dbi * Is database byte swapped? * @param dbi index database handle * @return 0 no */ +/*@unused@*/ static inline int dbiByteSwapped(dbiIndex dbi) - /*@*/; + /*@*/ +{ +/*@-mods@*/ /* FIX: shrug */ + if (dbi->dbi_byteswapped == -1) + dbi->dbi_byteswapped = (*dbi->dbi_vec->byteswapped) (dbi); +/*@=mods@*/ + return dbi->dbi_byteswapped; +} /** \ingroup db1 * Return base file name for db1 database (legacy). diff --git a/rpmdb/tdbi.c b/rpmdb/tdbi.c index cece801fb..a7d2046a0 100644 --- a/rpmdb/tdbi.c +++ b/rpmdb/tdbi.c @@ -2,7 +2,7 @@ #include <string.h> #include <stdlib.h> #include <unistd.h> -#include <db3/db.h> +#include <db.h> static char * dbfile = "/var/lib/rpm/Dirnames"; diff --git a/rpmdb/tjfn.c b/rpmdb/tjfn.c index 2472aa4e8..435894489 100644 --- a/rpmdb/tjfn.c +++ b/rpmdb/tjfn.c @@ -6,7 +6,7 @@ #include <unistd.h> #include <stdio.h> -#include <db3/db.h> +#include <db.h> #define RPMDB_HOME "/tmp/rpm" #define RPMDB_Packages "Packages" diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am index 1d29675cc..f08144311 100644 --- a/rpmio/Makefile.am +++ b/rpmio/Makefile.am @@ -18,15 +18,13 @@ pkginc_HEADERS = \ ugid.h noinst_HEADERS = fts.h rpmio_internal.h rpmpgp.h -LIBS += @WITH_ZLIB_LIB@ -lrt -lpthread - BEECRYPTLOBJS = $(shell cat $(top_builddir)/beecrypt/listobjs) lib_LTLIBRARIES = librpmio.la librpmio_la_SOURCES = digest.c fts.c macro.c \ rpmio.c rpmlog.c rpmmalloc.c \ rpmpgp.c rpmrpc.c strcasecmp.c stubs.c url.c ugid.c -librpmio_la_LDFLAGS = -release @VERSION@ +librpmio_la_LDFLAGS = -release @VERSION@ @WITH_ZLIB_LIB@ -lrt -lpthread librpmio_la_LIBADD = $(BEECRYPTLOBJS) librpmio_la_DEPENDENCIES = .created diff --git a/zlib/.cvsignore b/zlib/.cvsignore index 0da19cf29..c81a83f61 100644 --- a/zlib/.cvsignore +++ b/zlib/.cvsignore @@ -6,6 +6,7 @@ Doxytags Makefile Makefile.in apidocs +autom4te-* config.cache config.guess config.h @@ -14,10 +15,14 @@ config.log config.status config.sub configure +depcomp doxygen example +install-sh libtool minigzip +missing +mkinstalldirs stamp-h stamp-h.in *.la diff --git a/zlib/Makefile.in b/zlib/Makefile.in index 9c1e417a2..f943c7102 100644 --- a/zlib/Makefile.in +++ b/zlib/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -12,7 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ @@ -43,9 +43,12 @@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -61,6 +64,10 @@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ AS = @AS@ AWK = @AWK@ @@ -68,12 +75,10 @@ CC = @CC@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ -EXEEXT = @EXEEXT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ STRIP = @STRIP@ @@ -81,7 +86,6 @@ VERSION = @VERSION@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ - AUTOMAKE_OPTIONS = 1.4 foreign EXTRA_DIST = algorithm.txt ChangeLog Doxyfile FAQ INDEX README \ @@ -142,14 +146,15 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/depcomp -@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/adler32.Plo $(DEPDIR)/compress.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/crc32.Plo $(DEPDIR)/deflate.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/example.Po $(DEPDIR)/gzio.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/infblock.Plo $(DEPDIR)/infcodes.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/inffast.Plo $(DEPDIR)/inflate.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/inftrees.Plo $(DEPDIR)/infutil.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/minigzip.Po $(DEPDIR)/trees.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/uncompr.Plo $(DEPDIR)/zutil.Plo +am__depfiles_maybe = depfiles +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/adler32.Plo ./$(DEPDIR)/compress.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/crc32.Plo ./$(DEPDIR)/deflate.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/example.Po ./$(DEPDIR)/gzio.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/infblock.Plo ./$(DEPDIR)/infcodes.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/inffast.Plo ./$(DEPDIR)/inflate.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/inftrees.Plo ./$(DEPDIR)/infutil.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/minigzip.Po ./$(DEPDIR)/trees.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/uncompr.Plo ./$(DEPDIR)/zutil.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ @@ -172,22 +177,11 @@ all: $(BUILT_SOURCES) .SUFFIXES: .SUFFIXES: .c .lo .o .obj - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$@ $(SHELL) ./config.status + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -197,7 +191,7 @@ $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENC $(ACLOCAL_M4): configure.in cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) Doxyfile: $(top_builddir)/config.status Doxyfile.in - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status + cd $(top_builddir) && $(SHELL) ./config.status $@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @@ -219,31 +213,31 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/adler32.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/compress.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/crc32.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/deflate.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/example.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gzio.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/infblock.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/infcodes.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inffast.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inflate.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inftrees.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/infutil.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/minigzip.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/trees.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/uncompr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/zutil.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adler32.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crc32.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deflate.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/example.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzio.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infblock.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infcodes.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inffast.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inflate.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inftrees.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infutil.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/minigzip.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trees.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uncompr.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zutil.Plo@am__quote@ distclean-depend: - -rm -rf $(DEPDIR) + -rm -rf ./$(DEPDIR) .c.o: @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< + $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @@ -255,63 +249,85 @@ distclean-depend: @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< CCDEPMODE = @CCDEPMODE@ + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool uninstall-info-am: +ETAGS = etags +ETAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - mkid -fID $$unique $(LISP) + mkid -fID $$unique TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique GTAGS: - here=`CDPATH=: && cd $(top_builddir) && pwd` \ + here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = . -# Avoid unsightly `./'. distdir = $(PACKAGE)-$(VERSION) +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } + GZIP_ENV = --best +distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) - -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) + $(am__remove_distdir) mkdir $(distdir) $(mkinstalldirs) $(distdir)/. $(distdir)/amiga $(distdir)/contrib $(distdir)/msdos $(distdir)/nt $(distdir)/os2 @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -323,23 +339,28 @@ distdir: $(DISTFILES) ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) -dist: distdir +dist-gzip: distdir + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +dist dist-all: distdir $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) + $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) + $(am__remove_distdir) GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - chmod -R a-w $(distdir); chmod a+w $(distdir) mkdir $(distdir)/=build mkdir $(distdir)/=inst chmod a-w $(distdir) - dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \ + dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ && cd $(distdir)/=build \ && ../configure --srcdir=.. --prefix=$$dc_install_base \ + $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -347,17 +368,24 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ - || (echo "Error: files left after uninstall" 1>&2; \ - exit 1) ) \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && $(MAKE) $(AM_MAKEFLAGS) distclean \ + || { echo "ERROR: files left after uninstall:" ; \ + find $$dc_install_base -type f -print ; \ + exit 1; } >&2 ) \ + && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ && rm -f $(distdir).tar.gz \ - && (test `find . -type f -print | wc -l` -eq 0 \ - || (echo "Error: files left after distclean" 1>&2; \ - exit 1) ) - -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + $(am__remove_distdir) @echo "$(distdir).tar.gz is ready for distribution" | \ sed 'h;s/./=/g;p;x;p;x' +distcleancheck: distclean + if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) @@ -375,6 +403,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -393,9 +422,6 @@ clean: clean-am clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ clean-noinstPROGRAMS mostlyclean-am -dist-all: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) distclean: distclean-am -rm -f config.status config.cache config.log distclean-am: clean-am distclean-compile distclean-depend \ @@ -432,15 +458,15 @@ uninstall-am: uninstall-info-am .PHONY: GTAGS all all-am check check-am clean clean-generic \ clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS dist \ - dist-all distcheck distclean distclean-compile distclean-depend \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool tags uninstall \ - uninstall-am uninstall-info-am + dist-all dist-gzip distcheck distclean distclean-compile \ + distclean-depend distclean-generic distclean-libtool \ + distclean-tags distcleancheck distdir dvi dvi-am info info-am \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + tags uninstall uninstall-am uninstall-info-am .PHONY: sources diff --git a/zlib/aclocal.m4 b/zlib/aclocal.m4 index 5f523addf..8cc143b64 100644 --- a/zlib/aclocal.m4 +++ b/zlib/aclocal.m4 @@ -1,6 +1,6 @@ -# aclocal.m4 generated automatically by aclocal 1.5 +# aclocal.m4 generated automatically by aclocal 1.6.1 -*- Autoconf -*- -# Copyright 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11,11 +11,30 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Do all the work for Automake. This macro actually does too much -- -# some checks are only needed if your package does certain things. -# But this isn't really a big deal. +# Do all the work for Automake. -*- Autoconf -*- -# serial 5 +# This macro actually does too much some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 8 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -24,62 +43,52 @@ # CC etc. in the Makefile, will ask for an AC_PROG_CC use... -# We require 2.13 because we rely on SHELL being computed by configure. -AC_PREREQ([2.13]) - -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -# ----------------------------------------------------------- -# If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED. -# The purpose of this macro is to provide the user with a means to -# check macros which are provided without letting her know how the -# information is coded. -# If this macro is not defined by Autoconf, define it here. -ifdef([AC_PROVIDE_IFELSE], - [], - [define([AC_PROVIDE_IFELSE], - [ifdef([AC_PROVIDE_$1], - [$2], [$3])])]) - +AC_PREREQ([2.52]) -# AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE]) -# ---------------------------------------------- +# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow +# the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AC_PROG_INSTALL])dnl +[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl # test to see if srcdir already configured -if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && +if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first]) + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) fi # Define the identity of the package. -PACKAGE=$1 -AC_SUBST(PACKAGE)dnl -VERSION=$2 -AC_SUBST(VERSION)dnl -ifelse([$3],, +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl + AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl + AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl + +_AM_IF_OPTION([no-define],, [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])]) - -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -# the ones we care about. -ifdef([m4_pattern_allow], - [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl - -# Autoconf 2.50 always computes EXEEXT. However we need to be -# compatible with 2.13, for now. So we always define EXEEXT, but we -# don't compute it. -AC_SUBST(EXEEXT) -# Similar for OBJEXT -- only we only use OBJEXT if the user actually -# requests that it be used. This is a bit dumb. -: ${OBJEXT=o} -AC_SUBST(OBJEXT) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal) +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) AM_MISSING_PROG(AMTAR, tar) @@ -89,9 +98,9 @@ AM_PROG_INSTALL_STRIP # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl -AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_PROVIDE_IFELSE([AC_PROG_][CC], + +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_][CC], [_AM_DEPENDENCIES(CC)], [define([AC_PROG_][CC], defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl @@ -100,11 +109,102 @@ AC_PROVIDE_IFELSE([AC_PROG_][CXX], [define([AC_PROG_][CXX], defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl ]) +]) + +# Copyright 2002 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"]) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION so it can be traced. +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], + [AM_AUTOMAKE_VERSION([1.6.1])]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright 2001, 2002 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 2 + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) # # Check to make sure that the build environment is sane. # +# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + # serial 3 # AM_SANITY_CHECK @@ -148,8 +248,27 @@ Check your system clock]) fi AC_MSG_RESULT(yes)]) +# -*- Autoconf -*- -# serial 2 + +# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 3 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -171,13 +290,29 @@ if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= - am_backtick='`' - AC_MSG_WARN([${am_backtick}missing' script is too old or missing]) + AC_MSG_WARN([`missing' script is too old or missing]) fi ]) # AM_AUX_DIR_EXPAND +# Copyright 2001 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -216,19 +351,59 @@ fi # absolute PATH. The drawback is that using absolute paths prevent a # configured tree to be moved without reconfiguration. +# Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50]) + AC_DEFUN([AM_AUX_DIR_EXPAND], [ # expand $ac_aux_dir to an absolute path -am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` +am_aux_dir=`cd $ac_aux_dir && pwd` ]) # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. + +# Copyright 2001 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl install_sh=${install_sh-"$am_aux_dir/install-sh"} AC_SUBST(install_sh)]) +# AM_PROG_INSTALL_STRIP + +# Copyright 2001 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + # One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip @@ -238,11 +413,35 @@ AC_SUBST(install_sh)]) # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) # serial 4 -*- Autoconf -*- +# Copyright 1999, 2000, 2001 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be @@ -254,9 +453,9 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) # _AM_DEPENDENCIES(NAME) -# --------------------- +# ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX" or "OBJC". +# NAME is "CC", "CXX", "GCJ", or "OBJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -333,8 +532,7 @@ else am_cv_$1_dependencies_compiler_type=none fi ]) -$1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type" -AC_SUBST([$1DEPMODE]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) ]) @@ -352,7 +550,7 @@ else DEPDIR=_deps fi rmdir .deps 2>/dev/null -AC_SUBST(DEPDIR) +AC_SUBST([DEPDIR]) ]) @@ -367,30 +565,42 @@ if test "x$enable_dependency_tracking" != xno; then AMDEPBACKSLASH='\' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -pushdef([subst], defn([AC_SUBST])) -subst(AMDEPBACKSLASH) -popdef([subst]) +AC_SUBST([AMDEPBACKSLASH]) ]) -# Generate code to set up dependency tracking. -# This macro should only be invoked once -- use via AC_REQUIRE. -# Usage: -# AM_OUTPUT_DEPENDENCY_COMMANDS +# Generate code to set up dependency tracking. -*- Autoconf -*- -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[ -AC_OUTPUT_COMMANDS([ -test x"$AMDEP_TRUE" != x"" || -for mf in $CONFIG_FILES; do - case "$mf" in - Makefile) dirpart=.;; - */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; - *) continue;; - esac - grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue +# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +#serial 2 + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + if (sed 1q $mf | fgrep 'generated by automake') > /dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue # Extract the definition of DEP_FILES from the Makefile without # running `make'. DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` @@ -414,14 +624,46 @@ for mf in $CONFIG_FILES; do sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue - fdir=`echo "$file" | sed -e 's|/[^/]*$||'` - $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1 + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done done -], [AMDEP_TRUE="$AMDEP_TRUE" -ac_aux_dir="$ac_aux_dir"])]) +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) + +# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*- + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 2 # AM_MAKE_INCLUDE() # ----------------- @@ -434,7 +676,7 @@ doit: END # If we don't find an include directive, just comment out the code. AC_MSG_CHECKING([for style of include used by $am_make]) -am__include='#' +am__include="#" am__quote= _am_result=none # First try GNU make style include. @@ -454,7 +696,7 @@ if test "$am__include" = "#"; then echo '.include "confinc"' > confmf if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then am__include=.include - am__quote='"' + am__quote="\"" _am_result=BSD fi fi @@ -464,23 +706,35 @@ AC_MSG_RESULT($_am_result) rm -f confinc confmf ]) -# serial 3 +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright 1997, 2000, 2001 Free Software Foundation, Inc. + +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 5 + +AC_PREREQ(2.52) # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. -# -# FIXME: Once using 2.50, use this: -# m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl AC_DEFUN([AM_CONDITIONAL], -[ifelse([$1], [TRUE], - [errprint(__file__:__line__: [$0: invalid condition: $1 -])dnl -m4exit(1)])dnl -ifelse([$1], [FALSE], - [errprint(__file__:__line__: [$0: invalid condition: $1 -])dnl -m4exit(1)])dnl +[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE]) AC_SUBST([$1_FALSE]) if $2; then @@ -489,7 +743,12 @@ if $2; then else $1_TRUE='#' $1_FALSE= -fi]) +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([conditional \"$1\" was never defined. +Usually this means the macro was only invoked conditionally.]) +fi])]) # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*- diff --git a/zlib/autogen.sh b/zlib/autogen.sh index 76be53bb6..60700bfff 100755 --- a/zlib/autogen.sh +++ b/zlib/autogen.sh @@ -3,7 +3,7 @@ libtoolize --copy --force aclocal autoheader -automake +automake -a -c autoconf if [ "$1" = "--noconfigure" ]; then diff --git a/zlib/configure.in b/zlib/configure.in index 3f2833876..7dd14408c 100644 --- a/zlib/configure.in +++ b/zlib/configure.in @@ -1,5 +1,7 @@ AC_INIT(gzio.c) AC_CANONICAL_SYSTEM +AC_PREREQ(2.12) +AC_CONFIG_HEADERS AM_INIT_AUTOMAKE(zlib, 1.1.4) dnl Check for programs. diff --git a/zlib/depcomp b/zlib/depcomp deleted file mode 100755 index 65899658e..000000000 --- a/zlib/depcomp +++ /dev/null @@ -1,411 +0,0 @@ -#! /bin/sh - -# depcomp - compile a program generating dependencies as side-effects -# Copyright 1999, 2000 Free Software Foundation, Inc. - -# 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, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# 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. - -# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>. - -if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -fi -# `libtool' can also be set to `yes' or `no'. - -depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`} -tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} - -rm -f "$tmpdepfile" - -# Some modes work just like other modes, but use different flags. We -# parameterize here, but still list the modes in the big case below, -# to make depend.m4 easier to write. Note that we *cannot* use a case -# here, because this file can only contain one case statement. -if test "$depmode" = hp; then - # HP compiler uses -M and no extra arg. - gccflag=-M - depmode=gcc -fi - -if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout -fi - -case "$depmode" in -gcc3) -## gcc 3 implements dependency tracking that does exactly what -## we want. Yay! Note: for some reason libtool 1.4 doesn't like -## it if -MD -MP comes after the -MF stuff. Hmm. - "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## There are various ways to get dependency output from gcc. Here's -## why we pick this rather obscure method: -## - Don't want to use -MD because we'd like the dependencies to end -## up in a subdir. Having to rename by hand is ugly. -## (We might end up doing this anyway to support other compilers.) -## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). -## - Using -M directly means running the compiler twice (even worse -## than renaming). - if test -z "$gccflag"; then - gccflag=-MD, - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. -## The problem is that when a header file which appears in a .P file -## is deleted, the dependency causes make to die (because there is -## typically no way to rebuild the header). We avoid this by adding -## dummy dependencies for each header file. Too bad gcc doesn't do -## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory -## that the space means something, we add a space to the output as -## well. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -sgi) - if test "$libtool" = yes; then - "$@" "-Wp,-MDupdate,$tmpdepfile" - else - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" - - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the - # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> $depfile - echo >> $depfile - - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -aix) - # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. This file always lives in the current directory. - # Also, the AIX compiler puts `$object:' at the start of each line; - # $object doesn't have directory information. - stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'` - tmpdepfile="$stripped.u" - outname="$stripped.o" - if test "$libtool" = yes; then - "$@" -Wc,-M - else - "$@" -M - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" - sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -tru64) - # The Tru64 AIX compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - - tmpdepfile1="$object.d" - tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` - if test "$libtool" = yes; then - "$@" -Wc,-MD - else - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" - exit $stat - fi - - if test -f "$tmpdepfile1"; then - tmpdepfile="$tmpdepfile1" - else - tmpdepfile="$tmpdepfile2" - fi - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a space and a tab in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -#nosideeffect) - # This comment above is used by automake to tell side-effect - # dependency tracking mechanisms from slower ones. - -dashmstdout) - # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - test -z "$dashmflag" && dashmflag=-M - ( IFS=" " - case " $* " in - *" --mode=compile "*) # this is libtool, let us make it quiet - for arg - do # cycle over the arguments - case "$arg" in - "--mode=compile") - # insert --quiet before "--mode=compile" - set fnord "$@" --quiet - shift # fnord - ;; - esac - set fnord "$@" "$arg" - shift # fnord - shift # "$arg" - done - ;; - esac - "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -dashXmstdout) - # This case only exists to satisfy depend.m4. It is never actually - # run, as this mode is specially recognized in the preamble. - exit 1 - ;; - -makedepend) - # X makedepend - ( - shift - cleared=no - for arg in "$@"; do - case $cleared in no) - set ""; shift - cleared=yes - esac - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift;; - -*) - ;; - *) - set fnord "$@" "$arg"; shift;; - esac - done - obj_suffix="`echo $object | sed 's/^.*\././'`" - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tail +3 "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" "$tmpdepfile".bak - ;; - -cpp) - # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - ( IFS=" " - case " $* " in - *" --mode=compile "*) - for arg - do # cycle over the arguments - case $arg in - "--mode=compile") - # insert --quiet before "--mode=compile" - set fnord "$@" --quiet - shift # fnord - ;; - esac - set fnord "$@" "$arg" - shift # fnord - shift # "$arg" - done - ;; - esac - "$@" -E | - sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - cat < "$tmpdepfile" >> "$depfile" - sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvisualcpp) - # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - ( IFS=" " - case " $* " in - *" --mode=compile "*) - for arg - do # cycle over the arguments - case $arg in - "--mode=compile") - # insert --quiet before "--mode=compile" - set fnord "$@" --quiet - shift # fnord - ;; - esac - set fnord "$@" "$arg" - shift # fnord - shift # "$arg" - done - ;; - esac - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -none) - exec "$@" - ;; - -*) - echo "Unknown depmode $depmode" 1>&2 - exit 1 - ;; -esac - -exit 0 |