moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Dan McGee 2009-02-18 21:20:17 -06:00
parent 6c4d702cb1 e7daa59f84
commit 1c4633ea2c
3 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/PKGBUILD.5.txt
View File

@ -140,11 +140,11 @@ name. The syntax is: `$$source=('filename::url')$$`
depends.
*optdepends (array)*::
An array of optional packages (and accompanying reasons) that are not
essential to the package, but would offer increased functionality or other
features when installed. optdepends are currently for informational
purposes only and are not utilized by pacman during dependency resolution.
The format should be similar to the following:
An array of packages (and accompanying reasons) that are not essential for
base functionality, but may be necessary to make full use of the contents
of this package. optdepends are currently for informational purposes only
and are not utilized by pacman during dependency resolution. The format
should be similar to the following:
optdepends=('fakeroot: for makepkg usage as normal user')

2
po/pl.po
View File

@ -900,7 +900,7 @@ msgstr "Żadnych"
#, c-format
msgid "Targets (%d):"
msgstr "Celuje (%d):"
msgstr "Cele (%d):"
#, c-format
msgid "Total Download Size: %.2f MB\n"

29
scripts/repo-add.sh.in
View File

@ -141,19 +141,22 @@ db_write_entry()
"
# read info from the zipped package
local line
for line in $(bsdtar -xOf "$pkgfile" .PKGINFO | \
grep -v "^#" | sed 's|\(\w*\)\s*=\s*\(.*\)|\1="\2"|'); do
eval "$line"
case "$line" in
group=*) _groups="$_groups$group\n" ;;
depend=*) _depends="$_depends$depend\n" ;;
backup=*) _backups="$_backups$backup\n" ;;
license=*) _licenses="$_licenses$license\n" ;;
replaces=*) _replaces="$_replaces$replaces\n" ;;
provides=*) _provides="$_provides$provides\n" ;;
conflict=*) _conflicts="$_conflicts$conflict\n" ;;
optdepend=*) _optdepends="$_optdepends$optdepend\n" ;;
local line var val
for line in $(bsdtar -xOf "$pkgfile" .PKGINFO |
grep -v '^#' | sed 's|\(\w*\)\s*=\s*\(.*\)|\1 \2|'); do
# bash awesomeness here- var is always one word, val is everything else
var=${line%% *}
val=${line#* }
declare $var="$val"
case "$var" in
group) _groups="$_groups$group\n" ;;
depend) _depends="$_depends$depend\n" ;;
backup) _backups="$_backups$backup\n" ;;
license) _licenses="$_licenses$license\n" ;;
replaces) _replaces="$_replaces$replaces\n" ;;
provides) _provides="$_provides$provides\n" ;;
conflict) _conflicts="$_conflicts$conflict\n" ;;
optdepend) _optdepends="$_optdepends$optdepend\n" ;;
esac
done