| index : pacman | |
| Archlinux32 fork of pacman | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | doc/PKGBUILD.5.txt | 9 | ||||
| -rw-r--r-- | doc/index.txt | 2 | ||||
| -rw-r--r-- | doc/makepkg.conf.5.txt | 10 | ||||
| -rw-r--r-- | doc/pacman.8.txt | 34 |
diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index c95c41d8..a1d42fd6 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -296,6 +296,9 @@ underscore and the architecture name e.g., 'replaces_x86_64=()'. *upx*;; Compress binary executable files using UPX. + *optipng*;; + Optimize PNG images with optipng. + *ccache*;; Allow the use of ccache during build. More useful in its negative form `!ccache` with select packages that have problems building @@ -365,12 +368,14 @@ the `build()` function. `checkdepends` array. All of the above variables such as `$pkgname` and `$pkgver` are available for -use in the `build()` function. In addition, makepkg defines the following -variables for use during the build and install process: +use in the packaging functions. In addition, makepkg defines the following +variables: *srcdir*:: This contains the directory where makepkg extracts, or copies, all source files. ++ +All of the packaging functions defined above are run starting inside `$srcdir` *pkgdir*:: This contains the directory where makepkg bundles the installed package. diff --git a/doc/index.txt b/doc/index.txt index 26c7d08e..d4d8ebff 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -249,7 +249,7 @@ bugs under the Pacman project. Copyright --------- -pacman is Copyright (C) 2006-2014 Pacman Development Team +pacman is Copyright (C) 2006-2015 Pacman Development Team <pacman-dev@archlinux.org> and Copyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org> and is licensed through the GNU General Public License, version 2 or later. diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 5bd3a4a8..ac5791fd 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -140,7 +140,7 @@ Options Specify a key to use for GPG signing instead of the default key in the keyring. Can be overridden with makepkg's '\--key' option. -**OPTIONS=(**strip docs libtool staticlibs emptydirs zipman purge !upx**)**:: +**OPTIONS=(**strip docs libtool staticlibs emptydirs zipman purge !upx !optipng**)**:: This array contains options that affect default packaging. They are equivalent to options that can be placed in the PKGBUILD; the defaults are shown here. All options should always be left in the array; to enable or @@ -178,8 +178,12 @@ Options package. *upx*;; - Compress binary executable files using UPX. Additional options - can be passed to UPX by specifying the `UPXFLAGS` variable. + Compress binary executable files using UPX. Additional options + can be passed to UPX by specifying the `UPXFLAGS` array variable. + + *optipng*;; + Optimize PNG images with optipng. Additional options can be passed + to optipng by specifying the `OPTIPNGFLAGS` array variable. *debug*;; Add the user-specified debug flags as specified in DEBUG_CFLAGS and diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 74436155..5c57450b 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -35,10 +35,10 @@ as an argument, targets will be read from stdin. Operations ---------- *-D, \--database*:: - Modify the package database. This operation allows you to modify certain - attributes of the installed packages in pacman's database. At the - moment, you can only change the install reason using '\--asdeps' and - '\--asexplicit' options. + Operate on the package database. This operation allows you to modify + certain attributes of the installed packages in pacman's database. It + also allows you to check the databases for internal consistency. + See <<DO,Database Options>> below. *-Q, \--query*:: Query the package database. This operation allows you to view installed @@ -431,6 +431,27 @@ system upgrade and install/upgrade the "foo" package in the same operation. to-date. +Database Options[[QO]] +---------------------- +*\--asdeps* <package>:: + Mark a package as non-explicitly installed; in other words, set their install + reason to be installed as a dependency. + +*\--asexplicit<package>*:: + Mark a package as explicitly installed; in other words, set their install + reason to be explicitly installed. This is useful it you want to keep a + package installed even when it was initially installed as a dependency + of another package. + +*-k \--check*:: + Check the local package database is internally consistent. This will + check all required files are present and that installed packages have + the required dependencies, do not conflict and that multiple packages + do not own the same file. Specifying this option twice will perform + a check on the sync databases to ensure all specified dependencies + are available. + + Handling Config Files[[HCF]] ---------------------------- Pacman uses the same logic as 'rpm' to determine action against files that are @@ -463,8 +484,9 @@ original=X, current=Y, new=Z:: original=NULL, current=Y, new=Z:: The package was not previously installed, and the file already exists on the - file system. Save the current file with a '.pacorig' extension, install the - new file, and warn the user. + file system. Install the new file with a '.pacnew' extension and warn the + user. The user must then manually merge any necessary changes into the + original file. Examples |