Use nymeria instead of gerolde20130120

5 files changed, 9 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index 931318b..3232773 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-V=20121115
+V=20130120
 
 PREFIX = /usr/local
 
@@ -115,6 +115,6 @@ dist:
 	gpg --detach-sign --use-agent devtools-$(V).tar.gz
 
 upload:
-	scp devtools-$(V).tar.gz devtools-$(V).tar.gz.sig gerolde.archlinux.org:/srv/ftp/other/devtools/
+	scp devtools-$(V).tar.gz devtools-$(V).tar.gz.sig nymeria.archlinux.org:/srv/ftp/other/devtools/
 
 .PHONY: all clean install uninstall dist upload
diff --git a/archco.in b/archco.in
index 5d497cc..1ee977e 100644
--- a/archco.in
+++ b/archco.in
@@ -11,7 +11,7 @@ fi
 
 case $scriptname in
 	archco)
-		SVNURL="svn+ssh://gerolde.archlinux.org/srv/svn-packages";;
+		SVNURL="svn+ssh://svn-packages@nymeria.archlinux.org/srv/repos/svn-packages/svn";;
 	communityco)
 		SVNURL="svn+ssh://svn-community@nymeria.archlinux.org/srv/repos/svn-community/svn";;
 	*)
diff --git a/commitpkg.in b/commitpkg.in
index d9ee0aa..db78517 100644
--- a/commitpkg.in
+++ b/commitpkg.in
@@ -105,15 +105,7 @@ for _arch in ${arch[@]}; do
 done
 
 if [[ -z $server ]]; then
-	case "$repo" in
-		core|extra|testing|staging|kde-unstable|gnome-unstable)
-			server='gerolde.archlinux.org' ;;
-		community*|multilib*)
-			server='nymeria.archlinux.org' ;;
-		*)
-			server='gerolde.archlinux.org'
-			msg "Non-standard repository $repo in use, defaulting to server $server" ;;
-	esac
+	server='nymeria.archlinux.org'
 fi
 
 if [[ -n $(svn status -q) ]]; then
diff --git a/crossrepomove.in b/crossrepomove.in
index 8794326..653c8ee 100644
--- a/crossrepomove.in
+++ b/crossrepomove.in
@@ -11,8 +11,8 @@ fi
 
 pkgbase="${1}"
 
-packages_svn='svn+ssh://gerolde.archlinux.org/srv/svn-packages'
-packages_server='gerolde.archlinux.org'
+packages_svn='svn+ssh://svn-packages@nymeria.archlinux.org/srv/repos/svn-packages/svn'
+packages_server='nymeria.archlinux.org'
 community_svn='svn+ssh://svn-community@nymeria.archlinux.org/srv/repos/svn-community/svn'
 community_server='nymeria.archlinux.org'
 mirror='http://mirrors.kernel.org/archlinux'
@@ -76,7 +76,7 @@ popd >/dev/null
 if [[ "${target_server}" == "${community_server}" ]]; then
         dbscripts_path='/srv/repos/svn-community/dbscripts'
 else
-        dbscripts_path='/arch'
+        dbscripts_path='/srv/repos/svn-packages/dbscripts'
 fi
 
 ssh "${target_server}" "${dbscripts_path}/db-update" || die
@@ -85,7 +85,7 @@ msg "Removing ${pkgbase} from ${source_repo}"
 if [[ "${source_server}" == "${community_server}" ]]; then
         dbscripts_path='/srv/repos/svn-community/dbscripts'
 else
-        dbscripts_path='/arch'
+        dbscripts_path='/srv/repos/svn-packages/dbscripts'
 fi
 for _arch in ${arch[@]}; do
 	ssh "${source_server}" "${dbscripts_path}/db-remove ${source_repo} ${_arch} ${pkgbase}"
diff --git a/rebuildpkgs.in b/rebuildpkgs.in
index a4c8969..2f71c40 100644
--- a/rebuildpkgs.in
+++ b/rebuildpkgs.in
@@ -47,7 +47,7 @@ pkg_from_pkgbuild() {
 chrootdir="$1"; shift
 pkgs="$@"
 
-SVNPATH='svn+ssh://gerolde.archlinux.org/srv/svn-packages'
+SVNPATH='svn+ssh://nymeria.archlinux.org/srv/repos/svn-packages/svn'
 
 msg "Work will be done in $(pwd)/rebuilds"