Have authz providers use an invirt.authz module.

xvm-authz-locker now includes an invirt.authz module instead of
xvm.authz.locker. All authz providers conflict with each other, and
provide invirt-authz.

svn path=/trunk/packages/xvm-authz-locker/; revision=2766

diff --git a/debian/changelog b/debian/changelog
index cd5a06b..e4ea2a9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xvm-authz-locker (0.0.2) unstable; urgency=low
+
+  * Install the authz module as invirt.authz, instead of xvm.authz.locker
+
+ -- Evan Broder <broder@mit.edu>  Mon, 21 Dec 2009 16:24:05 -0600
+

 xvm-authz-locker (0.0.1) unstable; urgency=low
 
   * Initial release.
 xvm-authz-locker (0.0.1) unstable; urgency=low
 
   * Initial release.

diff --git a/debian/control b/debian/control
index a236774..1ed767a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,8 @@ Package: xvm-authz-locker
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, invirt-base, python-afs
 Provides: ${python:Provides}, invirt-authz
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, invirt-base, python-afs
 Provides: ${python:Provides}, invirt-authz

+Conflicts: invirt-authz
+Replaces: invirt-authz

 XB-Python-Version: ${python:Versions}
 Description: Authorization module for XVM
  This package contains an authorization module for XVM. It supports
 XB-Python-Version: ${python:Versions}
 Description: Authorization module for XVM
  This package contains an authorization module for XVM. It supports

diff --git a/python/xvm/authz/locker.py b/python/invirt/authz.py
similarity index 100%
rename from python/xvm/authz/locker.py
rename to python/invirt/authz.py

diff --git a/python/xvm/__init__.py b/python/xvm/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/python/xvm/authz/__init__.py b/python/xvm/authz/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/setup.py b/setup.py
index 080e5b1..919774f 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 from os import path
 from email.utils import parseaddr
 from glob import glob
 from os import path
 from email.utils import parseaddr
 from glob import glob

-from setuptools import setup, find_packages
+from setuptools import setup

 
 try:
     from debian_bundle.changelog import Changelog
 
 try:
     from debian_bundle.changelog import Changelog

@@ -23,6 +23,6 @@ setup(
     maintainer=maintainer,
     maintainer_email=maintainer_email,
     
     maintainer=maintainer,
     maintainer_email=maintainer_email,
     

-    packages=find_packages('python'),
+    py_modules = ['invirt.authz'],

     package_dir = {'': 'python'},
 )
     package_dir = {'': 'python'},
 )