bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint'

Browse source
This commit is contained in:
Dan McGee 2009-02-18 21:20:17 -06:00
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. depends.
*optdepends (array)*:: *optdepends (array)*::
An array of optional packages (and accompanying reasons) that are not An array of packages (and accompanying reasons) that are not essential for
essential to the package, but would offer increased functionality or other base functionality, but may be necessary to make full use of the contents
features when installed. optdepends are currently for informational of this package. optdepends are currently for informational purposes only
purposes only and are not utilized by pacman during dependency resolution. and are not utilized by pacman during dependency resolution. The format
The format should be similar to the following: should be similar to the following:
optdepends=('fakeroot: for makepkg usage as normal user') optdepends=('fakeroot: for makepkg usage as normal user')

2
po/pl.po
View file

@ -900,7 +900,7 @@ msgstr "Żadnych"
#, c-format #, c-format
msgid "Targets (%d):" msgid "Targets (%d):"
msgstr "Celuje (%d):" msgstr "Cele (%d):"
#, c-format #, c-format
msgid "Total Download Size: %.2f MB\n" 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 # read info from the zipped package
local line local line var val
for line in $(bsdtar -xOf "$pkgfile" .PKGINFO | \ for line in $(bsdtar -xOf "$pkgfile" .PKGINFO |
grep -v "^#" | sed 's|\(\w*\)\s*=\s*\(.*\)|\1="\2"|'); do grep -v '^#' | sed 's|\(\w*\)\s*=\s*\(.*\)|\1 \2|'); do
eval "$line" # bash awesomeness here- var is always one word, val is everything else
case "$line" in var=${line%% *}
group=*) _groups="$_groups$group\n" ;; val=${line#* }
depend=*) _depends="$_depends$depend\n" ;; declare $var="$val"
backup=*) _backups="$_backups$backup\n" ;; case "$var" in
license=*) _licenses="$_licenses$license\n" ;; group) _groups="$_groups$group\n" ;;
replaces=*) _replaces="$_replaces$replaces\n" ;; depend) _depends="$_depends$depend\n" ;;
provides=*) _provides="$_provides$provides\n" ;; backup) _backups="$_backups$backup\n" ;;
conflict=*) _conflicts="$_conflicts$conflict\n" ;; license) _licenses="$_licenses$license\n" ;;
optdepend=*) _optdepends="$_optdepends$optdepend\n" ;; replaces) _replaces="$_replaces$replaces\n" ;;
provides) _provides="$_provides$provides\n" ;;
conflict) _conflicts="$_conflicts$conflict\n" ;;
optdepend) _optdepends="$_optdepends$optdepend\n" ;;
esac esac
done done