summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/abs/Makefile.am2
-rw-r--r--etc/abs/abs.conf2
-rw-r--r--etc/abs/supfile.core (renamed from etc/abs/supfile.arch)4
-rw-r--r--etc/pacman.conf.in4
-rw-r--r--etc/pacman.d/Makefile.am2
5 files changed, 7 insertions, 7 deletions
diff --git a/etc/abs/Makefile.am b/etc/abs/Makefile.am
index 69727e91..1c10d0b7 100644
--- a/etc/abs/Makefile.am
+++ b/etc/abs/Makefile.am
@@ -1,6 +1,6 @@
EXTRA_DIST = abs.conf \
- supfile.arch \
supfile.community \
+ supfile.core \
supfile.extra \
supfile.testing \
supfile.unstable
diff --git a/etc/abs/abs.conf b/etc/abs/abs.conf
index 66ba5277..782b269b 100644
--- a/etc/abs/abs.conf
+++ b/etc/abs/abs.conf
@@ -9,5 +9,5 @@
# Supfiles to be parsed by abs (in this order)
# (prefix a module with a ! to disable it)
#
-SUPFILES=(arch extra !unstable !community !testing)
+SUPFILES=(core extra !unstable !community !testing)
diff --git a/etc/abs/supfile.arch b/etc/abs/supfile.core
index e23a785d..1d34b69c 100644
--- a/etc/abs/supfile.arch
+++ b/etc/abs/supfile.core
@@ -2,7 +2,7 @@
# /etc/abs/supfile.arch
#
-# this is the host containing the current PKGBUILD files
+# this is the host containing the core PKGBUILD files
*default host=cvs.archlinux.org
*default release=cvs
@@ -12,4 +12,4 @@
#*default umask=002
*default tag=CURRENT
-arch
+core
diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in
index 56b1f833..f76c2acf 100644
--- a/etc/pacman.conf.in
+++ b/etc/pacman.conf.in
@@ -22,9 +22,9 @@ HoldPkg = pacman glibc
#[testing]
#Include = /etc/pacman.d/testing
-[current]
+[core]
# Add your preferred servers here, they will be used first
-Include = /etc/pacman.d/current
+Include = /etc/pacman.d/core
[extra]
# 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 c8dded4b..341b3efa 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 testing unstable
+dist_pkgsysconf_DATA = community core extra release testing unstable
$(dist_pkgsysconf_DATA): mirrorlist
sed "s|@@REPO@@|$@|g" <$< >$@