summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2007-03-24 04:18:17 +0000
committerAaron Griffin <aaron@archlinux.org>2007-03-24 04:18:17 +0000
commitf8d0601b8ddd0ed1913c13c6cf9fd61a933efa6c (patch)
treeb1c5a09972bb6577644e4395c3024595a0420fc9 /etc
parentd38b273f9159cf2f74181614634c2477dadb5d3b (diff)
downloadpacman-f8d0601b8ddd0ed1913c13c6cf9fd61a933efa6c.tar.xz
* Added a mirror list for [testing] (it appears most mirrors mirror testing)
* Commented ftp.archlinux.org in the official mirror list * ran a make dist, which updated some translation files
Diffstat (limited to 'etc')
-rw-r--r--etc/pacman.conf.in2
-rw-r--r--etc/pacman.d/Makefile.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in
index feba20ea..56b1f833 100644
--- a/etc/pacman.conf.in
+++ b/etc/pacman.conf.in
@@ -20,7 +20,7 @@ HoldPkg = pacman glibc
# have identical names, regardless of version number
#
#[testing]
-#Server = ftp://ftp.archlinux.org/testing/os/@CARCH@
+#Include = /etc/pacman.d/testing
[current]
# Add your preferred servers here, they will be used first
diff --git a/etc/pacman.d/Makefile.am b/etc/pacman.d/Makefile.am
index 57e23cf0..c8dded4b 100644
--- a/etc/pacman.d/Makefile.am
+++ b/etc/pacman.d/Makefile.am
@@ -1,5 +1,5 @@
pkgsysconfdir = ${sysconfdir}/pacman.d
-dist_pkgsysconf_DATA = community current extra release unstable
+dist_pkgsysconf_DATA = community current extra release testing unstable
$(dist_pkgsysconf_DATA): mirrorlist
sed "s|@@REPO@@|$@|g" <$< >$@