Added docs to doc system.

Updated debian packaging to dh 7 and .install files.
Renamed bin/ files to not have .py suffix.

debian/changelog

@@ -1,5 +1,9 @@
 swift (1.0.0-1) unstable; urgency=low
 
+  [ Michael Barton ]
   * Initial release
 
- -- Michael Barton <michael.barton@rackspace.com>  Wed, 07 Jul 2010 19:37:44 +0000
+  [ Monty Taylor ]
+  * Added docs to doc system.
+
+ -- Monty Taylor <mordred@inaugust.com>  Wed, 14 Jul 2010 10:41:11 -0500

debian/control

@@ -70,3 +70,14 @@ Description: The swift auth server.
  The swift auth server.
  .
  Homepage: https://launchpad.net/swift
+
+Package: swift-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: The swift documentation.
+ Sphinx documentation for Swift.
+ .
+ Homepage: https://launchpad.net/swift
+
+

debian/rules

@@ -9,6 +9,7 @@ PYTHON = "/usr/bin/python"
 
 build:
 	dh build
+	python setup.py build_sphinx
 
 clean:
 	dh clean
@@ -16,88 +17,6 @@ clean:
 
 install: build
 	dh install
-	mkdir -p $(CURDIR)/debian/swift/etc/swift
-	mkdir -p $(CURDIR)/debian/swift/usr/bin
-
-	# Copy files into binary package directories
-	install -m 755 $(CURDIR)/bin/swift-init.py \
-		$(CURDIR)/debian/swift/usr/bin/swift-init
-	install -m 755 $(CURDIR)/bin/swift-ring-builder.py \
-		$(CURDIR)/debian/swift/usr/bin/swift-ring-builder
-	install -m 755 $(CURDIR)/bin/swift-get-nodes.py \
-		$(CURDIR)/debian/swift/usr/bin/swift-get-nodes
-	install -m 755 $(CURDIR)/bin/swift-stats-populate.py \
-		$(CURDIR)/debian/swift/usr/bin/swift-stats-populate
-	install -m 755 $(CURDIR)/bin/swift-stats-report.py \
-		$(CURDIR)/debian/swift/usr/bin/swift-stats-report
-	install -m 644 $(CURDIR)/etc/stats.conf-sample \
-		$(CURDIR)/debian/swift/etc/swift
-	install -m 755 $(CURDIR)/bin/swift-account-audit.py \
-		$(CURDIR)/debian/swift/usr/bin/swift-account-audit
-	install -m 755 $(CURDIR)/bin/st.py \
-		$(CURDIR)/debian/swift/usr/bin/st
-
-	# drive-audit
-	install -m 644 $(CURDIR)/etc/drive-audit.conf-sample \
-		$(CURDIR)/debian/swift-object/etc/swift
-	install -m 755 $(CURDIR)/bin/swift-drive-audit.py \
-		$(CURDIR)/debian/swift-object/usr/bin/swift-drive-audit
-
-	# swift-object
-	install -m 644 $(CURDIR)/etc/object-server.conf-sample \
-		$(CURDIR)/debian/swift-object/etc/swift
-	install -m 755 $(CURDIR)/bin/swift-object-server.py \
-		$(CURDIR)/debian/swift-object/usr/bin/swift-object-server
-	install -m 755 $(CURDIR)/bin/swift-object-replicator.py \
-		$(CURDIR)/debian/swift-object/usr/bin/swift-object-replicator
-	install -m 644 $(CURDIR)/etc/rsyncd.conf-sample \
-                $(CURDIR)/debian/swift-object/etc/swift
-	install -m 755 $(CURDIR)/bin/swift-object-auditor.py \
-		$(CURDIR)/debian/swift-object/usr/bin/swift-object-auditor
-	install -m 755 $(CURDIR)/bin/swift-object-updater.py \
-		$(CURDIR)/debian/swift-object/usr/bin/swift-object-updater
-	install -m 755 $(CURDIR)/bin/swift-object-info.py \
-		$(CURDIR)/debian/swift-object/usr/bin/swift-object-info
-
-	# swift-proxy
-	install -m 644 $(CURDIR)/etc/proxy-server.conf-sample \
-		$(CURDIR)/debian/swift-proxy/etc/swift
-	install -m 755 $(CURDIR)/bin/swift-proxy-server.py \
-		$(CURDIR)/debian/swift-proxy/usr/bin/swift-proxy-server
-
-	# swift-container
-	install -m 644 $(CURDIR)/etc/container-server.conf-sample \
-		$(CURDIR)/debian/swift-container/etc/swift
-	install -m 755 $(CURDIR)/bin/swift-container-server.py \
-		$(CURDIR)/debian/swift-container/usr/bin/swift-container-server
-	install -m 755 $(CURDIR)/bin/swift-container-replicator.py \
-		$(CURDIR)/debian/swift-container/usr/bin/swift-container-replicator
-	install -m 755 $(CURDIR)/bin/swift-container-auditor.py \
-		$(CURDIR)/debian/swift-container/usr/bin/swift-container-auditor
-	install -m 755 $(CURDIR)/bin/swift-container-updater.py \
-		$(CURDIR)/debian/swift-container/usr/bin/swift-container-updater
-
-	# swift-account
-	install -m 644 $(CURDIR)/etc/account-server.conf-sample \
-		$(CURDIR)/debian/swift-account/etc/swift
-	install -m 755 $(CURDIR)/bin/swift-account-server.py \
-		$(CURDIR)/debian/swift-account/usr/bin/swift-account-server
-	install -m 755 $(CURDIR)/bin/swift-account-replicator.py \
-		$(CURDIR)/debian/swift-account/usr/bin/swift-account-replicator
-	install -m 755 $(CURDIR)/bin/swift-account-auditor.py \
-		$(CURDIR)/debian/swift-account/usr/bin/swift-account-auditor
-	install -m 755 $(CURDIR)/bin/swift-account-reaper.py \
-		$(CURDIR)/debian/swift-account/usr/bin/swift-account-reaper
-
-	# swift-auth
-	install -m 644 $(CURDIR)/etc/auth-server.conf-sample \
-		$(CURDIR)/debian/swift-auth/etc/swift
-	install -m 755 $(CURDIR)/bin/swift-auth-server.py \
-		$(CURDIR)/debian/swift-auth/usr/bin/swift-auth-server
-	install -m 755 $(CURDIR)/bin/swift-auth-create-account.py \
-		$(CURDIR)/debian/swift-auth/usr/bin/swift-auth-create-account
-	install -m 755 $(CURDIR)/bin/swift-auth-recreate-accounts.py \
-		$(CURDIR)/debian/swift-auth/usr/bin/swift-auth-recreate-accounts
 
 
 binary-arch: install

