diff options
| author | Dan McGee <dan@archlinux.org> | 2009-09-07 15:17:47 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-09-07 15:17:47 -0500 |
| commit | cd5b029e934476e8ea6dade5798bfa3d6b6ceafd (patch) | |
| tree | c9e132c9cea9dfccca6e3522db0da1a50509dafb | |
| parent | 43e16b373be50ca142e2b39055906194049c3686 (diff) | |
| parent | 2e7c569950f3a6f651fb4850cb320068e2261198 (diff) | |
| download | pacman-cd5b029e934476e8ea6dade5798bfa3d6b6ceafd.tar.xz | |
Merge branch 'maint'
| -rw-r--r-- | contrib/PKGBUILD.vim | 2 | ||||
| -rw-r--r-- | doc/PKGBUILD.5.txt | 3 | ||||
| -rw-r--r-- | doc/index.txt | 1 | ||||
| -rw-r--r-- | doc/makepkg.8.txt | 3 |
4 files changed, 6 insertions, 3 deletions
diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index 8f45ae44..994eaccb 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -66,7 +66,7 @@ syn region pbBackupGroup start=/^backup=(/ end=/)/ contains=pb_k_backup,pbValidB " arch syn keyword pb_k_arch arch contained -syn keyword pbArch i686 x86_64 ppc contained +syn keyword pbArch i686 x86_64 ppc any contained syn match pbIllegalArch /[^='"() ]/ contained contains=pbArch syn region pbArchGroup start=/^arch=(/ end=/)/ contains=pb_k_arch,pbArch,pbIllegalArch diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index c832e236..e6f6edf5 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -118,7 +118,8 @@ name. The syntax is: `source=('filename::url')`. *arch (array)*:: Defines on which architectures the given package is available (e.g. - `arch=('i686' 'x86_64')`). + `arch=('i686' 'x86_64')`). Packages that contain no architecture specific + files may use arch=('any'). *backup (array)*:: A space-delimited array of filenames, without preceding slashes, that diff --git a/doc/index.txt b/doc/index.txt index 2f0141c3..0966fcc3 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -62,6 +62,7 @@ Releases `------------`------- Date Version --------------------- +2009-08-02 v3.3.0 2009-01-05 v3.2.2 2008-08-26 v3.2.1 2008-07-30 v3.2.0 diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index ad78ffcb..198aa954 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -146,7 +146,8 @@ Options Do not actually build the package, but build a source-only tarball that does not include sources that can be fetched via a download URL. This is useful for passing a single tarball to another program such as a chroot, - remote builder, or a tarball upload. + remote builder, or a tarball upload. Because integrity checks are verified, + all source files of the package need to be present or downloadable. *\--noconfirm*:: (Passed to pacman) Prevent pacman from waiting for user input before |