| index : pacman | |
| Archlinux32 fork of pacman | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | doc/PKGBUILD-example.txt | 6 | ||||
| -rw-r--r-- | doc/PKGBUILD.5.txt | 15 | ||||
| -rw-r--r-- | doc/footer.txt | 11 | ||||
| -rw-r--r-- | doc/pacman.8.txt | 7 | ||||
| -rw-r--r-- | doc/pacman.conf.5.txt | 11 |
diff --git a/doc/PKGBUILD-example.txt b/doc/PKGBUILD-example.txt index 2cc53808..0477cb1a 100644 --- a/doc/PKGBUILD-example.txt +++ b/doc/PKGBUILD-example.txt @@ -1,4 +1,4 @@ -# Maintainer: judd <jvinet@zeroflux.org> +# Maintainer: Joe User <joe.user@example.com> pkgname=patch pkgver=2.5.4 @@ -13,8 +13,8 @@ source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) md5sums=('ee5ae84d115f051d87fcaaef3b4ae782') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr make || return 1 - make prefix=$startdir/pkg/usr install + make prefix=$pkgdir/usr install } diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index aa870097..3db51b86 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -89,14 +89,13 @@ Options and Directives source array (in the same order). makepkg will use this to verify source file integrity during subsequent builds. To easily generate md5sums, run ``makepkg -g >> PKGBUILD''. If desired, move the md5sums line to an - appropriate location. *NOTE:* makepkg supports multiple integrity - algorithms and their corresponding arrays (i.e. sha1sums for the SHA1 - algorithm); however, official packages use only md5sums for the time - being. - -*sha1sums, etc.*:: - Alternative integrity checks that makepkg supports, as noted in md5sums - above. + appropriate location. + +*sha1sums, sha256sums, sha384sums, sha512sums (arrays)*:: + Alternative integrity checks that makepkg supports; these all behave + similar to the md5sums option described above. To enable use and generation + of these checksums, be sure to set up the `INTEGRITY_CHECK` option in + linkman:makepkg.conf[5]. *groups (array)*:: An array of symbolic names that represent groups of packages, allowing diff --git a/doc/footer.txt b/doc/footer.txt index 15bb479b..8290f3c4 100644 --- a/doc/footer.txt +++ b/doc/footer.txt @@ -15,9 +15,16 @@ mailto:pacman-dev@archlinux.org[]. Authors ------- + +Current maintainers: + +* Dan McGee <dan@archlinux.org> +* Xavier Chantry <shiningxc@gmail.com> +* Aaron Griffin <aaron@archlinux.org> + +Past contributors: + * Judd Vinet <jvinet@zeroflux.org> * Aurelien Foret <aurelien@archlinux.org> -* Aaron Griffin <aaron@archlinux.org> -* Dan McGee <dan@archlinux.org> See the 'AUTHORS' file for additional contributors. diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index a6bc3d9a..200eba39 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -94,7 +94,7 @@ Options Specify an alternative database location (a typical default is ``/var/lib/pacman''). This should not be used unless you know what you are doing. *NOTE*: if specified, this is an absolute path and the root path is - not automatically prepended. This behavior changed in pacman 3.1.0. + not automatically prepended. *-d, \--nodeps*:: Skips all dependency checks. Normally, pacman will always check a @@ -112,7 +112,7 @@ Options not be used as a way to install software into ``/usr/local'' instead of ``/usr''. This option is used if you want to install a package on a temporary mounted partition which is "owned" by another system. - *NOTE*: If database path or logfile are not specified on either the + *NOTE*: if database path or logfile are not specified on either the command line or in linkman:pacman.conf[5], their default location will be inside this root path. @@ -123,8 +123,7 @@ Options Specify an alternative package cache location (a typical default is ``/var/cache/pacman/pkg''). Multiple cache directories can be specified, and they are tried in the order they are passed to pacman. *NOTE*: this - is an absolute path, the root path is not automatically prepended. This - behavior changed in pacman 3.1.0. + is an absolute path, the root path is not automatically prepended. *\--config* <'file'>:: Specify an alternate configuration file. diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index eb9285c3..20a90671 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -57,7 +57,7 @@ Options Overrides the default location of the toplevel database directory. A typical default is ``/var/lib/pacman/''. Most users will not need to set this option. *NOTE*: if specified, this is an absolute path and the root - path is not automatically prepended. This behavior changed in pacman 3.1.0. + path is not automatically prepended. *CacheDir =* path/to/cache/dir:: Overrides the default location of the package cache directory. A typical @@ -65,14 +65,13 @@ Options specified, and they are tried in the order they are listed in the config file. If a file is not found in any cache directory, it will be downloaded to the first cache directory with write access. *NOTE*: this is an absolute - path, the root path is not automatically prepended. This behavior changed - in pacman 3.1.0. + path, the root path is not automatically prepended. *LogFile =* '/path/to/file':: - Log actions directly to a file. A typical default is - ``/var/log/pacman.log''. As of pacman 3.1.0, this does not need to be - specified by default. This is an absolute path and root is not prepended. + Overrides the default location of the pacman log file. A typical default + is ``/var/log/pacman.log''. This is an absolute path and the root directory + is not prepended. *HoldPkg =* package ...:: If a user tries to '\--remove' a package that's listed in `HoldPkg`, |