debian/swift-account.dirs

@@ -1,2 +0,0 @@
-usr/bin
-etc/swift

debian/swift-account.docs

@@ -0,0 +1 @@
+etc/account-server.conf-sample

debian/swift-account.install

@@ -0,0 +1,4 @@
+usr/bin/swift-account-server
+usr/bin/swift-account-replicator
+usr/bin/swift-account-auditor
+usr/bin/swift-account-reaper

debian/swift-auth.dirs

@@ -1,2 +0,0 @@
-usr/bin
-etc/swift

debian/swift-auth.docs

@@ -0,0 +1 @@
+etc/auth-server.conf-sample

debian/swift-auth.install

@@ -0,0 +1,3 @@
+usr/bin/swift-auth-server
+usr/bin/swift-auth-create-account
+usr/bin/swift-auth-recreate-accounts

debian/swift-container.dirs

@@ -1,2 +0,0 @@
-usr/bin
-etc/swift

debian/swift-container.docs

@@ -0,0 +1 @@
+etc/container-server.conf-sample

debian/swift-container.install

@@ -0,0 +1,4 @@
+usr/bin/swift-container-server
+usr/bin/swift-container-replicator
+usr/bin/swift-container-auditor
+usr/bin/swift-container-updater

debian/swift-doc.doc-base

