Moved things to use .install files.

debian/rules

@@ -15,89 +15,9 @@ 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
-	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
+	cp $(CURDIR)/etc/* $(CURDIR)/debian/swift/etc/swift
+	dh install
 
 
 binary-arch: install

debian/swift-account.dirs

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

debian/swift-account.install

@@ -0,0 +1,5 @@
+etc/swift/account-server.conf-sample
+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.install

@@ -0,0 +1,4 @@
+etc/swift/auth-server.conf-sample
+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.install

@@ -0,0 +1,5 @@
+etc/swift/container-server.conf-sample
+usr/bin/swift-container-server
+usr/bin/swift-container-replicator
+usr/bin/swift-container-auditor
+usr/bin/swift-container-updater

debian/swift-object.dirs

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

debian/swift-object.install

@@ -0,0 +1,7 @@
+etc/swift/object-server.conf-sample
+etc/swift/rsyncd.conf-sample
+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.install

@@ -0,0 +1,2 @@
+etc/swift/proxy-server.conf-sample
+usr/bin/swift-proxy-server

debian/swift.dirs

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

debian/swift.install

@@ -0,0 +1,10 @@
+etc/swift/stats.conf-sample
+etc/swift/drive-audit.conf-sample
+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