Merge slapos.recipe.nbdserver as slapos.recipebox:nbdserver

setup.py

@@ -53,5 +53,6 @@ setup(name=name,
           'kvm = slapos.recipe.kvm:Recipe',
           'libcloud = slapos.recipe.libcloud:Recipe',
           'libcloudrequest = slapos.recipe.libcloudrequest:Recipe',
+          'nbdserver = slapos.recipe.nbdserver:Recipe',
       ]},
     )

slapos/slapos.recipe.nbdserver/CHANGES.txt

-Changelog
-=========
-
-1.1 (unreleased)
-----------------
-
-1.0.12 (2011/01/24)
--------------------
-
-- Allow more than 1 connection
-
-1.0.11 (2011/01/18)
--------------------
-
-- Updated recipe to the new BaseSlapRecipe.py
-  [Davide Tammaro]
-
-1.0.10 (2011/01/06)
--------------------
-
-- Get IPV6 address
-
-1.0.9 (2010/11/24)
-------------------
-
- - Fix kvm command line syntax
-   [Romain Courteaud]
-
-1.0.8 (2010/11/10)
-------------------
-
- - Initial version
-   [Romain Courteaud]
-

slapos/slapos.recipe.nbdserver/MANIFEST.in

-include CHANGES.txt
-recursive-include src/slapos/recipe/nbdserver *.in

slapos/slapos.recipe.nbdserver/setup.py

-from setuptools import setup, find_packages
-
-name = "slapos.recipe.nbdserver"
-version = '1.2-dev'
-
-def read(name):
-  return open(name).read()
-
-long_description=( read('README.txt')
-                   + '\n' +
-                   read('CHANGES.txt')
-                 )
-
-setup(
-    name = name,
-    version = version,
-    description = "ZC Buildout recipe for create an nbd server ",
-    long_description=long_description,
-    license='GPLv3',
-    keywords = "buildout nbd server",
-    classifiers=[
-        "Framework :: Buildout :: Recipe",
-        "Programming Language :: Python",
-    ],
-    packages = find_packages('src'),
-    package_dir = {'': 'src'},
-    include_package_data=True,
-    install_requires = [
-      'zc.recipe.egg',
-      'setuptools',
-      'slapos.lib.recipe',
-      ],
-    namespace_packages = ['slapos', 'slapos.recipe'],
-    entry_points = {'zc.buildout': ['default = %s:Recipe' % name]},
-    )

slapos/slapos.recipe.nbdserver/src/slapos/__init__.py

-# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
-try:
-    __import__('pkg_resources').declare_namespace(__name__)
-except ImportError:
-    from pkgutil import extend_path
-    __path__ = extend_path(__path__, __name__) 

slapos/slapos.recipe.nbdserver/src/slapos/recipe/__init__.py

-# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
-try:
-    __import__('pkg_resources').declare_namespace(__name__)
-except ImportError:
-    from pkgutil import extend_path
-    __path__ = extend_path(__path__, __name__)