@@ -0,0 +1,9 @@
+Document: swift-doc
+Title: Swift Documentation
+Author: OpenStack
+Abstract: Sphinx documentation for Swift
+Section: Network/File Transfer
+
+Format: HTML
+Index: /usr/share/doc/swift-doc/html/index.html
+Files: /usr/share/doc/swift-doc/html/*

debian/swift-doc.docs

@@ -0,0 +1 @@
+doc/build/html

debian/swift-object.dirs

@@ -1,2 +0,0 @@
-usr/bin
-etc/swift

debian/swift-object.docs

@@ -0,0 +1,2 @@
+etc/object-server.conf-sample
+etc/rsyncd.conf-sample

debian/swift-object.install

@@ -0,0 +1,5 @@
+usr/bin/swift-object-server
+usr/bin/swift-object-replicator
+usr/bin/swift-object-auditor
+usr/bin/swift-object-updater
+usr/bin/swift-object-info

debian/swift-proxy.dirs

@@ -1,2 +0,0 @@
-usr/bin
-etc/swift

debian/swift-proxy.docs

@@ -0,0 +1 @@
+etc/proxy-server.conf-sample

debian/swift-proxy.install

@@ -0,0 +1 @@
+usr/bin/swift-proxy-server

debian/swift.dirs

@@ -1 +0,0 @@
-etc/swift

debian/swift.docs

@@ -0,0 +1,2 @@
+etc/stats.conf-sample
+etc/drive-audit.conf-sample

debian/swift.install

@@ -0,0 +1,8 @@
+usr/bin/swift-init
+usr/bin/swift-ring-builder
+usr/bin/swift-get-nodes
+usr/bin/swift-stats-populate
+usr/bin/swift-stats-report
+usr/bin/swift-account-audit
+usr/bin/st
+usr/bin/swift-drive-audit

setup.py

@@ -40,18 +40,20 @@ setup(
         'Programming Language :: Python :: 2.6',
         'Environment :: No Input/Output (Daemon)',
     ],
-    scripts=['bin/st.py', 'bin/swift-account-auditor.py',
-             'bin/swift-account-audit.py', 'bin/swift-account-reaper.py',
-             'bin/swift-account-replicator.py', 'bin/swift-account-server.py',
-             'bin/swift-auth-create-account.py',
-             'bin/swift-auth-recreate-accounts.py', 'bin/swift-auth-server.py',
-             'bin/swift-container-auditor.py',
-             'bin/swift-container-replicator.py',
-             'bin/swift-container-server.py', 'bin/swift-container-updater.py',
-             'bin/swift-drive-audit.py', 'bin/swift-get-nodes.py',
-             'bin/swift-init.py', 'bin/swift-object-auditor.py',
-             'bin/swift-object-info.py', 'bin/swift-object-server.py',
-             'bin/swift-object-updater.py', 'bin/swift-proxy-server.py',
-             'bin/swift-ring-builder.py', 'bin/swift-stats-populate.py',
-             'bin/swift-stats-report.py']
+    scripts=['bin/st', 'bin/swift-account-auditor',
+             'bin/swift-account-audit', 'bin/swift-account-reaper',
+             'bin/swift-account-replicator', 'bin/swift-account-server',
+             'bin/swift-auth-create-account',
+             'bin/swift-auth-recreate-accounts', 'bin/swift-auth-server',
+             'bin/swift-container-auditor',
+             'bin/swift-container-replicator',
+             'bin/swift-container-server', 'bin/swift-container-updater',
+             'bin/swift-drive-audit', 'bin/swift-get-nodes',
+             'bin/swift-init', 'bin/swift-object-auditor',
+             'bin/swift-object-info',
+             'bin/swift-object-replicator',
+             'bin/swift-object-server',
+             'bin/swift-object-updater', 'bin/swift-proxy-server',
+             'bin/swift-ring-builder', 'bin/swift-stats-populate',
+             'bin/swift-stats-report']
 )