diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/control | 46 | ||||
| -rwxr-xr-x | debian/rules | 44 | ||||
| -rw-r--r-- | setup.cfg | 4 | ||||
| -rw-r--r-- | setup.py | 17 |
6 files changed, 66 insertions, 49 deletions
diff --git a/debian/changelog b/debian/changelog index 9fd459f5c..eb9c5cf15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -swift (1.0.0) lucid; urgency=low +swift (1.0.0-1) unstable; urgency=low * Initial release diff --git a/debian/compat b/debian/compat index 7ed6ff82d..7f8f011eb 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index 331bb404d..25b1dab0d 100644 --- a/debian/control +++ b/debian/control @@ -2,53 +2,71 @@ Source: swift Section: net Priority: optional Maintainer: Michael Barton <michael.barton@rackspace.com> -Build-Depends: debhelper (>> 3.0.0), python (>= 2.6) -Standards-Version: 3.7.2 +Uploaders: Monty Taylor <mordred@inaugust.com> +Build-Depends: debhelper (>= 7), + python (>= 2.6), + python-openssl, + python-setuptools, + python-webob (>= 0.9.7.1~hg20100111-1~racklabs1), + python-simplejson, + python-xattr, + net-tools, + python-greenlet (>= 0.3.1), + python-eventlet (>= 0.9.8), + python-nose +Standards-Version: 3.8.4 +Homepage: http://launchpad.net/swift Package: swift Architecture: all -Depends: python (>= 2.6), python-openssl, python-webob (>= 0.9.7.1~hg20100111-1~racklabs1), python-simplejson, python-xattr, net-tools, python-eventlet (>= 0.9.8pre1-7) +Depends: python (>= 2.6), net-tools, ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} +Provides: ${python:Provides} Description: Swift, a distributed virtual object store (common files) Swift, a distributed virtual object store. . - Homepage: https://swift.racklabs.com/trac + Homepage: https://launchpad.net/swift Package: swift-proxy Architecture: all -Depends: swift (=${Source-Version}) +Depends: swift (=${Source-Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} +Provides: ${python:Provides} Description: The swift proxy server. The swift proxy server. . - Homepage: https://swift.racklabs.com/trac + Homepage: https://launchpad.net/swift Package: swift-object Architecture: all -Depends: swift (=${Source-Version}) +Depends: swift (=${Source-Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} +Provides: ${python:Provides} Description: The swift object server. The swift object server. . - Homepage: https://swift.racklabs.com/trac + Homepage: https://launchpad.net/swift Package: swift-container Architecture: all -Depends: swift (=${Source-Version}) +Depends: swift (=${Source-Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} +Provides: ${python:Provides} Description: The swift container server. The swift container server. . - Homepage: https://swift.racklabs.com/trac + Homepage: https://launchpad.net/swift Package: swift-account Architecture: all -Depends: swift (=${Source-Version}) +Depends: swift (=${Source-Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} +Provides: ${python:Provides} Description: The swift account server. The swift account server. . - Homepage: https://swift.racklabs.com/trac + Homepage: https://launchpad.net/swift Package: swift-auth Architecture: all -Depends: swift (=${Source-Version}) +Depends: swift (=${Source-Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} +Provides: ${python:Provides} Description: The swift auth server. The swift auth server. . - Homepage: https://swift.racklabs.com/trac + Homepage: https://launchpad.net/swift diff --git a/debian/rules b/debian/rules index 285a4ba26..eeca56ba7 100755 --- a/debian/rules +++ b/debian/rules @@ -3,30 +3,23 @@ # Verbose mode export DH_VERBOSE=1 +DEB_PYTHON_SYSTEM=pysupport + PYTHON = "/usr/bin/python" +build: + dh build + clean: - dh_testdir - dh_testroot - $(PYTHON) setup.py clean --all - rm -rf $(CURDIR)/debian/swift - rm -f build-stamp install-stamp - dh_clean - -build: build-stamp -build-stamp: - dh_testdir - $(PYTHON) setup.py build - touch build-stamp - -install: build-stamp - dh_testdir - dh_installdirs + dh clean + find . -name "*\.pyc" -delete + +install: build + dh install + mkdir -p $(CURDIR)/debian/swift/etc/swift mkdir -p $(CURDIR)/debian/swift/usr/bin # Copy files into binary package directories - dh_install --sourcedir=debian/swift - $(PYTHON) setup.py install --root $(CURDIR)/debian/swift install -m 755 $(CURDIR)/bin/swift-init.py \ $(CURDIR)/debian/swift/usr/bin/swift-init install -m 755 $(CURDIR)/bin/swift-ring-builder.py \ @@ -106,9 +99,10 @@ install: build-stamp install -m 755 $(CURDIR)/bin/swift-auth-recreate-accounts.py \ $(CURDIR)/debian/swift-auth/usr/bin/swift-auth-recreate-accounts - touch install-stamp -binary-arch: +binary-arch: install + dh binary-arch + binary-indep: install dh_installinit --no-start dh_installinit --no-start -pswift-container --init-script=swift-container-replicator @@ -120,15 +114,7 @@ binary-indep: install dh_installinit --no-start -pswift-object --init-script=swift-object-updater dh_installinit --no-start -pswift-object --init-script=swift-object-replicator dh_installinit --no-start -pswift-container --init-script=swift-container-updater - dh_installcron - dh_installdocs - dh_installchangelogs - dh_compress - dh_fixperms - dh_gencontrol - dh_installdeb - dh_md5sums - dh_builddeb + dh binary-indep binary: binary-arch binary-indep .PHONY: build clean binary-indep binary-arch binary clean diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 000000000..839472544 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,4 @@ +[build_sphinx] +source-dir = doc/source +build-dir = doc/build +all_files = 1 @@ -14,16 +14,25 @@ # See the License for the specific language governing permissions and # limitations under the License. -from distutils.core import setup +from setuptools import setup, find_packages + +name='swift' +version='1.0.0' setup( - name='swift', - version='1.0.0-1', + name=name, + version=version, description='Swift', license='Apache License (2.0)', author='OpenStack, LLC.', url='https://launchpad.net/swift', - packages=['swift', 'swift.common'], + packages=find_packages(exclude=['tests','bin']), + test_suite = 'nose.collector', + command_options = { + 'build_sphinx': { + 'version': ('setup.py', version), + } + }, classifiers=[ 'Development Status :: 4 - Beta', 'License :: OSI Approved :: Apache Software License', |