moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-23 00:08:50 -05:00
Code Issues Releases Wiki Activity

Merge branch 'maint'

Browse Source
This commit is contained in:
Dan McGee 2011-11-20 21:40:50 -06:00
commit 96b3ba3470
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
NEWS
View File

@ -6,13 +6,17 @@ VERSION DESCRIPTION
- fix edge case in download progress bar rounding (FS#26853) - fix edge case in download progress bar rounding (FS#26853)
- ensure downloads started as tempfiles have correct umask - ensure downloads started as tempfiles have correct umask
- ensure unowned symlinks are not overwritten incorrectly - ensure unowned symlinks are not overwritten incorrectly
- allow -U operation even without sync databases (FS#26899)
- update libtool files and update fix for -Wl,-as-needed - update libtool files and update fix for -Wl,-as-needed
- fix build when using --disable-static (FS#26652) - fix build when using --disable-static (FS#26652)
- pacman-key: add a keyserver timeout value in --init - pacman-key: add a keyserver timeout value in --init
- repo-add: fix race condition around lock file removal - repo-add: fix race condition around lock file removal
- makepkg: accept changelog= or install= without a value - makepkg:
- makepkg: handle PGP signatures with a .sign extension - accept changelog= or install= without a value
- makepkg: delay attachment of signal traps (FS#26196) - trim trailing whitespace from sensitive variables
- handle PGP signatures with a .sign extension
- delay attachment of signal traps (FS#26196)
- translations: multiple updates and corrections
4.0.0 - well-integrated and powerful signed packages and databases 4.0.0 - well-integrated and powerful signed packages and databases
support in pacman, the library, and scripts (FS#5331) support in pacman, the library, and scripts (FS#5331)
- over 800 commits to pacman.git since 3.5.4 release - over 800 commits to pacman.git since 3.5.4 release

6
scripts/makepkg.sh.in
View File

@ -1441,7 +1441,7 @@ check_sanity() {
awk -F'=' '$1 ~ /^[[:space:]]*pkgver$/' "$BUILDFILE" | sed "s/[[:space:]]*#.*//" | awk -F'=' '$1 ~ /^[[:space:]]*pkgver$/' "$BUILDFILE" | sed "s/[[:space:]]*#.*//" |
while IFS='=' read -r _ i; do while IFS='=' read -r _ i; do
eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "$i")\" eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "${i%%+([[:space:]])}")\"
if [[ $i = *[[:space:]:-]* ]]; then if [[ $i = *[[:space:]:-]* ]]; then
error "$(gettext "%s is not allowed to contain colons, hyphens or whitespace.")" "pkgver" error "$(gettext "%s is not allowed to contain colons, hyphens or whitespace.")" "pkgver"
return 1 return 1
@ -1450,7 +1450,7 @@ check_sanity() {
awk -F'=' '$1 ~ /^[[:space:]]*pkgrel$/' "$BUILDFILE" | sed "s/[[:space:]]*#.*//" | awk -F'=' '$1 ~ /^[[:space:]]*pkgrel$/' "$BUILDFILE" | sed "s/[[:space:]]*#.*//" |
while IFS='=' read -r _ i; do while IFS='=' read -r _ i; do
eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "$i")\" eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "${i%%+([[:space:]])}")\"
if [[ $i = *[[:space:]-]* ]]; then if [[ $i = *[[:space:]-]* ]]; then
error "$(gettext "%s is not allowed to contain hyphens or whitespace.")" "pkgrel" error "$(gettext "%s is not allowed to contain hyphens or whitespace.")" "pkgrel"
return 1 return 1
@ -1459,7 +1459,7 @@ check_sanity() {
awk -F'=' '$1 ~ /^[[:space:]]*epoch$/' "$BUILDFILE" | awk -F'=' '$1 ~ /^[[:space:]]*epoch$/' "$BUILDFILE" |
while IFS='=' read -r _ i; do while IFS='=' read -r _ i; do
eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "$i")\" eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "${i%%+([[:space:]])}")\"
if [[ $i != *([[:digit:]]) ]]; then if [[ $i != *([[:digit:]]) ]]; then
error "$(gettext "%s must be an integer.")" "epoch" error "$(gettext "%s must be an integer.")" "epoch"
return 1 return 1

4
scripts/po/Makevars
View File

@ -8,9 +8,7 @@ subdir = scripts/po
top_builddir = ../../ top_builddir = ../../
# These options get passed to xgettext. # These options get passed to xgettext.
XGETTEXT_OPTIONS = --no-location \ XGETTEXT_OPTIONS = --no-location
--keyword=_ --flag=_:1:c-format \
--keyword=_n:1,2 --flag=_n:1:c-format --flag=_n:2:c-format
# This is the copyright holder that gets inserted into the header of the # This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding

3
src/pacman/po/zh_TW.po
View File

@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package. # This file is distributed under the same license as the PACKAGE package.
# #
# Translators: # Translators:
# Dan McGee <dpmcgee@gmail.com>, 2011.
# <dlin.tw@gmail.com>, 2011. # <dlin.tw@gmail.com>, 2011.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-11-13 21:47-0600\n" "POT-Creation-Date: 2011-11-13 21:47-0600\n"
"PO-Revision-Date: 2011-11-14 03:57+0000\n" "PO-Revision-Date: 2011-11-16 05:14+0000\n"
"Last-Translator: toofishes <dpmcgee@gmail.com>\n" "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/" "Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/"
"archlinux-pacman/team/zh_TW/)\n" "archlinux-pacman/team/zh_TW/)\n"