Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-06-08 13:50:01 -0500
committerDan McGee <dan@archlinux.org>2008-06-08 13:50:01 -0500
commit0fc538fcdb149141fe25448db5805f2ff790e8fa (patch)
tree6c829345824d25112d57c6b0d0464b9ed5a93202
parentfcac23763b0cd6242a1e126b5063d95d4a46fd09 (diff)
Various updates needed prior to a new release
Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--doc/PKGBUILD-example.txt6
-rw-r--r--doc/PKGBUILD.5.txt15
-rw-r--r--doc/footer.txt11
-rw-r--r--doc/pacman.8.txt7
-rw-r--r--doc/pacman.conf.5.txt11
-rw-r--r--etc/pacman.conf.in2
-rw-r--r--lib/libalpm/po/POTFILES.in7
-rw-r--r--pactest/Makefile.am3
-rw-r--r--po/POTFILES.in2
-rw-r--r--src/pacman/pacman.c6
10 files changed, 40 insertions, 30 deletions
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`,
diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in
index 582fe942..199626db 100644
--- a/etc/pacman.conf.in
+++ b/etc/pacman.conf.in
@@ -14,6 +14,8 @@
#CacheDir = @localstatedir@/cache/pacman/pkg/
#LogFile = @localstatedir@/log/pacman.log
HoldPkg = pacman glibc
+# If upgrades are available for these packages they will be asked for first
+SyncFirst = pacman
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
diff --git a/lib/libalpm/po/POTFILES.in b/lib/libalpm/po/POTFILES.in
index 35bd864b..475cf4b4 100644
--- a/lib/libalpm/po/POTFILES.in
+++ b/lib/libalpm/po/POTFILES.in
@@ -1,10 +1,13 @@
# List of source files with translatable strings
+# If a file is commented out, it is because it shouldn't have any
+# translatable strings
lib/libalpm/add.c
lib/libalpm/alpm.c
-lib/libalpm/alpm_list.c
+#lib/libalpm/alpm_list.c
lib/libalpm/backup.c
lib/libalpm/be_files.c
+lib/libalpm/be_package.c
lib/libalpm/cache.c
lib/libalpm/conflict.c
lib/libalpm/db.c
@@ -15,7 +18,7 @@ lib/libalpm/error.c
lib/libalpm/group.c
lib/libalpm/handle.c
lib/libalpm/log.c
-lib/libalpm/md5.c
+#lib/libalpm/md5.c
lib/libalpm/package.c
lib/libalpm/remove.c
lib/libalpm/sync.c
diff --git a/pactest/Makefile.am b/pactest/Makefile.am
index 85bb8017..ce611f78 100644
--- a/pactest/Makefile.am
+++ b/pactest/Makefile.am
@@ -7,7 +7,8 @@ check_SCRIPTS = \
pmrule.py \
pmtest.py \
util.py \
- $(wildcard tests/*.py)
+ $(wildcard tests/*.py) \
+ vercmptest.sh
noinst_SCRIPTS = $(check_SCRIPTS)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index cf6e9506..73640f25 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -9,8 +9,8 @@ src/pacman/pacman.c
src/pacman/query.c
src/pacman/remove.c
src/pacman/sync.c
-src/pacman/util.c
src/pacman/upgrade.c
+src/pacman/util.c
# scripts with gettext translations
scripts/makepkg.sh.in
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 7aa1bf69..813a7284 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -153,11 +153,11 @@ static void version(void)
{
printf("\n");
printf(" .--. Pacman v%s - libalpm v%s\n", PACKAGE_VERSION, alpm_version());
- printf("/ _.-' .-. .-. .-. Copyright (C) 2002-2008 Judd Vinet <jvinet@zeroflux.org>\n");
- printf("\\ '-. '-' '-' '-'\n");
+ printf("/ _.-' .-. .-. .-. Copyright (C) 2006-2008 Dan McGee <dan@archlinux.org>\n");
+ printf("\\ '-. '-' '-' '-' Copyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>\n");
printf(" '--'\n");
printf(_(" This program may be freely redistributed under\n"
- " the terms of the GNU General Public License\n"));
+ " the terms of the GNU General Public License.\n"));
printf("\n");
}