rename repsys to mgarepo, RepSys to MgaRepo, and update docs and examples for Mageia

52 files changed, 338 insertions, 397 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index acf8138..c0c0cfb 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,10 +1,10 @@
-recursive-include RepSys *.py
-include RepSys/plugins/*.txt
-include repsys repsys.conf MANIFEST.in 
-include repsys.8
+recursive-include MgaRepo *.py
+include MgaRepo/plugins/*.txt
+include mgarepo mgarepo.conf MANIFEST.in 
+include mgarepo.8
 include README
 include CHANGES
 include README.LDAP
-include repsys-example.conf
+include mgarepo-example.conf
 include *.chlog
-include create-srpm repsys-ssh
+include create-srpm mgarepo-ssh
diff --git a/RepSys/ConfigParser.py b/MgaRepo/ConfigParser.py
index 3b4e213..bac6d36 100644
--- a/RepSys/ConfigParser.py
+++ b/MgaRepo/ConfigParser.py
@@ -350,12 +350,12 @@ class Config:
         self._config = ConfigParser()
         self._wrapped = {}
         conffiles = []
-        repsys_conf = os.environ.get("REPSYS_CONF")
-        if repsys_conf:
-            conffiles.append(repsys_conf)
+        mgarepo_conf = os.environ.get("MGAREPO_CONF")
+        if mgarepo_conf:
+            conffiles.append(mgarepo_conf)
         else:
-            conffiles.append("/etc/repsys.conf")
-            conffiles.append(os.path.expanduser("~/.repsys/config"))
+            conffiles.append("/etc/mgarepo.conf")
+            conffiles.append(os.path.expanduser("~/.mgarepo/config"))
         for file in conffiles:
             if os.path.isfile(file):
                 self._config.read(file)
diff --git a/RepSys/__init__.py b/MgaRepo/__init__.py
index b0df184..b0df184 100644
--- a/RepSys/__init__.py
+++ b/MgaRepo/__init__.py
diff --git a/RepSys/binrepo.py b/MgaRepo/binrepo.py
index 4035128..9186980 100644
--- a/RepSys/binrepo.py
+++ b/MgaRepo/binrepo.py
@@ -1,6 +1,6 @@
-from RepSys import Error, config, mirror, layout
-from RepSys.util import execcmd, rellink
-from RepSys.svn import SVN
+from MgaRepo import Error, config, mirror, layout
+from MgaRepo.util import execcmd, rellink
+from MgaRepo.svn import SVN
 
 import sys
 import os
@@ -302,7 +302,7 @@ def update_sources_threaded(*args, **kwargs):
     return t
 
 def upload(path, message=None):
-    from RepSys.rpmutil import getpkgtopdir
+    from MgaRepo.rpmutil import getpkgtopdir
     svn = SVN()
     if not os.path.exists(path):
         raise Error, "not found: %s" % path
diff --git a/RepSys/cgi/__init__.py b/MgaRepo/cgi/__init__.py
index e69de29..e69de29 100644
--- a/RepSys/cgi/__init__.py
+++ b/MgaRepo/cgi/__init__.py
diff --git a/RepSys/cgi/soapserver.py b/MgaRepo/cgi/soapserver.py
index 2f6b751..a203940 100644
--- a/RepSys/cgi/soapserver.py
+++ b/MgaRepo/cgi/soapserver.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
-from RepSys import Error, config
-from RepSys.rpmutil import get_srpm
-from RepSys.cgiutil import CgiError, get_targets
+from MgaRepo import Error, config
+from MgaRepo.rpmutil import get_srpm
+from MgaRepo.cgiutil import CgiError, get_targets
 import sys
 import os
 
diff --git a/RepSys/cgi/submit.py b/MgaRepo/cgi/submit.py
index 10f7cb2..cba5977 100644
--- a/RepSys/cgi/submit.py
+++ b/MgaRepo/cgi/submit.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
-from RepSys import Error, config
-from RepSys.rpmutil import get_srpm
-from RepSys.cgiutil import CgiError, get_targets
+from MgaRepo import Error, config
+from MgaRepo.rpmutil import get_srpm
+from MgaRepo.cgiutil import CgiError, get_targets
 import cgi
 import sys
 import os
diff --git a/RepSys/cgi/xmlrpcserver.py b/MgaRepo/cgi/xmlrpcserver.py
index e0851d1..8521b4f 100644
--- a/RepSys/cgi/xmlrpcserver.py
+++ b/MgaRepo/cgi/xmlrpcserver.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
-from RepSys import Error, config
-from RepSys.rpmutil import get_srpm
-from RepSys.cgiutil import CgiError, get_targets
+from MgaRepo import Error, config
+from MgaRepo.rpmutil import get_srpm
+from MgaRepo.cgiutil import CgiError, get_targets
 import sys
 import os
 
diff --git a/RepSys/cgiutil.py b/MgaRepo/cgiutil.py
index 35c5efb..68afdcd 100644
--- a/RepSys/cgiutil.py
+++ b/MgaRepo/cgiutil.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
-from RepSys import Error, config
-from RepSys.svn import SVN
-from RepSys.ConfigParser import NoSectionError
+from MgaRepo import Error, config
+from MgaRepo.svn import SVN
+from MgaRepo.ConfigParser import NoSectionError
 import time
 import re
 
diff --git a/RepSys/command.py b/MgaRepo/command.py
index 63f2df9..9028b3b 100644
--- a/RepSys/command.py
+++ b/MgaRepo/command.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from RepSys import SilentError, Error, config
+from MgaRepo import SilentError, Error, config
 import sys, os
 import urlparse
 import optparse
diff --git a/RepSys/commands/__init__.py b/MgaRepo/commands/__init__.py
index e69de29..e69de29 100644
--- a/RepSys/commands/__init__.py
+++ b/MgaRepo/commands/__init__.py
diff --git a/RepSys/commands/authoremail.py b/MgaRepo/commands/authoremail.py
index f5b8b70..edfe332 100644
--- a/RepSys/commands/authoremail.py
+++ b/MgaRepo/commands/authoremail.py
@@ -1,20 +1,20 @@
 #!/usr/bin/python
-from RepSys import Error, config
-from RepSys.command import *
+from MgaRepo import Error, config
+from MgaRepo.command import *
 import sys
 import getopt
 
 HELP = """\
-Usage: repsys authoremail [OPTIONS] AUTHOR
+Usage: mgarepo authoremail [OPTIONS] AUTHOR
 
 Shows the e-mail of an SVN author. It is just a simple interface to access
-the [authors] section of repsys.conf.
+the [authors] section of mgarepo.conf.
 
 Options:
     -h      Show this message
 
 Examples:
-    repsys authoremail john
+    mgarepo authoremail john
 """
 
 def parse_options():
diff --git a/RepSys/commands/changed.py b/MgaRepo/commands/changed.py
index 66c1a53..a17226b 100644
--- a/RepSys/commands/changed.py
+++ b/MgaRepo/commands/changed.py
@@ -1,13 +1,13 @@
 #!/usr/bin/python
-from RepSys import Error, disable_mirror
-from RepSys.command import *
-from RepSys.layout import package_url
-from RepSys.rpmutil import check_changed
+from MgaRepo import Error, disable_mirror
+from MgaRepo.command import *
+from MgaRepo.layout import package_url
+from MgaRepo.rpmutil import check_changed
 import getopt
 import sys
 
 HELP = """\
-Usage: repsys changed [OPTIONS] URL
+Usage: mgarepo changed [OPTIONS] URL
 
 Shows if there are pending changes since the last package release.
 
@@ -18,8 +18,8 @@ Options:
     -h      Show this message
 
 Examples:
-    repsys changed http://repos/svn/cnc/snapshot/foo
-    repsys changed -a http://repos/svn/cnc/snapshot
+    mgarepo changed http://repos/svn/cnc/snapshot/foo
+    mgarepo changed -a http://repos/svn/cnc/snapshot
 """
 
 def parse_options():
diff --git a/RepSys/commands/ci.py b/MgaRepo/commands/ci.py
index 8d373b5..e64ac4e 100644
--- a/RepSys/commands/ci.py
+++ b/MgaRepo/commands/ci.py
@@ -1,15 +1,15 @@
 #!/usr/bin/python
-from RepSys.command import *
-from RepSys.rpmutil import commit
+from MgaRepo.command import *
+from MgaRepo.rpmutil import commit
 
 HELP = """\
-Usage: repsys ci [TARGET]
+Usage: mgarepo ci [TARGET]
 
 Will commit recent modifications in the package.
 
-The difference between an ordinary "svn ci" and "repsys ci" is that it
+The difference between an ordinary "svn ci" and "mgarepo ci" is that it
 relocates the working copy to the default repository in case the option
-"mirror" is set in repsys.conf.
+"mirror" is set in mgarepo.conf.
 
 Options:
     -h      Show this message
@@ -17,8 +17,8 @@ Options:
     -F FILE Read log message from FILE
 
 Examples:
-    repsys ci
-    repsys ci SPECS/package.spec SPECS/package-patch.patch
+    mgarepo ci
+    mgarepo ci SPECS/package.spec SPECS/package-patch.patch
 """
 
 def parse_options():
diff --git a/RepSys/commands/co.py b/MgaRepo/commands/co.py
index 81e4140..e7c9aec 100644
--- a/RepSys/commands/co.py
+++ b/MgaRepo/commands/co.py
@@ -1,14 +1,14 @@
 #!/usr/bin/python
-from RepSys import Error, disable_mirror
-from RepSys.command import *
-from RepSys.rpmutil import checkout
+from MgaRepo import Error, disable_mirror
+from MgaRepo.command import *
+from MgaRepo.rpmutil import checkout
 import getopt
 import sys
 
 HELP = """\
-Usage: repsys co [OPTIONS] URL [LOCALPATH]
+Usage: mgarepo co [OPTIONS] URL [LOCALPATH]
 
-Checkout the package source from the Mandriva repository.
+Checkout the package source from the Mageia repository.
 
 If the 'mirror' option is enabled, the package is obtained from the mirror
 repository.
@@ -27,11 +27,11 @@ Options:
     -h      Show this message
 
 Examples:
-    repsys co pkgname
-    repsys co -d 2009.0 pkgname
-    repsys co 2009.0/pkgame
-    repsys co http://repos/svn/cnc/snapshot/foo
-    repsys co http://repos/svn/cnc/snapshot/foo foo-pkg
+    mgarepo co pkgname
+    mgarepo co -d 2009.0 pkgname
+    mgarepo co 2009.0/pkgame
+    mgarepo co http://repos/svn/cnc/snapshot/foo
+    mgarepo co http://repos/svn/cnc/snapshot/foo foo-pkg
 """
 
 def parse_options():
diff --git a/RepSys/commands/create.py b/MgaRepo/commands/create.py
index ded8abe..da8f16c 100644
--- a/RepSys/commands/create.py
+++ b/MgaRepo/commands/create.py
@@ -1,13 +1,13 @@
 #!/usr/bin/python
-from RepSys import Error
-from RepSys.command import *
-from RepSys.layout import package_url
-from RepSys.rpmutil import create_package
+from MgaRepo import Error
+from MgaRepo.command import *
+from MgaRepo.layout import package_url
+from MgaRepo.rpmutil import create_package
 import getopt
 import sys
 
 HELP = """\
-Usage: repsys create [OPTIONS] URL
+Usage: mgarepo create [OPTIONS] URL
 
 Creates the minimal structure of a package in the repository.
 
@@ -15,8 +15,8 @@ Options:
     -h      Show this message
 
 Examples:
-    repsys create newpkg
-    repsys create svn+ssh://svn.mandriva.com/svn/packages/cooker/newpkg
+    mgarepo create newpkg
+    mgarepo create svn+ssh://svn.mageia.org/svn/packages/cauldron/newpkg
 """
 
 def parse_options():
diff --git a/RepSys/commands/del.py b/MgaRepo/commands/del.py
index 2c6902e..79d9d3f 100644
--- a/RepSys/commands/del.py
+++ b/MgaRepo/commands/del.py
@@ -1,9 +1,9 @@
-from RepSys import Error
-from RepSys.command import *
-from RepSys.rpmutil import binrepo_delete
+from MgaRepo import Error
+from MgaRepo.command import *
+from MgaRepo.rpmutil import binrepo_delete
 
 HELP = """\
-Usage: repsys del [OPTIONS] [PATH]
+Usage: mgarepo del [OPTIONS] [PATH]
 
 Remove a given file from the binary sources repository.
 
diff --git a/RepSys/commands/editlog.py b/MgaRepo/commands/editlog.py
index 9d1afc5..c58c16b 100644
--- a/RepSys/commands/editlog.py
+++ b/MgaRepo/commands/editlog.py
@@ -1,19 +1,19 @@
 #!/usr/bin/python
-from RepSys import Error
-from RepSys.command import *
-from RepSys.layout import package_url
-from RepSys.svn import SVN
+from MgaRepo import Error
+from MgaRepo.command import *
+from MgaRepo.layout import package_url
+from MgaRepo.svn import SVN
 import re
 
 HELP = """\
-Usage: repsys editlog [OPTIONS] [URL] REVISION
+Usage: mgarepo editlog [OPTIONS] [URL] REVISION
 
 Options:
     -h         Show this message
 
 Examples:
-    repsys editlog 14800
-    repsys editlog https://repos/svn/cnc/snapshot 14800
+    mgarepo editlog 14800
+    mgarepo editlog https://repos/svn/cnc/snapshot 14800
 """
 
 def parse_options():
diff --git a/RepSys/commands/getspec.py b/MgaRepo/commands/getspec.py
index a357ef9..08407bc 100644
--- a/RepSys/commands/getspec.py
+++ b/MgaRepo/commands/getspec.py
@@ -1,13 +1,13 @@
 #!/usr/bin/python
-from RepSys import Error, disable_mirror
-from RepSys.command import *
-from RepSys.layout import package_url
-from RepSys.rpmutil import get_spec
+from MgaRepo import Error, disable_mirror
+from MgaRepo.command import *
+from MgaRepo.layout import package_url
+from MgaRepo.rpmutil import get_spec
 import getopt
 import sys
 
 HELP = """\
-Usage: repsys getspec [OPTIONS] REPPKGURL
+Usage: mgarepo getspec [OPTIONS] REPPKGURL
 
 Prints the .spec file of a given package.
 
@@ -17,8 +17,8 @@ Options:
     -h      Show this message
 
 Examples:
-    repsys getspec pkgname
-    repsys getspec svn+ssh://svn.mandriva.com/svn/packages/cooker/pkgname
+    mgarepo getspec pkgname
+    mgarepo getspec svn+ssh://svn.mageia.org/svn/packages/cauldron/pkgname
 """
 
 def parse_options():
diff --git a/RepSys/commands/getsrpm.py b/MgaRepo/commands/getsrpm.py
index 1767bb7..6c238ba 100644
--- a/RepSys/commands/getsrpm.py
+++ b/MgaRepo/commands/getsrpm.py
@@ -3,10 +3,10 @@
 # This program will extract given version/revision of the named package
 # from the Conectiva Linux repository system.
 #
-from RepSys import Error, config, disable_mirror
-from RepSys.command import *
-from RepSys.layout import package_url
-from RepSys.rpmutil import get_srpm
+from MgaRepo import Error, config, disable_mirror
+from MgaRepo.command import *
+from MgaRepo.layout import package_url
+from MgaRepo.rpmutil import get_srpm
 import tempfile
 import shutil
 import getopt
@@ -15,7 +15,7 @@ import sys
 import os
 
 HELP = """\
-Usage: repsys getsrpm [OPTIONS] REPPKGURL
+Usage: mgarepo getsrpm [OPTIONS] REPPKGURL
 
 Generates the source RPM (.srpm) file of a given package.
 
@@ -37,11 +37,11 @@ Options:
     --strict   Check if the given revision contains changes in REPPKGURL
 
 Examples:
-    repsys getsrpm python
-    repsys getsrpm -l python
-    repsys getsrpm http://foo.bar/svn/cnc/snapshot/python
-    repsys getsrpm -p http://foo.bar/svn/cnc/releases/8cl/python
-    repsys getsrpm -r 1001 file:///svn/cnc/snapshot/python
+    mgarepo getsrpm python
+    mgarepo getsrpm -l python
+    mgarepo getsrpm http://foo.bar/svn/cnc/snapshot/python
+    mgarepo getsrpm -p http://foo.bar/svn/cnc/releases/8cl/python
+    mgarepo getsrpm -r 1001 file:///svn/cnc/snapshot/python
 """
 
 def mode_callback(option, opt, val, parser, mode):
diff --git a/RepSys/commands/log.py b/MgaRepo/commands/log.py
index 28df27d..69058b9 100644
--- a/RepSys/commands/log.py
+++ b/MgaRepo/commands/log.py
@@ -1,14 +1,14 @@
 #!/usr/bin/python
-from RepSys import config, mirror, disable_mirror
-from RepSys.command import *
-from RepSys.layout import package_url, checkout_url
-from RepSys.rpmutil import sync
-from RepSys.util import execcmd
+from MgaRepo import config, mirror, disable_mirror
+from MgaRepo.command import *
+from MgaRepo.layout import package_url, checkout_url
+from MgaRepo.rpmutil import sync
+from MgaRepo.util import execcmd
 import sys
 import os
 
 HELP = """\
-Usage: repsys log [OPTIONS] [PACKAGE]
+Usage: mgarepo log [OPTIONS] [PACKAGE]
 
 Shows the SVN log for a given package.
 
@@ -20,8 +20,8 @@ Options:
     -M           Do not use the mirror (use the main repository)
 
 Examples:
-    repsys log mutt
-    repsys log 2009.1/mutt
+    mgarepo log mutt
+    mgarepo log 2009.1/mutt
 """
 
 def parse_options():
diff --git a/RepSys/commands/markrelease.py b/MgaRepo/commands/markrelease.py
index 057cf1d..857d38d 100644
--- a/RepSys/commands/markrelease.py
+++ b/MgaRepo/commands/markrelease.py
@@ -7,12 +7,12 @@
 # directory and etc). Also, notice that packages must be included in
 # cronological order.
 #
-from RepSys import Error
-from RepSys.command import *
-from RepSys.layout import package_url
-from RepSys.simplerpm import SRPM
-from RepSys.rpmutil import mark_release
-from RepSys.util import get_auth
+from MgaRepo import Error
+from MgaRepo.command import *
+from MgaRepo.layout import package_url
+from MgaRepo.simplerpm import SRPM
+from MgaRepo.rpmutil import mark_release
+from MgaRepo.util import get_auth
 import getopt
 import sys
 import os
@@ -20,7 +20,7 @@ import os
 HELP = """\
 *** WARNING --- You probably SHOULD NOT use this program! --- WARNING ***
 
-Usage: repsys markrelease [OPTIONS] REPPKGURL
+Usage: mgarepo markrelease [OPTIONS] REPPKGURL
 
 This subcommand creates a 'tag' for a given revision of a given package.
 
@@ -35,9 +35,9 @@ Options:
     -h      Show this message
 
 Examples:
-    repsys markrelease -r 68 -v 1.0-1 file://svn/cnc/snapshot/foo
-    repsys markrelease -f @68:foo-1.0-1.src.rpm file://svn/cnc/snapshot/foo
-    repsys markrelease -r 68 -f foo-1.0.src.rpm file://svn/cnc/snapshot/foo
+    mgarepo markrelease -r 68 -v 1.0-1 file://svn/cnc/snapshot/foo
+    mgarepo markrelease -f @68:foo-1.0-1.src.rpm file://svn/cnc/snapshot/foo
+    mgarepo markrelease -r 68 -f foo-1.0.src.rpm file://svn/cnc/snapshot/foo
 """
 
 def version_callback(option, opt, val, parser):
diff --git a/RepSys/commands/patchspec.py b/MgaRepo/commands/patchspec.py
index 9a4881b..9a5811c 100644
--- a/RepSys/commands/patchspec.py
+++ b/MgaRepo/commands/patchspec.py
@@ -2,15 +2,15 @@
 #
 # This program will try to patch a spec file from a given package url.
 #
-from RepSys import Error
-from RepSys.rpmutil import patch_spec
-from RepSys.command import *
-from RepSys.layout import package_url
+from MgaRepo import Error
+from MgaRepo.rpmutil import patch_spec
+from MgaRepo.command import *
+from MgaRepo.layout import package_url
 import getopt
 import sys
 
 HELP = """\
-Usage: repsys patchspec [OPTIONS] REPPKGURL PATCHFILE
+Usage: mgarepo patchspec [OPTIONS] REPPKGURL PATCHFILE
 
 It will try to patch a spec file from a given package url.
 
@@ -19,7 +19,7 @@ Options:
     -h      Show this message
 
 Examples:
-    repsys patchspec http://repos/svn/cnc/snapshot/foo
+    mgarepo patchspec http://repos/svn/cnc/snapshot/foo
 """
 
 def parse_options():
diff --git a/RepSys/commands/putsrpm.py b/MgaRepo/commands/putsrpm.py
index efe1a15..68d87d0 100644
--- a/RepSys/commands/putsrpm.py
+++ b/MgaRepo/commands/putsrpm.py
@@ -1,13 +1,13 @@
 #!/usr/bin/python
-from RepSys import Error
-from RepSys.command import *
-from RepSys.layout import package_url
-from RepSys.rpmutil import put_srpm
+from MgaRepo import Error
+from MgaRepo.command import *
+from MgaRepo.layout import package_url
+from MgaRepo.rpmutil import put_srpm
 import getopt
 import sys, os
 
 HELP = """\
-Usage: repsys putsrpm [OPTIONS] SOURCERPMS
+Usage: mgarepo putsrpm [OPTIONS] SOURCERPMS
 
 Will import source RPMs into the SVN repository.
 
@@ -27,8 +27,8 @@ Options:
     -h      Show this message
 
 Examples:
-    repsys putsrpm pkg/SRPMS/pkg-2.0-1.src.rpm
-    repsys putsrpm -b 2009.1 foo-1.1-1.src.rpm
+    mgarepo putsrpm pkg/SRPMS/pkg-2.0-1.src.rpm
+    mgarepo putsrpm -b 2009.1 foo-1.1-1.src.rpm
 """
 
 def parse_options():
diff --git a/RepSys/commands/rpmlog.py b/MgaRepo/commands/rpmlog.py
index 238b675..ae8997d 100644
--- a/RepSys/commands/rpmlog.py
+++ b/MgaRepo/commands/rpmlog.py
@@ -3,17 +3,17 @@
 # This program will convert the output of "svn log" to be suitable
 # for usage in an rpm %changelog session.
 #
-from RepSys import Error, layout, disable_mirror
-from RepSys.command import *
-from RepSys.svn import SVN
-from RepSys.log import get_changelog, split_spec_changelog
+from MgaRepo import Error, layout, disable_mirror
+from MgaRepo.command import *
+from MgaRepo.svn import SVN
+from MgaRepo.log import get_changelog, split_spec_changelog
 from cStringIO import StringIO
 import getopt
 import os
 import sys
 
 HELP = """\
-Usage: repsys rpmlog [OPTIONS] REPPKGDIRURL
+Usage: mgarepo rpmlog [OPTIONS] REPPKGDIRURL
 
 Prints the RPM changelog of a given package.
 
@@ -28,8 +28,8 @@ Options:
     -h       Show this message
 
 Examples:
-    repsys rpmlog python
-    repsys rpmlog http://svn.mandriva.com/svn/packages/cooker/python
+    mgarepo rpmlog python
+    mgarepo rpmlog http://svn.mandriva.com/svn/packages/cooker/python
 """
 
 def parse_options():
diff --git a/RepSys/commands/submit.py b/MgaRepo/commands/submit.py
index 2924329..79afd21 100644
--- a/RepSys/commands/submit.py
+++ b/MgaRepo/commands/submit.py
@@ -1,9 +1,9 @@
 #!/usr/bin/python
-from RepSys import Error, config, layout, mirror
-from RepSys.svn import SVN
-from RepSys.command import *
-from RepSys.rpmutil import get_spec, get_submit_info
-from RepSys.util import get_auth, execcmd, get_helper
+from MgaRepo import Error, config, layout, mirror
+from MgaRepo.svn import SVN
+from MgaRepo.command import *
+from MgaRepo.rpmutil import get_spec, get_submit_info
+from MgaRepo.util import get_auth, execcmd, get_helper
 import urllib
 import getopt
 import sys
@@ -14,7 +14,7 @@ import uuid
 import xmlrpclib
 
 HELP = """\
-Usage: repsys submit [OPTIONS] [URL[@REVISION] ...]
+Usage: mgarepo submit [OPTIONS] [URL[@REVISION] ...]
 
 Submits the package from URL to the submit host.
 
@@ -47,14 +47,14 @@ Options:
                in the submit host
 
 Examples:
-    repsys submit
-    repsys submit foo
-    repsys submit 2009.1/foo
-    repsys submit foo@14800 bar baz@11001
-    repsys submit https://repos/svn/mdv/cooker/foo
-    repsys submit -l https://repos
-    repsys submit 2008.1/my-packages@11011
-    repsys submit --define section=main/testing -t 2008.1
+    mgarepo submit
+    mgarepo submit foo
+    mgarepo submit 1/foo
+    mgarepo submit foo@14800 bar baz@11001
+    mgarepo submit https://repos/svn/mga/cauldron/foo
+    mgarepo submit -l https://repos
+    mgarepo submit 1/my-packages@11011
+    mgarepo submit --define section=core/testing -t 1
 """
 
 DEFAULT_TARGET = "Cooker"
@@ -157,7 +157,7 @@ def expand_group(group):
 def list_targets(option, opt, val, parser):
     host = config.get("submit", "host")
     if host is None:
-        raise Error, "no submit host defined in repsys.conf"
+        raise Error, "no submit host defined in mgarepo.conf"
     createsrpm = get_helper("create-srpm")
     #TODO make it configurable
     command = "ssh %s %s --list" % (host, createsrpm)
@@ -186,7 +186,7 @@ def submit(urls, target, define=[], submithost=None, atonce=False, sid=None):
         baseargs.append(entry)
     cmdsargs = []
     if len(urls) == 1:
-        # be compatible with server-side repsys versions older than 1.6.90
+        # be compatible with server-side mgarepo versions older than 1.6.90
         url, rev = layout.split_url_revision(urls[0])
         baseargs.append("-r")
         baseargs.append(str(rev))
diff --git a/RepSys/commands/switch.py b/MgaRepo/commands/switch.py
index 998ae2c..ccca76e 100644
--- a/RepSys/commands/switch.py
+++ b/MgaRepo/commands/switch.py
@@ -1,16 +1,16 @@
 #!/usr/bin/python
-from RepSys.command import *
-from RepSys.rpmutil import switch
+from MgaRepo.command import *
+from MgaRepo.rpmutil import switch
 
 HELP = """\
-Usage: repsys switch [URL]
+Usage: mgarepo switch [URL]
 
 Relocates the working copy to the base location URL.
 
-If URL is not provided, it will use the option repository from repsys.conf
+If URL is not provided, it will use the option repository from mgarepo.conf
 as default, or, if the current working copy is already based in
 default_parent, it will use the location from the mirror option from
-repsys.conf. 
+mgarepo.conf. 
 
 If the current work is based in another URL, it will use default_parent.
 
@@ -18,8 +18,8 @@ Options:
     -h      Show this message
 
 Examples:
-    repsys switch
-    repsys switch https://mirrors.localnetwork/svn/packages/
+    mgarepo switch
+    mgarepo switch https://mirrors.localnetwork/svn/packages/
 """
 
 def parse_options():
diff --git a/RepSys/commands/sync.py b/MgaRepo/commands/sync.py
index b4bdaba..1198f3f 100644
--- a/RepSys/commands/sync.py
+++ b/MgaRepo/commands/sync.py
@@ -1,9 +1,9 @@
 #!/usr/bin/python
-from RepSys.command import *
-from RepSys.rpmutil import sync
+from MgaRepo.command import *
+from MgaRepo.rpmutil import sync
 
 HELP = """\
-Usage: repsys sync
+Usage: mgarepo sync
 
 Will add or remove from the working copy those files added or removed
 in the spec file.
@@ -18,7 +18,7 @@ Options:
     -h           Show this message
 
 Examples:
-    repsys sync
+    mgarepo sync
 """
 
 def parse_options():
diff --git a/RepSys/commands/up.py b/MgaRepo/commands/up.py
index 02a1a9f..646a79f 100644
--- a/RepSys/commands/up.py
+++ b/MgaRepo/commands/up.py
@@ -1,9 +1,9 @@
-from RepSys import Error
-from RepSys.command import *
-from RepSys.rpmutil import update
+from MgaRepo import Error
+from MgaRepo.command import *
+from MgaRepo.rpmutil import update
 
 HELP = """\
-Usage: repsys up [PATH]
+Usage: mgarepo up [PATH]
 
 Update the package working copy and synchronize all binaries.
 
diff --git a/RepSys/commands/upload.py b/MgaRepo/commands/upload.py
index 6af50ea..dfcae5d 100644
--- a/RepSys/commands/upload.py
+++ b/MgaRepo/commands/upload.py
@@ -1,9 +1,9 @@
-from RepSys import Error
-from RepSys.command import *
-from RepSys.rpmutil import upload
+from MgaRepo import Error
+from MgaRepo.command import *
+from MgaRepo.rpmutil import upload
 
 HELP = """\
-Usage: repsys upload [OPTIONS] [PATH]
+Usage: mgarepo upload [OPTIONS] [PATH]
 
 Upload a given file to the binary sources repository.
 
diff --git a/RepSys/layout.py b/MgaRepo/layout.py
index fb50acd..f0aaf27 100644
--- a/RepSys/layout.py
+++ b/MgaRepo/layout.py
@@ -3,13 +3,13 @@
 import os
 import urlparse
 
-from RepSys import Error, config
-from RepSys.svn import SVN
+from MgaRepo import Error, config
+from MgaRepo.svn import SVN
 
 __all__ = ["package_url", "checkout_url", "repository_url", "get_url_revision"]
 
 def layout_dirs():
-    devel_branch = config.get("global", "trunk-dir", "cooker/")
+    devel_branch = config.get("global", "trunk-dir", "cauldron/")
     devel_branch = os.path.normpath(devel_branch)
     branches_dir = config.get("global", "branches-dir", "updates/")
     branches_dir = os.path.normpath(branches_dir)
@@ -96,7 +96,7 @@ def checkout_url(pkgdirurl, branch=None, version=None, release=None,
     return newurl
 
 def convert_default_parent(url):
-    """Removes the cooker/ component from the URL"""
+    """Removes the cauldron/ component from the URL"""
     parsed = list(urlparse.urlparse(url))
     path = os.path.normpath(parsed[2])
     rest, last = os.path.split(path)
@@ -126,7 +126,7 @@ def repository_url(mirrored=False):
             default_parent = config.get("global", "default_parent")
             if default_parent is None:
                 raise Error, "you need to set the 'repository' " \
-                        "configuration option on repsys.conf"
+                        "configuration option on mgarepo.conf"
             url = convert_default_parent(default_parent)
     return url
 
@@ -141,7 +141,7 @@ def package_url(name_or_url, version=None, release=None, distro=None,
     @distro: the name of the repository branch inside updates/
     @mirrored: return an URL based on the mirror repository, if enabled
     """
-    from RepSys import mirror
+    from MgaRepo import mirror
     if "://" in name_or_url:
         pkgdirurl = mirror.normalize_path(name_or_url)
         pkgdirurl = remove_current(pkgdirurl)
@@ -156,7 +156,7 @@ def package_url(name_or_url, version=None, release=None, distro=None,
             if distro:
                 default_branch = os.path.join(default_branch, distro)
         else:
-            default_branch = devel_branch # cooker
+            default_branch = devel_branch # cauldron
         path = os.path.join(default_branch, name)
         parsed = list(urlparse.urlparse(repository_url(mirrored=mirrored)))
         parsed[2] = os.path.join(parsed[2], path)
@@ -183,7 +183,7 @@ def package_spec_url(pkgdirurl, *args, **kwargs):
 
 def distro_branch(pkgdirurl):
     """Tries to guess the distro branch name from a package URL"""
-    from RepSys.mirror import same_base
+    from MgaRepo.mirror import same_base
     found = None
     repo = repository_url()
     if same_base(repo, pkgdirurl):
diff --git a/RepSys/log.py b/MgaRepo/log.py
index 6cb9da1..56965c5 100644
--- a/RepSys/log.py
+++ b/MgaRepo/log.py
@@ -1,12 +1,12 @@
 #!/usr/bin/python
-from RepSys import Error, config, layout
-from RepSys.svn import SVN
-from RepSys.util import execcmd
+from MgaRepo import Error, config, layout
+from MgaRepo.svn import SVN
+from MgaRepo.util import execcmd
 
 try:
     from Cheetah.Template import Template
 except ImportError:
-    raise Error, "repsys requires the package python-cheetah"
+    raise Error, "mgarepo requires the package python-cheetah"
 
 from cStringIO import StringIO
 
@@ -71,7 +71,7 @@ def getrelease(pkgdirurl, rev=None, macros=[], exported=None):
     Is here where things should be changed if "automatic release increasing" 
     will be used.
     """
-    from RepSys.rpmutil import rpm_macros_defs
+    from MgaRepo.rpmutil import rpm_macros_defs
     svn = SVN()
     pkgcurrenturl = os.path.join(pkgdirurl, "current")
     specurl = os.path.join(pkgcurrenturl, "SPECS")
@@ -325,7 +325,7 @@ def make_release(author=None, revision=None, date=None, lines=None,
 
 def dump_file(releases, currentlog=None, template=None):
     templpath = template or config.get("template", "path",
-            "/usr/share/repsys/default.chlog")
+            "/usr/share/mgarepo/default.chlog")
     params = {}
     if templpath is None or not os.path.exists(templpath):
         params["source"] = default_template
@@ -591,7 +591,7 @@ def get_changelog(pkgdirurl, another=None, svn=True, rev=None, size=None,
                 checkout of the package, so that the spec file can be
                 parsed from there
     @oldlog:    if set it will try to append the old changelog file defined
-                in oldurl in repsys.conf
+                in oldurl in mgarepo.conf
     """
     newlog = StringIO()
     if svn:
diff --git a/RepSys/mirror.py b/MgaRepo/mirror.py
index 94720cc..1d1fcf3 100644
--- a/RepSys/mirror.py
+++ b/MgaRepo/mirror.py
@@ -3,8 +3,8 @@ import os
 import urlparse
 import urllib
 
-from RepSys import Error, config, layout
-from RepSys.svn import SVN
+from MgaRepo import Error, config, layout
+from MgaRepo.svn import SVN
 
 def mirror_url():
     mirror = config.get("global", "mirror")
@@ -71,7 +71,7 @@ def info(url, write=False, stream=sys.stderr):
         stream.write("Using the svn mirror.\n")
         if write:
             stream.write("To be able to commit changes, use "
-                    "'repsys switch' first.\n")
+                    "'mgarepo switch' first.\n")
 
 def mirror_relocate(oldparent, newparent, url, wcpath):
     svn = SVN()
@@ -99,13 +99,13 @@ def autoswitch(svn, wcpath, wcurl, newbaseurl=None):
     repository = layout.repository_url()
     current = repository
     if repository is None:
-        raise Error, "the option repository from repsys.conf is "\
+        raise Error, "the option repository from mgarepo.conf is "\
                 "required"
     indefault = same_base(repository, wcurl)
     if not newbaseurl:
         if not mirror:
             raise Error, "an URL is needed when the option mirror "\
-                    "from repsys.conf is not set"
+                    "from mgarepo.conf is not set"
         if indefault:
             chosen = mirror
         elif same_base(mirror, wcurl):
diff --git a/RepSys/plugins/__init__.py b/MgaRepo/plugins/__init__.py
index e4f4e08..1eeb3bb 100644
--- a/RepSys/plugins/__init__.py
+++ b/MgaRepo/plugins/__init__.py
@@ -8,19 +8,19 @@ def load():
     for entry in os.listdir(pluginsdir):
         if entry != "__init__.py" and entry.endswith(".py"):
             name = entry[:-3]
-            loaded[name] = __import__("RepSys.plugins."+name, {}, {},
+            loaded[name] = __import__("MgaRepo.plugins."+name, {}, {},
                     [name])
         elif os.path.isdir(entry):
             initfile = os.path.join(entry, "__init__.py")
             if os.path.isfile(initfile):
-                loaded[entry] = __import__("RepSys.plugins."+entry, {}, {},
+                loaded[entry] = __import__("MgaRepo.plugins."+entry, {}, {},
                         [entry])
 
 def list():
     return loaded.keys()
 
 def help(name):
-    from RepSys import Error
+    from MgaRepo import Error
     try:
         return loaded[name].__doc__
     except KeyError:
diff --git a/RepSys/plugins/ldapusers.py b/MgaRepo/plugins/ldapusers.py
index e56371d..294c32d 100644
--- a/RepSys/plugins/ldapusers.py
+++ b/MgaRepo/plugins/ldapusers.py
@@ -1,8 +1,8 @@
 """
-A Repsys plugin for obtaining users from a LDAP server.
+A mgarepo plugin for obtaining users from a LDAP server.
 
 In order to enable the plugin, the user must define the following 
-options in the [global] section of repsys.conf:
+options in the [global] section of mgarepo.conf:
 
     ldap-uri [required if ldap-server is unset]
         the URI of the server, you can refer to more than one server by
@@ -53,15 +53,15 @@ options in the [global] section of repsys.conf:
         Note that only the first value of the attributes will be 
         used.
 
-When the searched option is not found, it will try in repsys.conf. All
-the values found.  (including from repsys.conf) will be cached between
+When the searched option is not found, it will try in mgarepo.conf. All
+the values found.  (including from mgarepo.conf) will be cached between
 each configuration access.
 
 This plugin requires the package python-ldap.
 
 For more information, look http://qa.mandriva.com/show_bug.cgi?id=30549
 """
-from RepSys import Error, config
+from MgaRepo import Error, config
 
 import string
 
diff --git a/RepSys/plugins/sample.py.txt b/MgaRepo/plugins/sample.py.txt
index 9877f3c..846cb6d 100644
--- a/RepSys/plugins/sample.py.txt
+++ b/MgaRepo/plugins/sample.py.txt
@@ -1,6 +1,6 @@
-# Sample repsys plugin. In order to test it, rename to sample.py
+# Sample mgarepo plugin. In order to test it, rename to sample.py
 # vim:ft=python
-from RepSys import config
+from MgaRepo import config
 
 def users_wrapper(section, option=None, default=None, walk=False):
     d = {"foolano": "Foolano De Tal <foolano@bla.com>",
diff --git a/RepSys/rpmutil.py b/MgaRepo/rpmutil.py
index bff744b..2bf3ef4 100644
--- a/RepSys/rpmutil.py
+++ b/MgaRepo/rpmutil.py
@@ -1,10 +1,10 @@
 #!/usr/bin/python
-from RepSys import Error, config
-from RepSys import mirror, layout, log, binrepo
-from RepSys.svn import SVN
-from RepSys.simplerpm import SRPM
-from RepSys.util import execcmd
-from RepSys.command import default_parent
+from MgaRepo import Error, config
+from MgaRepo import mirror, layout, log, binrepo
+from MgaRepo.svn import SVN
+from MgaRepo.simplerpm import SRPM
+from MgaRepo.util import execcmd
+from MgaRepo.command import default_parent
 import rpm
 import urlparse
 import tempfile
@@ -630,7 +630,7 @@ def commit(target=".", message=None, logfile=None):
     mopts = " ".join(opts)
     os.system("svn ci %s %s" % (mopts, target))
     if mirrored:
-        print "use \"repsys switch\" in order to switch back to mirror "\
+        print "use \"mgarepo switch\" in order to switch back to mirror "\
                 "later"
 
 def spec_sources(topdir):
diff --git a/RepSys/simplerpm.py b/MgaRepo/simplerpm.py
index d448c5f..806079c 100644
--- a/RepSys/simplerpm.py
+++ b/MgaRepo/simplerpm.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from RepSys.util import execcmd
+from MgaRepo.util import execcmd
 
 class SRPM:
     def __init__(self, filename):
diff --git a/RepSys/svn.py b/MgaRepo/svn.py
index 605ea8e..d44d7f2 100644
--- a/RepSys/svn.py
+++ b/MgaRepo/svn.py
@@ -1,5 +1,5 @@
-from RepSys import Error, SilentError, config
-from RepSys.util import execcmd, get_auth
+from MgaRepo import Error, SilentError, config
+from MgaRepo.util import execcmd, get_auth
 import sys
 import os
 import re
@@ -43,7 +43,7 @@ class SVN:
                            "http://wiki.mandriva.com/en/Development/Docs/Contributor_Tricks#SSH_configuration"
                            " for more information.")
                 elif "authorization failed" in e.args[0]:
-                    msg = ("Note that repsys does not support any HTTP "
+                    msg = ("Note that mgarepo does not support any HTTP "
                            "authenticated access.")
             if kwargs.get("show") and \
                     not config.getbool("global", "verbose", 0):
@@ -59,8 +59,8 @@ class SVN:
             raise
 
     def _set_env(self):
-        wrapper = "repsys-ssh"
-        repsys = config.get("global", "repsys-cmd")
+        wrapper = "mgarepo-ssh"
+        repsys = config.get("global", "mgarepo-cmd")
         if repsys:
             dir = os.path.dirname(repsys)
             path = os.path.join(dir, wrapper)
diff --git a/RepSys/util.py b/MgaRepo/util.py
index 84840b9..69f3a79 100644
--- a/RepSys/util.py
+++ b/MgaRepo/util.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-from RepSys import Error, config
+from MgaRepo import Error, config
 
 import subprocess
 import getpass
@@ -11,7 +11,7 @@ import logging
 from cStringIO import StringIO
 #import commands
 
-log = logging.getLogger("repsys")
+log = logging.getLogger("mgarepo")
 
 # Our own version of commands' getstatusoutput(). We have a commands
 # module directory, so we can't import Python's standard module
@@ -85,7 +85,7 @@ def get_auth(username=None, password=None):
 
 def mapurl(url):
     """Maps a url following the regexp provided by the option url-map in
-    repsys.conf
+    mgarepo.conf
     """
     urlmap = config.get("global", "url-map")
     newurl = url
@@ -109,7 +109,7 @@ def get_helper(name):
     configuration, if not, falls back to the default helper path, which can
     also be defined in configuration file(s).
     """
-    helperdir = config.get("helper", "prefix", "/usr/share/repsys")
+    helperdir = config.get("helper", "prefix", "/usr/share/mgarepo")
     hpath = config.get("helper", name, None) or \
             os.path.join(helperdir, name)
     if not os.path.isfile(hpath):
diff --git a/README b/README
index 74aea90..f81aea9 100644
--- a/README
+++ b/README
@@ -1,12 +1,11 @@
-repsys is the tool used to manage RPM packages in a subversion repository.
+mgarepo is the tool used to manage RPM packages in a subversion repository
+on Mageia. It is a fork of the repsys tool used by Mandriva.
 It is used to create, tag releases, generate .src.rpm, generate changelog,
 and request new package releases for build. It mostly acts as a interface
 to svn(1) commands and small task scripts run that on the build system side
 over ssh(1).
 
-For more information, see repsys(8) and
-http://wiki.mandriva.com/en/Development/Packaging/RepositorySystem
+For more information, see mgarepo(8)
 
-The discussion on the development of repsys takes place on the
-"maintainers" mailing list:
-http://wiki.mandriva.com/en/Development/Mailinglists
+The discussion on the development of mageiarepo takes place on the
+Mageia developers mailing list.
diff --git a/BRANCH b/README.BINREPO
index ebb87c7..78b951d 100644
--- a/BRANCH
+++ b/README.BINREPO
@@ -15,7 +15,7 @@ but instead of having SOURCES and SPECS, it will only have a SOURCES
 directory. Every copy/move operation should happen in both repositories.
 
 In order to allow deceasing binaries from older distributions, each stable
-distro will have its own subversion repository for binary files.  repsys
+distro will have its own subversion repository for binary files.  mgarepo
 knows how to access these binrepos by checking which URL defined in the
 "[binrepo]" section of the configuration file matches the path-part of the
 repository being accessed.  (see open issues)
@@ -29,7 +29,7 @@ conversion.
 Mapping repositories states
 ---------------------------
 
-In order to allow the use of `repsys {getsrpm,co} -r REV`, repsys will have
+In order to allow the use of `mgarepo {getsrpm,co} -r REV`, mgarepo will have
 to use a reference in the text repo which will be used to know in what
 state was the binrepo when a binary was uploaded.
 
@@ -41,7 +41,7 @@ numbers is needed.
 
 When a binary is uploaded to the binrepo, the file `sha1.lst` is updated to
 have the files's hash and commited in the main text repo. This file will be
-used as the reference when the user uses -r REV on repsys. repsys will
+used as the reference when the user uses -r REV on mgarepo. mgarepo will
 checkout the package in the main text repo with -r REV and then will use
 the "Last Changed Date" of `sha1.lst` to checkout the binrepo part. Thus,
 `sha1.lst` should be always commited to the main text repository *after* the
@@ -162,15 +162,15 @@ would work like:
 Interesting use cases (first phase)
 ===================================
 
-repsys co 2008.1/mutt
+mgarepo co 1/mutt
 ---------------------
 
-- repsys checkouts
-  http://svn.mandriva.com/svn/packages/updates/2008.1/mutt/current to the
+- mgarepo checkouts
+  http://svn.mageia.org/svn/packages/updates/1/mutt/current to the
   mutt directory
 
-- repsys checkouts
-  http://svn.mandriva.com/svn/binrepo/updates/2008.1/mutt/current/SOURCES
+- mgarepo checkouts
+  http://svn.mageia.org/svn/binrepo/updates/1/mutt/current/SOURCES
   into mutt/SOURCES-bin
 
 - creates symlinks for all files found in SOURCES-bin/ into ../SOURCES/
@@ -187,7 +187,7 @@ markrelease of a package
 
 ::
 
-   $ repsys markrelease 
+   $ mgarepo markrelease 
 
 - will copy current/ to releases/VERSION/RELEASE, as usual
 
@@ -208,40 +208,40 @@ upgrading to a newer version of the package
 
   $ cd bla/SOURCES/
   $ wget http://prdownloads.sourceforge.net/bla/bla-1.6.tar.bz2
-  $ repsys add bla-1.6.0.tar.bz2
+  $ mgarepo upload bla-1.6.0.tar.bz2
 
-- repsys notices this is a tarball (checking filename and/or file size)
+- mgarepo notices this is a tarball (checking filename and/or file size)
 
-- repsys will move the file to SOURCES-bin/, create the symlink, and svn-add
+- mgarepo will move the file to SOURCES-bin/, create the symlink, and svn-add
   it to the working copy
 
   $ # the user updates the spec
 
-  $ repsys rm SOURCES/bla-1.5.1.tar.bz2
+  $ mgarepo rm SOURCES/bla-1.5.1.tar.bz2
 
 - it will remove the symlink and run svn rm on
   SOURCES-bin/bla-1.6.0.tar.bz2::
 
   $ cd ../ # package top dir
-  $ repsys ci
+  $ mgarepo ci
 
-- repsys will commit the new tarball on SOURCES-bin/ and then on the rest
+- mgarepo will commit the new tarball on SOURCES-bin/ and then on the rest
   of the working copy
 
-repsys sync would perform these steps too.
+mgarepo sync would perform these steps too.
 
 importing a package
 -------------------
 
-  $ repsys putsrpm mypkg.src.rpm
+  $ mgarepo putsrpm mypkg.src.rpm
 
-- repsys will open the src.rpm
+- mgarepo will open the src.rpm
 
 - will look for tarballs inside SOURCES/ and import them to
-  http://svn.mandriva.com/svn/binrepo/cooker/mypkg/current/SOURCES/
+  http://svn.mageia.org/svn/binrepo/cauldron/mypkg/current/SOURCES/
 
 - will move the tarballs out of SOURCES and import the remaining files to
-  http://svn.mandriva.com/svn/packages/cooker/mypkg/current/
+  http://svn.mageia.org/svn/packages/cauldron/mypkg/current/
 
 - will do whatever else putsrpm already does
 
@@ -338,7 +338,7 @@ Use of "external" xdelta to save space on binaries
 --------------------------------------------------
 
 But how? First idea is this could be done by defining a protocol and
-assuming repository manipulation with repsys (for ease).  Repsys could
+assuming repository manipulation with mgarepo (for ease).  Repsys could
 xdelta tarballs and add it to SVN with a special filename, then use it when
 checking out.  Would require a policy/algorithm on when to ditch old whole
 binaries, too (i.e.  hopefully wouldn't need to be handled manually by the
@@ -358,62 +358,3 @@ The Future
 
 - Xdelta
 
-
-Deployment
-==========
-
-The current repository will be kept around for a while, in readonly state. 
-Initial binrepos will be populated with the binaries in the `current/`
-branches of packages.
-
-The binrepo mappings config might be kept in a fixed subversion revision
-property (revision 0?).
-
-Rough steps
------------
-
-- check for agreement between subversion repository filters for binaries,
-  and repsys
-- upgrade repsys everywhere
-
-  - kenobi
-  - cluster nodes
-  - raoh
-  - titan
-
-- populate the binrepos for each supported distro, from a specific revision
-  of oldrepo, and mass commmit the corresponding `sha1.lst` in txtrepo for
-  every package
-
-  - set svn:date revprop of the `sha1.lst` mass commit to the date of the
-    oldrepo revision
-  - before mass commiting the `sha1.lst`, possibly freeze oldrepo, check
-    for changes to sources after the selected revision, and update the
-    binrepo as necessary
-
-- check Secteam scripts, make needed changes to get them ready (non
-  critical)
-- set up the new repositories
-
-  - hook for filtering of disallowed (binary) files in main repository
-  - binrepos mappings
-
-- make the new main + binrepos repositories available, but readonly
-
-  - keep new main repository in sync with the old repository with hooks
-
-- make current repository readonly and enable verification of sha1.lst at
-  package submission time
-
-- make sure new main repository and old repository are in sync
-
-  - resync binrepos with the old repository as needed
-
-- final tests
-
-  - change something
-  - submit
-  - etc.
-
-- make the new repositories writeable
-
diff --git a/README.LDAP b/README.LDAP
index c22a7fa..a30ebd0 100644
--- a/README.LDAP
+++ b/README.LDAP
@@ -1,7 +1,7 @@
 A Repsys plugin for obtaining users from a LDAP server.
 
 In order to enable the plugin, the user must define the following 
-options in the [global] section of repsys.conf:
+options in the [global] section of mgarepo.conf:
 
     ldap-uri [required if ldap-server is unset]
         the URI of the server, you can refer to more than one server by
@@ -52,8 +52,8 @@ options in the [global] section of repsys.conf:
         Note that only the first value of the attributes will be 
         used.
 
-When the searched option is not found, it will try in repsys.conf. All
-the values found.  (including from repsys.conf) will be cached between
+When the searched option is not found, it will try in mgarepo.conf. All
+the values found.  (including from mgarepo.conf) will be cached between
 each configuration access.
 
 This plugin requires the package python-ldap.
diff --git a/create-srpm b/create-srpm
index 08d4400..12e596a 100755
--- a/create-srpm
+++ b/create-srpm
@@ -1,10 +1,10 @@
 #!/usr/bin/python
 
-from RepSys import Error, config, plugins, layout
-from RepSys.mirror import strip_username
-from RepSys.rpmutil import get_srpm
-from RepSys.cgiutil import get_targets
-from RepSys.util import mapurl, execcmd, get_helper
+from MgaRepo import Error, config, plugins, layout
+from MgaRepo.mirror import strip_username
+from MgaRepo.rpmutil import get_srpm
+from MgaRepo.cgiutil import get_targets
+from MgaRepo.util import mapurl, execcmd, get_helper
 import sys
 import os
 import pwd
diff --git a/default.chlog b/default.chlog
index 5b9d435..86c3728 100644
--- a/default.chlog
+++ b/default.chlog
@@ -1,5 +1,5 @@
 ##
-## Default changelog format for Mandriva Linux
+## Default changelog format for Mageia
 ##
 #if not $releases_by_author[-1].visible
   ## Hide the first release that contains no changes. It must be a
diff --git a/repsys b/mgarepo
index b1343fb..97d7803 100755
--- a/repsys
+++ b/mgarepo
@@ -1,13 +1,13 @@
 #!/usr/bin/python
-from RepSys import Error, plugins, config
-from RepSys.command import *
+from MgaRepo import Error, plugins, config
+from MgaRepo.command import *
 import getopt
 import sys
 
 VERSION="1.9.4"
 
 HELP = """\
-Usage: repsys COMMAND [COMMAND ARGUMENTS]
+Usage: mgarepo COMMAND [COMMAND ARGUMENTS]
 
 Tool to access and manage a package repository structure.
 
@@ -27,7 +27,7 @@ Useful commands:
     authoremail   prints the e-mail of a given author
     switch        relocate to mirror or upstream repository
 
-Run "repsys COMMAND --help" and "man 8 repsys" for more information.
+Run "mgarepo COMMAND --help" and "man 8 mgarepo" for more information.
 
 Written by Gustavo Niemeyer <gustavo@niemeyer.net>
 """
@@ -71,7 +71,7 @@ def dispatch_command(command, argv, debug=0):
     if debug:
         config.set("global", "verbose", "yes")
     try:
-        repsys_module = __import__("RepSys.commands."+command)
+        repsys_module = __import__("MgaRepo.commands."+command)
         commands_module = getattr(repsys_module, "commands")
         command_module = getattr(commands_module, command)
     except (ImportError, AttributeError):
@@ -87,7 +87,7 @@ if __name__ == "__main__":
     except Error, e:
         sys.stderr.write("plugin initialization error: %s\n" % e)
         sys.exit(1)
-    config.set("global", "repsys-cmd", sys.argv[0])
+    config.set("global", "mgarepo-cmd", sys.argv[0])
     do_command(parse_options, dispatch_command)
 
 # vim:et:ts=4:sw=4
diff --git a/repsys-example.conf b/mgarepo-example.conf
index 34e180b..0a84e6a 100644
--- a/repsys-example.conf
+++ b/mgarepo-example.conf
@@ -1,15 +1,15 @@
 [global]
 verbose = no
-repository = svn+ssh://svn.mandriva.com/svn/packages/
-url-map = svn\+ssh://svn\.mandriva\.com/(.*) file:///\1
+repository = svn+ssh://svn.mageia.org/svn/packages/
+url-map = svn\+ssh://svn\.mageia\.org/(.*) file:///\1
 #tempdir = /tmp
-## the command used to download files when using repsys sync -d
+## the command used to download files when using mgarepo sync -d
 #download-command = wget -c -O '$dest' $url
 svn-env = SVN_SSH=/home/me/my-ssh-wrapper
 	SVN_FOO=bar
 
 [log]
-oldurl = svn+ssh://svn.mandriva.com/svn/packages/misc
+oldurl = svn+ssh://svn.mageia.org/svn/packages/misc
 sort = yes
 merge-spec = no
 # controls up to which revision the rpm changelog
@@ -23,19 +23,19 @@ ignore-string = SILENT
 
 [template]
 # set the cheetah template used to generate the spec changelog from svn
-path = /usr/share/repsys/default.chlog
+path = /usr/share/mgarepo/default.chlog
 
 [helper]
-# create-srpm is called by repsys on the server-side when submitting a
+# create-srpm is called by mgarepo on the server-side when submitting a
 # package
-create-srpm = /usr/share/repsys/create-srpm
+create-srpm = /usr/share/mgarepo/create-srpm
 # upload-srpm is called by create-srpm to copy the generated .src.rpm to
 # the proper build queue
 upload-srpm = /usr/local/bin/youri.devel
 
 # this section maps usernames found in svn commits to the ones that must be
 # shown in the changelog
-# users can be retrieved from LDAP through the use of the repsys-ldap
+# users can be retrieved from LDAP through the use of the mgarepo-ldap
 # plugin
 [users]
 # jsmith = John Smith <jsmith26@example.com>
@@ -47,19 +47,19 @@ upload-srpm = /usr/local/bin/youri.devel
 run-prep = yes
 
 [submit]
-host = kenobi.mandriva.com
-default = Cooker
+host = pkgsubmit.mageia.org
+default = Cauldron 
 
-[submit Cooker]
-target = /export/home/repsys
-allowed = svn+ssh://svn.mandriva.com/svn/packages/cooker
-scripts = /usr/share/repsys/rebrand-mdk
+[submit Cauldron]
+target = /export/home/mgarepo
+allowed = svn+ssh://svn.mageia.org/svn/packages/cauldron
+scripts = /usr/share/mgarepo/rebrand-mdk
 ##
 ## rpm-macros refers to the sections containing the macros used for this
 ## target. The values will be used to build the rpmbuild command line. For
 ## example:
 ## 
-##   [macros cooker]
+##   [macros cauldron]
 ##   a = b
 ##   c = %a
 ##
@@ -68,7 +68,7 @@ scripts = /usr/share/repsys/rebrand-mdk
 #rpm-macros = global cooker
 
 #[macros global]
-#distsuffix = mdv
+#distsuffix = mga
 
-#[macros cooker]
-#mandriva_release = 2007.1
+#[macros cauldron]
+#mageia_release = 2
diff --git a/repsys-ssh b/mgarepo-ssh
index 9532421..9532421 100755
--- a/repsys-ssh
+++ b/mgarepo-ssh
diff --git a/repsys.8 b/mgarepo.8
index a0b240b..562b473 100644
--- a/repsys.8
+++ b/mgarepo.8
@@ -1,41 +1,41 @@
-.\" repsys - Package repository management tool
-.TH "repsys" "8" "2008 Feb 8" "Mandriva Linux" ""
+.\" mgarepo - Package repository management tool
+.TH "mgarepo" "8" "2011 Jan 11" "Mageia" ""
 .SH "NAME"
-repsys \- Package sources repository management tool
+mgarepo \- Package sources repository management tool
 .SH "SYNOPSIS"
-\fBrepsys\fP command [options] [arguments]
+\fBmgarepo\fP command [options] [arguments]
 .SH "DESCRIPTION"
-\fBrepsys\fP is the tool used to manage RPM packages in a subversion repository. It is used to create, tag releases, generate .src.rpm, generate changelog, and request new package releases for build. It mostly acts as a interface to svn(1) commands and small task scripts run on the build system side over ssh(1).
+\fBmgarepo\fP is the tool used to manage RPM packages in a subversion repository. It is used to create, tag releases, generate .src.rpm, generate changelog, and request new package releases for build. It mostly acts as a interface to svn(1) commands and small task scripts run on the build system side over ssh(1).
 
-Most of the \fBrepsys\fP commands operate on a given package URL, these URLs can be omitted when the configuration option \fBrepository\fP is set.
+Most of the \fBmgarepo\fP commands operate on a given package URL, these URLs can be omitted when the configuration option \fBrepository\fP is set.
 
-Detailed help on commands is available running \fBrepsys <command> \-\-help\fP.
+Detailed help on commands is available running \fBmgarepo <command> \-\-help\fP.
 .SH "BASIC USAGE"
 .SS "Setup"
-\fBrepsys\fP does not handle the authentication interface used by svn. So it is usually required to setup ssh\-agent(1) if the repository access method is over SSH (svn+ssh:// URLs), or performing some simple operation in order to obtain a authentication token.
+\fBmgarepo\fP does not handle the authentication interface used by svn. So it is usually required to setup ssh\-agent(1) if the repository access method is over SSH (svn+ssh:// URLs), or performing some simple operation in order to obtain a authentication token.
 
 .nf
 For more information related how to setup ssh-agent, see:
 http://wiki.mandriva.com/en/Development/Docs/Contributor_Tricks#SSH_configuration
 .fi
 
-Users that don't have an ssh account in the default repository URL can set the option \fBmirror\fP pointing to a non-authenticated, read-only repository (such as http://svn.mandriva.com/svn/packages).
+Users that don't have an ssh account in the default repository URL can set the option \fBmirror\fP pointing to a non-authenticated, read-only repository (such as http://svn.mageia.org/svn/packages).
 .SS "Examples"
 .PP
-.IP "\fBrepsys co foo\fP"
+.IP "\fBmgarepo co foo\fP"
 Obtains a working copy of the package foo.
-.IP "\fBrepsys co 2009.0/mutt\fP"
-Obtains a working copy of the package mutt of from the 2009.0 branch.
-.IP "\fBrepsys ci\fP"
+.IP "\fBmgarepo co 1/mutt\fP"
+Obtains a working copy of the package mutt of from the 1 branch.
+.IP "\fBmgarepo ci\fP"
 Commits pending changes in the working copy.
-.IP "\fBrepsys submit foo \-r 12345\fP"
+.IP "\fBmgarepo submit foo \-r 12345\fP"
 Requests the package foo in the revision 12345 to be built and, if successful, to be uploaded to the RPMs repository.
-.IP "\fBrepsys submit foo \-r 12345 -t 2008.0 \-\-define section=main/testing\fP"
-Will submit the package foo and, upon successful build will have its RPMs placed inside the main/testing media of the 2008.0 repository.
-.IP "\fBrepsys submit\fP"
+.IP "\fBmgarepo submit foo \-r 12345 -t 1 \-\-define section=core/testing\fP"
+Will submit the package foo and, upon successful build will have its RPMs placed inside the core/testing media of the 1 repository.
+.IP "\fBmgarepo submit\fP"
 submit run without parameters will use package name and revision found in the working copy in the current directory.
 .SH "COMMANDS"
-For detailed help on commands run \fBrepsys <command> \-\-help\fP.
+For detailed help on commands run \fBmgarepo <command> \-\-help\fP.
 \#TODO complete list of commands, all options, all descriptions
 .PP
 .IP "\fBco\fP"
@@ -68,18 +68,18 @@ A detailed description can be found at:
 http://wiki.mandriva.com/en/Development/Packaging/RepositorySystem
 .fi
 
-The svn repository used by \fBrepsys\fP consists of a set of branches in the top directory, followed by package directories having the internal package structure.
+The svn repository used by \fBmgarepo\fP consists of a set of branches in the top directory, followed by package directories having the internal package structure.
 
 The internal package layout contains a directory \fBcurrent/\fP, which contains the latest version of the package (equivalent to "trunk" in software repositories). The directory \fBreleases/\fP contain copies of older submitted packages that have been already released, it is organized in the \fB<version>/<release>\fP format (equivalent to "tags" directories).
 
-URLs used in \fBrepsys\fP commands refer to the package directory, and never to \fBcurrent\fP. In other words, the http://host/svn/cooker/foo is valid, whereas http://host/svn/cooker/foo/current is not.
+URLs used in \fBmgarepo\fP commands refer to the package directory, and never to \fBcurrent\fP. In other words, the http://host/svn/cauldron/foo is valid, whereas http://host/svn/cauldron/foo/current is not.
 
 One example layout:
 
 \fB
-/packages/cooker
+/packages/cauldron
      |
-     +\- cooker/
+     +\- cauldron/
      |  ...
      |  +\- rsync/
      |  +\- coreutils/
@@ -91,18 +91,18 @@ One example layout:
      |     +\- releases/
      |        ...
      |        +\- 1.0
-     |           +\- 1mdk/
+     |           +\- 1.mga1/
      |              +\- SOURCES/
      |              +\- SPECS/
-     |           +\- 2mdk/
+     |           +\- 2.mga1/
      |           ...
      +\- updates/
-        +\- 2007.0/
-        +\- 2007.1/
-        +\- 2008.0/
+        +\- 1/
+        +\- 2/
+        +\- 3/
 \fP
 .SS "Setting up a repository"
-The minimal setup is accomplished with a Subversion repository having three directories: \fBcooker/\fP, \fBmisc/\fP and \fBupdates/\fP. The name of this directories can be changed using the configuration options \fBtrunk\-dir\fP and \fBbranches-dir\fP. Having this you can start importing packages with \fBrepsys import\fP.
+The minimal setup is accomplished with a Subversion repository having three directories: \fBcauldron/\fP, \fBmisc/\fP and \fBupdates/\fP. The name of this directories can be changed using the configuration options \fBtrunk\-dir\fP and \fBbranches-dir\fP. Having this you can start importing packages with \fBmgarepo import\fP.
 \#.SH "THE SUBMIT PROCESS"
 \#.SS "Connecting"
 \#.SS "Changelog generation"
@@ -111,44 +111,44 @@ The minimal setup is accomplished with a Subversion repository having three dire
 \#.SH SERVER\-SIDE SETUP
 .SH "CONFIGURATION"
 .SS "Introduction"
-The main configuration file is \fB/etc/repsys.conf\fP, it is in the .ini format. It is basically defined by a set of \fB[name]\fP sections, with a set of variables defined by \fBname = value\fP.
+The main configuration file is \fB/etc/mgarepo.conf\fP, it is in the .ini format. It is basically defined by a set of \fB[name]\fP sections, with a set of variables defined by \fBname = value\fP.
 
-If existing, the file ~/.repsys/config is also loaded.
+If existing, the file ~/.mgarepo/config is also loaded.
 .SS "[global] section"
 .PP
 .IP "\fBrepository = URL\fP"
-Contains the base URL used to access packages in the svn repository when only package names are used in repsys commands. For example, if \fBrepsys co trafshow\fP is run and repository is http://host/svn/, the URL http://host/svn/cooker/trafshow will be used ("cooker" is the default branch).
+Contains the base URL used to access packages in the svn repository when only package names are used in mgarepo commands. For example, if \fBmgarepo co trafshow\fP is run and repository is http://host/svn/, the URL http://host/svn/cauldron/trafshow will be used ("cauldron" is the default branch).
 .IP "\fBdefault_parent = URL\fP"
 Points to the base URL of the development branch of the svn repository. This option is deprecated as it has been replaced by "repository".
 .IP "\fBmirror = URL\fP" 
-The URL of an alternative and read\-only repository to be used when checking out packages. \fBrepsys ci\fP will automatically relocate to "repository" when comitting.
+The URL of an alternative and read\-only repository to be used when checking out packages. \fBmgarepo ci\fP will automatically relocate to "repository" when comitting.
 .IP "\fBuse-mirror = yes/no\fP"
 Disable the use of the mirror repository when checking out packages.
 .IP "\fBurl\-map = MATCH\-REGEXP REPLACE\-EXPR\fP"
-This option is used on server-side to remap remote URLs brought by the user when running \fBrepsys submit\fP to local (and probably faster) URLs. \fBMATCH\-REGEXP\fP is a Python regular expression matching the components that must be reused in the local URL. \fbREPLACE\-EXPR\fP is a replace expression that should expand in the final URL. Example: \fBsvn\+ssh://svn\.mandriva\.com/(.*) file:///\1\fP
+This option is used on server-side to remap remote URLs brought by the user when running \fBmgarepo submit\fP to local (and probably faster) URLs. \fBMATCH\-REGEXP\fP is a Python regular expression matching the components that must be reused in the local URL. \fbREPLACE\-EXPR\fP is a replace expression that should expand in the final URL. Example: \fBsvn\+ssh://svn\.mageia\.org/(.*) file:///\1\fP
 .IP "\fBtempdir = PATH\fP"
-The directory to be used as base for temporay directories and files created by repsys.
+The directory to be used as base for temporay directories and files created by mgarepo.
 .IP "\fBdownload\-command = COMMAND\-FMT\fP"
-Command used to download generic remote URLs, it accepts the variables \fB$url\fP and \fB$dest\fP. It is currently used when running \fBrepsys sync \-d\fP.
+Command used to download generic remote URLs, it accepts the variables \fB$url\fP and \fB$dest\fP. It is currently used when running \fBmgarepo sync \-d\fP.
 .IP "\fBsvn\-command = COMMAND\fP"
 The base command used to execute svn(1). Runs through system(3).
 .IP "\fBsvn-env = VAR=VALUE ..\fP"
-The environment variables to use when running svn. More entries can be defined by using more lines. The variable defined by default is \fBSVN_SSH\fP, which points to the \fBrepsys-ssh\fP ssh wrapper.
+The environment variables to use when running svn. More entries can be defined by using more lines. The variable defined by default is \fBSVN_SSH\fP, which points to the \fBmgarepo-ssh\fP ssh wrapper.
 .IP "\fBverbose = yes/no\fP"
-Increase the verbosity of repsys output, printing commands being run and complete traceback when unhanlded errors happen.
+Increase the verbosity of mgarepo output, printing commands being run and complete traceback when unhanlded errors happen.
 .IP "\fBtrunk-dir\fP"
 Points to the default branch of the distro used in commands that do not have their branch or URL specified.
 .IP "\fBbranches-dir\fP"
-The directory inside the repository which contains all the branches of the distro. It is used to build the URL of packages referred using the branch notation BRANCH/PACKAGE, as in \fBrepsys co 2009.0/mutt\fP.
+The directory inside the repository which contains all the branches of the distro. It is used to build the URL of packages referred using the branch notation BRANCH/PACKAGE, as in \fBmgarepo co 1/mutt\fP.
 .SS "[submit-groups] section"
-This section contains aliases to groups of packages to be submitted at once. For example, a line with \fBmy-python-packages = bzr bzrtools bzr-gtk\fP would allow the user to simply run \fBrepsys submit my-python-packages\fP.
+This section contains aliases to groups of packages to be submitted at once. For example, a line with \fBmy-python-packages = bzr bzrtools bzr-gtk\fP would allow the user to simply run \fBmgarepo submit my-python-packages\fP.
 
-Also distro branches or revision numbers can be specified for each package group. For example: \fBrepsys submit 2008.1/my-python-packages\fP.
+Also distro branches or revision numbers can be specified for each package group. For example: \fBmgarepo submit 1/my-python-packages\fP.
 .SS "[submit] section"
 .IP "\fBhost = HOST\fP"
-Defines the default host in which \fBrepsys submit\fP will run the submit helper.
+Defines the default host in which \fBmgarepo submit\fP will run the submit helper.
 .IP "\fBdefault = TARGET\fP"
-The default target to be used in \fBrepsys submit\fP when the option \-t is not used.
+The default target to be used in \fBmgarepo submit\fP when the option \-t is not used.
 .SS "[submit TARGET] sections (server\-side only)"
 These sections describe each one of the sections available to submit packages, ther configuration options are:
 .IP "\fBtarget = PATH\fP"
@@ -160,23 +160,23 @@ A space\-delimited list of scripts that will be run receiving the generated SRPM
 .IP "\fBrpm\-macros = NAMES\fP"
 It points to sections in the configuration that will contain the RPM macros used when generating the SRPM of the package being submitted. These section should be named in the \fB[macros NAME]\fP format.
 .SS "[macros NAME] sections (server\-side only)"
-These sections contain variables that will be defined as RPM macros when generating the SRPM of the package being submitted.It is usually used to define the distribution suffix that will be used in package releases, such as "mdv2008.1".
+These sections contain variables that will be defined as RPM macros when generating the SRPM of the package being submitted.It is usually used to define the distribution suffix that will be used in package releases, such as "mga1".
 .SS "[users] section (server\-side only)"
 This section maps the usernames found in svn to their real names and e\-mails. It is used when generating the changelog based on commits in svn and by \fBauthoremail\fP. Example: \fBjoe = Joe User <joeuser@host.com>\fP.
 
 This section can be used on client\-side too, but will have no effect in generated changelogs on the server\-side.
 .SS "[helper] section"
 .IP "\fBcreate\-srpm = PATH\fP"
-The path of the script that will be run through ssh on the submit host when running \fBrepsys submit\fP.
+The path of the script that will be run through ssh on the submit host when running \fBmgarepo submit\fP.
 .IP "\fBupload\-srpm = PATH\fP"
 (server\-side only) Path of the script that will be called after the generated SRPM is copied to its target location (see target sections above) and target scripts are run.
 .IP "\fBrpmbuild = COMMAND\fP"
-The command used to call rpmbuild. Note that build options (such as \-bs) are supplied by repsys.
+The command used to call rpmbuild. Note that build options (such as \-bs) are supplied by mgarepo.
 .SS "[log] section"
 .IP "\fBoldurl = URL\fP"
 The URL of a directory structure that will contain old changelogs of packages that will be appended to the changelog being generated by \fBrpmlog\fP or \fBgetsrpm \-l\fP.
 .IP "\fBmerge\-spec = yes/no\fP"
-If enabled, changelogs generated by \fBrepsys\fP will have the contents of the %changelog found in the .spec file of the package appended.
+If enabled, changelogs generated by \fBmgarepo\fP will have the contents of the %changelog found in the .spec file of the package appended.
 .IP "\fBsort = yes/no\fP"
 If enabled, the changelog will be resorted after its generation. It is useful when changelogs found in \fBoldurl\fP or in the .spec's %changelog section are newer than those generated by SVN.
 .IP "\fBrevision\-offset = REVISION\-NUMBER\fP"
@@ -194,16 +194,16 @@ Repsys can check for the presence of a file named \fBMakefile\fP in the top dire
 .SH "ENVIRONMENT VARIABLES"
 .PP
 .IP "\fBREPSYS_CONF\fP"
-Sets the configuration file to be read by \fBrepsys\fP
+Sets the configuration file to be read by \fBmgarepo\fP
 .SH "FILES"
 .nf 
-~/.repsys/config
-/etc/repsys.conf
-/usr/share/repsys/
-/usr/share/doc/repsys/
+~/.mgarepo/config
+/etc/mgarepo.conf
+/usr/share/mgarepo/
+/usr/share/doc/mgarepo/
 .fi 
 .SH "BUGS"
-See the list of bugs at http://qa.mandriva.com/buglist.cgi?quicksearch=repsys
+See the list of bugs at http://bugs.mageia.org/buglist.cgi?quicksearch=mgarepo
 .SH "SEE ALSO"
 mdvsys(1), svn(1), ssh\-agent(1)
 
@@ -213,6 +213,7 @@ http://wiki.mandriva.com/en/Development/Packaging/RepositorySystem/Quickstart
 .SH "AUTHOR"
 .nf 
 repsys was originally written by Gustavo Niemeyer <gustavo@niemeyer.net>
-for the Conectiva Linux distribution. Currently it is being mantained by
-Mandriva contributors and employees.
+for the Conectiva Linux distribution. It was then maintained by Mandriva
+contributors and employees. mgarepo is a fork of repsys maintained by
+Mageia contributors.
 .fi 
diff --git a/repsys.conf b/mgarepo.conf
index fb62e4b..4f0a9e7 100644
--- a/repsys.conf
+++ b/mgarepo.conf
@@ -1,4 +1,4 @@
-# see man 8 repsys for a description on configuration options
+# see man 8 mgarepo for a description on configuration options
 [global]
 repository = svn+ssh://svn.mageia.org/svn/packages/
 trunk-dir = cauldron/
diff --git a/setup.cfg b/setup.cfg
index 7395d36..027dcc2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,3 +1,3 @@
 [bdist_rpm]
-doc_files = repsys.conf README README.LDAP CHANGES
+doc_files = mgarepo.conf README README.LDAP CHANGES
 
diff --git a/setup.py b/setup.py
index e11789d..e4b24b1 100755
--- a/setup.py
+++ b/setup.py
@@ -4,30 +4,30 @@ import sys
 import re
 
 verpat = re.compile("VERSION *= *\"(.*)\"")
-data = open("repsys").read()
+data = open("mgarepo").read()
 m = verpat.search(data)
 if not m:
     sys.exit("error: can't find VERSION")
 VERSION = m.group(1)
 
-setup(name="repsys",
+setup(name="mgarepo",
       version = VERSION,
-      description = "Tools for Mandriva Linux repository access and management",
+      description = "Tools for Mageia repository access and management",
       author = "Gustavo Niemeyer",
       author_email = "gustavo@niemeyer.net",
       url = "http://qa.mandriva.com/twiki/bin/view/Main/RepositorySystem",
       license = "GPL",
-      long_description = """Tools for Mandriva Linux repository access and management.""",
-      packages = ["RepSys", "RepSys.cgi", "RepSys.commands",
-          "RepSys.plugins"],
-      scripts = ["repsys", "repsys-ssh"],
+      long_description = """Tools for Mageia repository access and management, based on repsys.""",
+      packages = ["MgaRepo", "MgaRepo.cgi", "MgaRepo.commands",
+          "MgaRepo.plugins"],
+      scripts = ["mgarepo", "mgarepo-ssh"],
       data_files = [
-	      ("/usr/share/repsys/",
+	      ("/usr/share/mgarepo/",
               ["default.chlog",
               "revno.chlog",
               "create-srpm"]),
-	      ("/etc/", ["repsys.conf"]),
-          ("share/man/man8/", ["repsys.8"])]
+	      ("/etc/", ["mgarepo.conf"]),
+          ("share/man/man8/", ["mgarepo.8"])]
       )
 
 # vim:ts=4:sw=4:et