Merge branch 'master' into lukeshu/archlinux+xbs+merge-parabola

Conflicts:
	config
	libremessages

1 files changed, 10 insertions, 6 deletions

diff --git a/config b/config
index 3edc144..baf5da7 100644
--- a/config
+++ b/config
@@ -3,24 +3,28 @@ FTP_BASE="/srv/http/repo/public"
 SVNREPO="/var/abs"
 
 # Repos from Arch
-ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib')
+ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib' 'multilib-testing')
 TESTING_REPO='testing'
 # Official Parabola repos
-OURREPOS=('libre' 'libre-testing')
+OURREPOS=('libre' 'libre-testing' 'libre-multilib' 'libre-multilib-testing')
 # User repos
 USERREPOS=('~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan')
 # Community project repos
 PROJREPOS=('pcr' 'kernels' 'cross' 'java' 'java-ugly' 'nonprism')
 # Remote repos
 PKGREPOS=("${ARCHREPOS[@]}" "${OURREPOS[@]}" "${USERREPOS[@]}" "${PROJREPOS[@]}")
-PKGPOOL='pool/packages'
-SRCPOOL='sources/packages'
+PKGPOOL='pool/parabola'
+SRCPOOL='sources/parabola'
 
 # Directories where packages are shared between repos
 # *relative to FTP_BASE*
-PKGPOOLS=('pool/packages' 'pool/community')
+ARCHPKGPOOLS=(pool/{packages,community})
+OURPKGPOOLS=(pool/parabola)
+PKGPOOLS=(${OURPKGPOOLS[@]} ${ARCHPKGPOOLS[@]})
 # Directories where sources are stored
-SRCPOOLS=('sources/packages' 'sources/community')
+ARCHSRCPOOLS=(sources/{packages,community})
+OURPKGPOOLS=(sources/parabola)
+SRCPOOLS=(${OURSRCPOOLS[@]} ${ARCHSRCPOOLS[@]})
 
 CLEANUP_DESTDIR="$FTP_BASE/old/packages"
 CLEANUP_DRYRUN=false