diff options
| author | Dan McGee <dan@archlinux.org> | 2009-01-03 05:48:52 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-01-03 05:48:52 +0100 |
| commit | f8b689d48eb34cf81c22c854cd83595338d49d44 (patch) | |
| tree | dc45d9e3638581640ac5bd131529b8c2754b1143 /doc | |
| parent | bd628274cc8db81704860e69894fcd217c2068d0 (diff) | |
| parent | c31fcfd833fc527a3774c7b1bc29686194d23942 (diff) | |
| download | pacman-f8b689d48eb34cf81c22c854cd83595338d49d44.tar.gz pacman-f8b689d48eb34cf81c22c854cd83595338d49d44.tar.xz | |
Merge branch 'maint'
Conflicts:
lib/libalpm/dload.c
po/it.po
scripts/makepkg.sh.in
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.am | 1 | ||||
| -rw-r--r-- | doc/PKGBUILD.5.txt | 11 | ||||
| -rw-r--r-- | doc/makepkg.8.txt | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index cce0a711..7992e547 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -62,6 +62,7 @@ ASCIIDOC_OPTS = \ -a pacman_date="`date +%Y-%m-%d`" \ -a sysconfdir=$(sysconfdir) A2X_OPTS = \ + --no-xmllint \ -d manpage \ -f manpage \ --xsltproc-opts='-param man.endnotes.list.enabled 0' \ diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index e42a8b86..96c7a505 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -160,7 +160,9 @@ name. The syntax is: `$$source=('filename::url')$$` depend on 'cron' rather than 'dcron OR fcron'. Versioned provisions are also possible, in the 'name=version' format. For example, dcron can provide 'cron=2.0' to satisfy the 'cron>=2.0' - dependency of other packages. + dependency of other packages. Provisions involving the '>' and '<' + operators are invalid as only specifc versions of a package may be + provided. *replaces (array)*:: An array of packages that this package should replace, and can be used @@ -367,11 +369,10 @@ The following is an example PKGBUILD for the 'patch' package. For more examples, look through the build files of your distribution's packages. For those using Arch Linux, consult the ABS tree. -[sh] -source~~~~~ +[source,sh] +------------------------------- include::PKGBUILD-example.txt[] -source~~~~~ - +------------------------------- See Also -------- diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index ddf73dae..4bb37808 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -119,7 +119,7 @@ Options *-r, \--rmdeps*:: Upon successful build, remove any dependencies installed by makepkg - during dependency auto-resolution (using `-b` or `-s`). + during dependency auto-resolution and installation when using `-s`. *-R, \--repackage*:: Repackage contents of pkg/ without rebuilding the package. This is |