From 4cc3ae4b3a3abda38828926b589d422596af81a8 Mon Sep 17 00:00:00 2001 From: Scott James Remnant Date: Mon, 21 Mar 2005 03:10:27 +0000 Subject: [PATCH] dpkg (1.13.3) experimental; urgency=low The "Paying off Karma at a vastly acclerated rate" Release. * Missing newline added to warning output function. Closes: #283798. * Fixed prototype warning in dpkg-scansources. Closes: #213577, #219760, #267505. * Removed trailing line from debian origins file. Closes: #264904. * Changed dpkg-buildpackage to say "source changed by" rather than "source maintainer is". Closes: #247313. * Fixed dpkg-gencontrol to allow '-' in architecture names. Closes: #274677. * Fixed "unknown information field" error to report field that it doesn't know about. Closes: #275243. * Documentation: - Remove "medium-level" from description of dpkg. Closes: #292454. - Harmonised argument names in update-alternatives(8). Closes: #267095, #284941 - Documented what the '+' and '*' mean in update-alternatives --config output. Closes: #270486. - Mention aptitude alongside dselect in 'dpkg --usage' and 'dpkg-deb --help', fix quote style of mention in 'dpkg --help'. Closes: #274800, #278118. - Associate --truename with the description of what it does in dpkg-divert(8). Closes: #277076. - Removed last remaining references to the packaging manual, replacing with better references. Closes: #262775. - Documented format of file dpkg --set-selections takes. Closes: #270043. -- Scott James Remnant Mon, 21 Mar 2005 03:10:27 +0000 --- ChangeLog | 73 +++++++++++++++++++++++++++++++++++ configure | 20 +++++----- configure.ac | 2 +- debian/changelog | 40 +++++++++++++++++-- dpkg-deb/main.c | 4 +- lib/ehandle.c | 2 +- man/C/deb-old.5 | 7 +--- man/C/deb.5 | 9 ++--- man/C/dpkg-divert.8 | 4 +- man/C/dpkg-source.1 | 15 ++----- man/C/dpkg.1 | 13 ++++--- man/C/dselect.1 | 7 ++-- man/C/update-alternatives.8 | 27 ++++++------- origins/debian | 1 - po/bs.gmo | Bin 5560 -> 5560 bytes po/bs.po | 62 ++++++++++++++--------------- po/ca.gmo | Bin 143949 -> 138743 bytes po/ca.po | 64 +++++++++++++++--------------- po/cs.gmo | Bin 133059 -> 128418 bytes po/cs.po | 64 +++++++++++++++--------------- po/da.gmo | Bin 134146 -> 129406 bytes po/da.po | 64 +++++++++++++++--------------- po/de.gmo | Bin 139574 -> 134679 bytes po/de.po | 64 +++++++++++++++--------------- po/dpkg.pot | 62 ++++++++++++++--------------- po/el.gmo | Bin 186635 -> 180218 bytes po/el.po | 64 +++++++++++++++--------------- po/es.gmo | Bin 142382 -> 137100 bytes po/es.po | 64 +++++++++++++++--------------- po/eu.gmo | Bin 137884 -> 132995 bytes po/eu.po | 64 +++++++++++++++--------------- po/fr.gmo | Bin 149495 -> 143981 bytes po/fr.po | 64 +++++++++++++++--------------- po/gl.gmo | Bin 139316 -> 134150 bytes po/gl.po | 64 +++++++++++++++--------------- po/he.gmo | Bin 731 -> 731 bytes po/he.po | 62 ++++++++++++++--------------- po/id.gmo | Bin 53824 -> 53824 bytes po/id.po | 62 ++++++++++++++--------------- po/it.gmo | Bin 142241 -> 137253 bytes po/it.po | 64 +++++++++++++++--------------- po/ja.gmo | Bin 136362 -> 131830 bytes po/ja.po | 64 +++++++++++++++--------------- po/ko.gmo | Bin 152309 -> 147080 bytes po/ko.po | 64 +++++++++++++++--------------- po/nb.gmo | Bin 134996 -> 130260 bytes po/nb.po | 64 +++++++++++++++--------------- po/nl.gmo | Bin 137214 -> 132346 bytes po/nl.po | 64 +++++++++++++++--------------- po/nn.gmo | Bin 135074 -> 130335 bytes po/nn.po | 64 +++++++++++++++--------------- po/pl.gmo | Bin 136765 -> 131912 bytes po/pl.po | 64 +++++++++++++++--------------- po/pt.gmo | Bin 139534 -> 134722 bytes po/pt.po | 64 +++++++++++++++--------------- po/pt_BR.gmo | Bin 137510 -> 132573 bytes po/pt_BR.po | 64 +++++++++++++++--------------- po/ru.gmo | Bin 190237 -> 183330 bytes po/ru.po | 64 +++++++++++++++--------------- po/sk.gmo | Bin 135922 -> 131298 bytes po/sk.po | 64 +++++++++++++++--------------- po/sv.gmo | Bin 133332 -> 128501 bytes po/sv.po | 64 +++++++++++++++--------------- po/zh_CN.gmo | Bin 138519 -> 133479 bytes po/zh_CN.po | 64 +++++++++++++++--------------- po/zh_TW.gmo | Bin 137150 -> 132213 bytes po/zh_TW.po | 64 +++++++++++++++--------------- scripts/changelog/debian.pl | 4 +- scripts/controllib.pl | 3 +- scripts/dpkg-buildpackage.sh | 12 +++--- scripts/dpkg-gencontrol.pl | 2 +- scripts/dpkg-scansources.pl | 2 +- src/main.c | 4 +- src/query.c | 18 +++++---- 74 files changed, 1066 insertions(+), 923 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5a39fcb..19176309 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,78 @@ +2005-03-21 Scott James Remnant + + * scripts/controllib.pl (unknown): Output field name we have in + hand, rather than trying to look it up in a dictionary in which + it doesn't exist yet. + + * scripts/changelog/debian.pl: Revert accidental half-patch that + turned the Maintainer field into a Changed-By field. + +2005-03-21 Marc Dequènes + + * scripts/dpkg-gencontrol.pl: Fix filename regexp to allow '-' + in architecture names. + +2005-03-20 Scott James Remnant + + * scripts/dpkg-buildpackage.sh: Output "source changed by" + rather than "source maintainer is". + + * man/C/dpkg.1: Document that --get-selections takes a package + name pattern. Document format of file --set-selections takes. + + * man/C/dpkg-source.1: Remove unnecessary references to policy + and non-existant packaging manual. Refer to dpkg-shlibdeps(1) + for shlibs file format. Will need to document changelog format + at some point. + * man/C/dselect.1: Remove unnecessary reference to policy, refer + other reference to the package by name. + * man/C/deb-old.5: Remove reference to non-existant packaging + manual. + * man/C/deb.5: Remove reference to non-existant packaging + manual, will have to document control contents better here later. + + * man/C/dpkg.1: Fix typo (fileis -> file is). + + * origins/debian: Remove trailing line. + +2005-03-20 Mathias Weidner + + * scripts/dpkg-scansources.pl (getopt): Add (@) to prototype. + +2005-03-20 Scott James Remnant + + * man/C/update-alternatives.8: Document what the '+' and '*' + marked choices in --config output mean. + + * src/main.c (usage): Make aptitude quoting consistent. + + * man/C/dpkg-divert.8: Mention --truename alongside the comment + about what it does. + + * src/main.c (printforhelp): Mention aptitude alongside dselect. + * dpkg-deb/main.c (usage): Mention aptitude alongside dselect. + + * lib/ehandle.c (warningf): Add missing newline to end of format + string. + + * man/C/update-alternatives.8: Harmonise names for arguments to + --install option. + + * man/C/dpkg.1: Remove "medium-level" from dpkg's description, + it's somewhere between medium and low. The fact it's a package + manager is sufficient description. + + * src/query.c (listpackages): Create a second filtered list of + packages, sort that (rather than the complete list) and use that + when calling list1package. This means we only expand to the + longest field in the result, not the database. Hopefully the + speed gain of only sorting a filtered list outweights the slighty + extra computation time. + 2005-03-18 Scott James Remnant + * configure.ac: Bump version to 1.13.3~. + * configure.ac: Release 1.13.2. * src/query.c (getwidth): Return -1 if we're not on a tty. diff --git a/configure b/configure index 7de48daf..615fa100 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for dpkg 1.13.2. +# Generated by GNU Autoconf 2.59 for dpkg 1.13.3. # # Report bugs to . # @@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='dpkg' PACKAGE_TARNAME='dpkg' -PACKAGE_VERSION='1.13.2' -PACKAGE_STRING='dpkg 1.13.2' +PACKAGE_VERSION='1.13.3' +PACKAGE_STRING='dpkg 1.13.3' PACKAGE_BUGREPORT='debian-dpkg@lists.debian.org' ac_unique_file="lib/dpkg.h" @@ -816,7 +816,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures dpkg 1.13.2 to adapt to many kinds of systems. +\`configure' configures dpkg 1.13.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -883,7 +883,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dpkg 1.13.2:";; + short | recursive ) echo "Configuration of dpkg 1.13.3:";; esac cat <<\_ACEOF @@ -1037,7 +1037,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -dpkg configure 1.13.2 +dpkg configure 1.13.3 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1051,7 +1051,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dpkg $as_me 1.13.2, which was +It was created by dpkg $as_me 1.13.3, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1841,7 +1841,7 @@ fi # Define the identity of the package. PACKAGE='dpkg' - VERSION='1.13.2' + VERSION='1.13.3' cat >>confdefs.h <<_ACEOF @@ -15388,7 +15388,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by dpkg $as_me 1.13.2, which was +This file was extended by dpkg $as_me 1.13.3, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15451,7 +15451,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -dpkg config.status 1.13.2 +dpkg config.status 1.13.3 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 13631176..0319d477 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([dpkg], [1.13.2], [debian-dpkg@lists.debian.org]) +AC_INIT([dpkg], [1.13.3], [debian-dpkg@lists.debian.org]) AC_CONFIG_SRCDIR([lib/dpkg.h]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/debian/changelog b/debian/changelog index 71db8dd7..2a0bb7c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,37 @@ +dpkg (1.13.3) experimental; urgency=low + + The "Paying off Karma at a vastly acclerated rate" Release. + + * Missing newline added to warning output function. Closes: #283798. + * Fixed prototype warning in dpkg-scansources. Closes: #213577, #219760, + #267505. + * Removed trailing line from debian origins file. Closes: #264904. + * Changed dpkg-buildpackage to say "source changed by" rather than + "source maintainer is". Closes: #247313. + * Fixed dpkg-gencontrol to allow '-' in architecture names. Closes: #274677. + * Fixed "unknown information field" error to report field that it doesn't + know about. Closes: #275243. + + * Documentation: + - Remove "medium-level" from description of dpkg. Closes: #292454. + - Harmonised argument names in update-alternatives(8). + Closes: #267095, #284941 + - Documented what the '+' and '*' mean in update-alternatives --config + output. Closes: #270486. + - Mention aptitude alongside dselect in 'dpkg --usage' and + 'dpkg-deb --help', fix quote style of mention in 'dpkg --help'. + Closes: #274800, #278118. + - Associate --truename with the description of what it does in + dpkg-divert(8). Closes: #277076. + - Removed last remaining references to the packaging manual, replacing + with better references. Closes: #262775. + - Documented format of file dpkg --set-selections takes. Closes: #270043. + + -- Scott James Remnant Mon, 21 Mar 2005 03:10:27 +0000 + dpkg (1.13.2) experimental; urgency=low + + The "Mysteriously Unnamed" Release. * md5sum has been removed, the coreutils or textutils version will be diverted to /usr/bin/md5sum. Closes: #6633, #136110. @@ -84,11 +117,12 @@ dpkg (1.13.0) experimental; urgency=low * Correct bashism in disk method update script. Closes: #260568. * Scorched-earth reimplementation of the build process and control files - with debhelper and automake. Closes: #217946, #229629, #256589, #260568, - #266995, #283640, #292973, #293041. + with debhelper and automake. Closes: #200683, #217946, #229629, #260568, + #266995, #279701, #283640, #292973, #293041. * Remove SGML and POD documentation formats due to both licensing and - sanity issues. Closes: #285086. + sanity issues. Closes: #285806. * The dpkg-doc and dpkg-static packages are no more. + * dpkg.cfg cleaned up to remove non-useful examples. Closes: #169618. -- Scott James Remnant Fri, 14 Jan 2005 19:28:00 +0000 diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c index 494acda2..5c1773e6 100644 --- a/dpkg-deb/main.c +++ b/dpkg-deb/main.c @@ -90,8 +90,8 @@ static void usage(void) { " case left alignment will be used. \n" "\n" "Use `dpkg' to install and remove packages from your system, or\n" -"`dselect' for user-friendly package management. Packages unpacked\n" -"using `dpkg-deb --extract' will be incorrectly installed !\n"), +"`dselect' or `aptitude' for user-friendly package management. Packages\n" +"unpacked using `dpkg-deb --extract' will be incorrectly installed !\n"), stdout) < 0) werr("stdout"); } diff --git a/lib/ehandle.c b/lib/ehandle.c index f04217eb..7b6c09bc 100644 --- a/lib/ehandle.c +++ b/lib/ehandle.c @@ -266,7 +266,7 @@ void warningf(const char *fmt, ...) { vsnprintf(buf,sizeof(buf),fmt,al); va_end(al); - fprintf(stderr,"%s: %s",buf,strerror(e)); + fprintf(stderr,"%s: %s\n",buf,strerror(e)); } void badusage(const char *fmt, ...) { diff --git a/man/C/deb-old.5 b/man/C/deb-old.5 index 0c2c2dbb..828b78b8 100644 --- a/man/C/deb-old.5 +++ b/man/C/deb-old.5 @@ -26,9 +26,7 @@ the length of the first gzipped tarfile. Each of these lines is terminated with a single newline character. .PP The first tarfile contains the control information, as a series of -ordinary files, described in -.IR "Debian Packaging Manual, section 2.2". -The file +ordinary files. The file .B control must be present, as it contains the core control information. .PP @@ -49,5 +47,4 @@ on. The pathnames do not have leading slashes. .SH SEE ALSO .BR deb (5), .BR dpkg-deb (1), -.BR deb-control (5), -.IR "Debian Packaging Manual". +.BR deb-control (5). diff --git a/man/C/deb.5 b/man/C/deb.5 index 57358160..ebe56b86 100644 --- a/man/C/deb.5 +++ b/man/C/deb.5 @@ -39,10 +39,8 @@ The second required member is named It is a gzipped tar archive containing the package control information, as a series of plain files, of which the file .B control -is mandatory and contains the core control information. Please see the -.I "Debian Packaging Manual, section 2.2" -for details of these files. The control tarball may optionally contain -an entry for +is mandatory and contains the core control information. The control +tarball may optionally contain an entry for .RB ` . ', the current directory. .PP @@ -69,5 +67,4 @@ with names starting with something other than underscores, or will .SH SEE ALSO .BR deb-old (5), .BR dpkg-deb (1), -.BR deb-control (5), -.IR "Debian Packaging Manual". +.BR deb-control (5). diff --git a/man/C/dpkg-divert.8 b/man/C/dpkg-divert.8 index b09b397d..6e3b82e0 100644 --- a/man/C/dpkg-divert.8 +++ b/man/C/dpkg-divert.8 @@ -32,8 +32,8 @@ contains those files. is the utility used to set up and update the list of diversions. It functions in three basic modes - adding, removing, and listing diversions. The options are \-\-add, \-\-remove, and \-\-list, respectively. Additionally, -it can print out the real name for a diverted file. Other options -(listed below) may also be specified. +it can print out the real name for a diverted file with \-\-truename. +Other options (listed below) may also be specified. .SH OPTIONS .TP .I \-\-admindir diff --git a/man/C/dpkg-source.1 b/man/C/dpkg-source.1 index 4ad357f6..8f79c112 100644 --- a/man/C/dpkg-source.1 +++ b/man/C/dpkg-source.1 @@ -60,8 +60,8 @@ control area file of the package containing the file which .B objdump reports as satisfying the library dependency, or .BR /etc/dpkg/shlibs.default . -The first match will be used. See the -.I Debian packaging manual +The first match will be used. See +.BR dpkg-shlibdeps 1 for details of the format of shared library dependency files. .B dpkg\-genchanges @@ -228,11 +228,8 @@ This option is understood by .TP .BI \-F changelogformat Specifies the format of the changelog. By default the format is read -from a special line near the bottom of the changelog (see the -Debian packaging manual) or failing that defaults to -.BR debian , -the standard format described in the -.IR "Debian packaging manual" . +from a special line near the bottom of the changelog or failing that +defaults to the debian standard format. This option is understood by .BR dpkg\-source ", " dpkg\-gencontrol " and " dpkg\-genchanges . .TP @@ -801,10 +798,6 @@ It should be possible to specify spaces and shell metacharacters in and initial arguments for .IR gain-root-command " and " sign-command . .SH SEE ALSO -.IR "Debian packaging manual" , -.br -.IR "Debian policy manual" , -.br .BR dpkg\-deb (1), .BR dpkg (8), .BR dselect (8), diff --git a/man/C/dpkg.1 b/man/C/dpkg.1 index 34591a05..0730eb9d 100644 --- a/man/C/dpkg.1 +++ b/man/C/dpkg.1 @@ -1,6 +1,6 @@ .TH DPKG 1 "April 12, 1998" "Debian Project" "dpkg suite" .SH NAME -dpkg - a medium-level package manager for Debian +dpkg - package manager for Debian .SH SYNOPSIS .B dpkg @@ -17,7 +17,7 @@ descriptions of what \fBdpkg\fP does when installing and removing packages are particularly inadequate. .SH DESCRIPTION -\fBdpkg\fP is a medium-level tool to install, build, remove and manage +\fBdpkg\fP is a tool to install, build, remove and manage Debian packages. The primary and more user-friendly front-end for \fBdpkg\fP is \fBdselect\fP(8). \fBdpkg\fP itself is controlled entirely via command line parameters, which consist of exactly @@ -175,7 +175,7 @@ Debian is simply named \fIPackages\fP. \fBdpkg\fP keeps its record of available packages in \fI/var/lib/dpkg/available\fP. A simpler one-shot command to retrieve and update the \fIavailable\fR -fileis \fBdselect update\fR. +file is \fBdselect update\fR. .TP \fBdpkg \-A\fP | \fB\-\-record\-avail\fP \fIpackage_file\fP ... Update \fBdpkg\fP and \fBdselect\fP's idea of which packages are @@ -194,11 +194,14 @@ Searches for packages that have been installed only partially on your system. \fBdpkg\fP will suggest what to do with them to get them working. .TP -\fBdpkg \-\-get\-selections\fP [\fIpattern\fP...] +\fBdpkg \-\-get\-selections\fP [\fIpackage-name-pattern\fP...] Get list of package selections, and write it to stdout. .TP .B dpkg \-\-set\-selections -Set package selections using file read from stdin. +Set package selections using file read from stdin. This file should be +in the format ' ', where state is one of install, hold, +deinstall or purge. Blank lines and comment lines beginning with '#' +are also permitted. .TP .B dpkg \-\-yet\-to\-unpack Searches for packages selected for installation, but which for some diff --git a/man/C/dselect.1 b/man/C/dselect.1 index 32b10813..cd796322 100644 --- a/man/C/dselect.1 +++ b/man/C/dselect.1 @@ -216,7 +216,9 @@ in doing so and can not be assumed to be a sufficient substitute for administrator skill and understanding. The user is required to be familiar with the concepts underlying the Debian packaging system. In case of doubt, consult the \fBdpkg(8)\fP manpage and the Debian -policy manual. +Policy manual, contained in the +.B debian-policy +package. .sp Unless \fBdselect\fP is run in expert or immediate mode, a help screen is first displayed when choosing this @@ -428,8 +430,7 @@ broken, it is also much more flexible than the built in access methods. .BR dpkg (8), .BR apt-get (8), .BR sources.list (5), -.BR deb (5), -the Debian policy manual. +.BR deb (5). .SH AUTHORS .B dselect was written by Ian Jackson (ijackson@gnu.ai.mit.edu). Full list of diff --git a/man/C/update-alternatives.8 b/man/C/update-alternatives.8 index 4792bb7c..1c1d216f 100644 --- a/man/C/update-alternatives.8 +++ b/man/C/update-alternatives.8 @@ -1,4 +1,4 @@ -.\" update\-alternatives.8 +C.\" update\-alternatives.8 .\" This man page is copyright 1997 Charles Briscoe-Smith .\" This is free documentation; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published @@ -12,10 +12,10 @@ update\-alternatives - maintain symbolic links determining default commands .B update\-alternatives .RI [ options ] .B \-\-install -.I link name path priority +.I genname symlink altern priority .RB [ \-\-slave -.I link name -.IR path ]... +.I genname symlink +.IR altern ]... .PP .B update\-alternatives .RI [ options ] @@ -162,7 +162,8 @@ option, will list all of the choices for the link group of which given .I name -is the master link. +is the master link. The current choice is marked with a '*' and the +choice with the highest priority with a '+'. You will then be prompted for which of the choices to use for the link group. Once you make a change, the link group will no longer be in @@ -307,20 +308,16 @@ different from the default. .\" The names of the arguments should be identical with the ones .\" in SYNOPSIS section. .TP -\fB\-\-install\fR \fIgen link alt pri\fR [\fB\-\-slave\fR \fIsgen slink salt\fR] ... +\fB\-\-install\fR \fIgenname symlink altern priority\fR [\fB\-\-slave\fR \fIgenname symlink altern\fR] ... Add a group of alternatives to the system. -.I gen +.I genname is the generic name for the master link, -.I link +.I symlink is the name of its symlink in the alternatives directory, and -.I alt +.I altern is the alternative being introduced for the master link. -.IR sgen , -.I slink -and -.I salt -are the generic name, symlink name in the alternatives directory and alternative -for a slave link. +The arguments after \fB\-\-slave\fR are the generic name, symlink name in the +alternatives directory and alternative for a slave link. Zero or more .B \-\-slave options, each followed by three arguments, diff --git a/origins/debian b/origins/debian index 2b03caea..91f6ed1d 100644 --- a/origins/debian +++ b/origins/debian @@ -1,4 +1,3 @@ Vendor: Debian Vendor-URL: http://www.debian.org/ Bugs: debbugs://bugs.debian.org - diff --git a/po/bs.gmo b/po/bs.gmo index 6ee232a3970cadc21c7893b5461be49b684ff881..862044ad9782a746676b4564577005e57c032802 100644 GIT binary patch delta 21 ccmdm?y+eBgA0LO2p@M<2m7(EgF}_9Y07QcYod5s; delta 21 ccmdm?y+eBgA0LOIg@U1(m66eAF}_9Y07U!+sQ>@~ diff --git a/po/bs.po b/po/bs.po index 961c4619..8cbcc5c5 100644 --- a/po/bs.po +++ b/po/bs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2005-03-18 16:22+0000\n" +"POT-Creation-Date: 2005-03-21 03:11+0000\n" "PO-Revision-Date: 2004-11-27 01:29+0100\n" "Last-Translator: Safir Å ećerović \n" "Language-Team: Bosnian \n" @@ -1992,14 +1992,14 @@ msgstr "" msgid "' package management program version " msgstr "" -#: src/main.c:48 src/query.c:458 +#: src/main.c:48 src/query.c:462 msgid "" "This is free software; see the GNU General Public Licence version 2 or\n" "later for copying conditions. There is NO warranty.\n" "See " msgstr "" -#: src/main.c:50 src/query.c:460 +#: src/main.c:50 src/query.c:464 msgid " --licence for copyright and license details.\n" msgstr "" @@ -2067,13 +2067,13 @@ msgid "" " lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n" " < << <= = >= >> > (only for compatibility with control file syntax).\n" "\n" -"Use `dselect' or 'aptitude' for user-friendly package management.\n" +"Use `dselect' or `aptitude' for user-friendly package management.\n" msgstr "" #: src/main.c:119 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" -"Use dselect for user-friendly package management;\n" +"Use `dselect' or `aptitude' for user-friendly package management;\n" "Type dpkg -Dhelp for a list of dpkg debug flag values;\n" "Type dpkg --force-help for a list of forcing options;\n" "Type dpkg-deb --help for help about manipulating *.deb files;\n" @@ -2084,7 +2084,7 @@ msgid "" "`more' !" msgstr "" -#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145 +#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "" @@ -2220,7 +2220,7 @@ msgstr "" msgid "unexpected eof before end of line %d" msgstr "" -#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184 +#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184 #: dpkg-split/main.c:157 msgid "need an action option" msgstr "" @@ -2230,7 +2230,7 @@ msgstr "" msgid "--%s --pending does not take any non-option arguments" msgstr "" -#: src/packages.c:109 src/query.c:317 +#: src/packages.c:109 src/query.c:321 #, c-format msgid "--%s needs at least one package name argument" msgstr "" @@ -2511,98 +2511,98 @@ msgstr "Verzija" msgid "Description" msgstr "Opis" -#: src/query.c:220 src/query.c:442 src/select.c:80 +#: src/query.c:218 src/query.c:446 src/select.c:80 #, c-format msgid "No packages found matching %s.\n" msgstr "" -#: src/query.c:236 +#: src/query.c:240 #, c-format msgid "diversion by %s" msgstr "" -#: src/query.c:237 +#: src/query.c:241 #, c-format msgid "local diversion" msgstr "" -#: src/query.c:238 +#: src/query.c:242 msgid "to" msgstr "za" -#: src/query.c:238 +#: src/query.c:242 msgid "from" msgstr "od" -#: src/query.c:271 +#: src/query.c:275 msgid "--search needs at least one file name pattern argument" msgstr "" -#: src/query.c:299 +#: src/query.c:303 #, c-format msgid "dpkg: %s not found.\n" msgstr "" -#: src/query.c:337 +#: src/query.c:341 #, c-format msgid "Package `%s' is not installed and no info is available.\n" msgstr "" -#: src/query.c:346 +#: src/query.c:350 #, c-format msgid "Package `%s' is not available.\n" msgstr "" -#: src/query.c:356 +#: src/query.c:360 #, c-format msgid "Package `%s' is not installed.\n" msgstr "" -#: src/query.c:365 +#: src/query.c:369 #, c-format msgid "Package `%s' does not contain any files (!)\n" msgstr "" -#: src/query.c:371 +#: src/query.c:375 #, c-format msgid "locally diverted" msgstr "" -#: src/query.c:372 +#: src/query.c:376 #, c-format msgid "package diverts others" msgstr "" -#: src/query.c:373 +#: src/query.c:377 #, c-format msgid "diverted by %s" msgstr "" -#: src/query.c:374 +#: src/query.c:378 #, c-format msgid " to: %s\n" msgstr "" -#: src/query.c:393 +#: src/query.c:397 msgid "" "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" msgstr "" -#: src/query.c:454 dpkg-deb/main.c:46 +#: src/query.c:458 dpkg-deb/main.c:46 msgid "Debian `" msgstr "Debian `" -#: src/query.c:456 +#: src/query.c:460 msgid "' package management program query tool\n" msgstr "" -#: src/query.c:468 +#: src/query.c:472 #, c-format msgid "Usage: " msgstr "Upotreba:" -#: src/query.c:469 +#: src/query.c:473 #, c-format msgid "" " [