Ran wrap-and-sort.

Rewritten-From: 00c3b7fd830b351c31d0d1f7edffccb6e50cef3f

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 3eb1c6084344c996e6ff666aea6b83c9690fb799..826df3bc6c1afed2c8d89aca9b3d380e3b68a6b7 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,9 @@
+heat (2013.1-6) UNRELEASED; urgency=low
+
+  * Ran wrap-and-sort.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 30 May 2013 11:22:37 +0800
+
 heat (2013.1-5) unstable; urgency=low
 
   * Added Subclass_keystone_middleware_to_set_headers.patch

diff --git a/trusty/debian/control b/trusty/debian/control
index 5dd39c96be649373eb0b4f92471d41f1b0fb140b..799112f0807039c1f32a9a0b2a403a61f710ed82 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -8,46 +8,46 @@ Uploaders: Loic Dachary (OuoU) <loic@debian.org>,
            Ghe Rivero <ghe.rivero@stackops.com>,
            Mehdi Abaakouk <sileht@sileht.net>
 Build-Depends: debhelper (>= 9),
- po-debconf,
- python-all (>= 2.6.6-3~),
- openstack-pkg-tools (>= 4)
+               openstack-pkg-tools (>= 4),
+               po-debconf,
+               python-all (>= 2.6.6-3~)
 Build-Depends-Indep: pep8 (>= 1.3.3),
- python-argparse,
- python-babel,
- python-boto,
- python-cinderclient,
- python-coverage,
- python-crypto,
- python-eventlet (>= 0.9.16),
- python-extras,
- python-glanceclient,
- python-greenlet (>= 0.3.1),
- python-httplib2,
- python-iso8601,
- python-keystoneclient,
- python-kombu,
- python-lxml (>= 2.3),
- python-memcache,
- python-migrate,
- python-mox,
- python-nose,
- python-nosexcover,
- python-novaclient,
- python-oslo.config,
- python-paste,
- python-pastedeploy,
- python-paramiko,
- python-pycryptopp,
- python-qpid,
- python-quantumclient,
- python-routes,
- python-sendfile,
- python-setuptools,
- python-sphinx,
- python-sqlalchemy (>= 0.7.8),
- python-swiftclient,
- python-webob,
- python-yaml
+                     python-argparse,
+                     python-babel,
+                     python-boto,
+                     python-cinderclient,
+                     python-coverage,
+                     python-crypto,
+                     python-eventlet (>= 0.9.16),
+                     python-extras,
+                     python-glanceclient,
+                     python-greenlet (>= 0.3.1),
+                     python-httplib2,
+                     python-iso8601,
+                     python-keystoneclient,
+                     python-kombu,
+                     python-lxml (>= 2.3),
+                     python-memcache,
+                     python-migrate,
+                     python-mox,
+                     python-nose,
+                     python-nosexcover,
+                     python-novaclient,
+                     python-oslo.config,
+                     python-paramiko,
+                     python-paste,
+                     python-pastedeploy,
+                     python-pycryptopp,
+                     python-qpid,
+                     python-quantumclient,
+                     python-routes,
+                     python-sendfile,
+                     python-setuptools,
+                     python-sphinx,
+                     python-sqlalchemy (>= 0.7.8),
+                     python-swiftclient,
+                     python-webob,
+                     python-yaml
 Standards-Version: 3.9.3
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/heat.git;a=summary
 Vcs-Git: git://anonscm.debian.org/openstack/heat.git
@@ -57,37 +57,38 @@ Package: python-heat
 Section: python
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${python:Depends}, ${misc:Depends},
- python-argparse,
- python-boto,
- python-cinderclient,
- python-crypto,
- python-eventlet (>= 0.9.16),
- python-extras,
- python-glanceclient,
- python-greenlet (>= 0.3.1),
- python-httplib2,
- python-iso8601,
- python-keystoneclient,
- python-kombu,
- python-lxml (>= 2.3),
- python-memcache,
- python-migrate,
- python-mysqldb,
- python-novaclient,
- python-oslo.config,
- python-paste,
- python-pastedeploy,
- python-pycryptopp, 
- python-qpid,
- python-quantumclient,
- python-routes,  
- python-sendfile,  
- python-setuptools,
- python-sqlalchemy (>= 0.7.8),
- python-swiftclient,
- python-webob,
- python-yaml
+Depends: python-argparse,
+         python-boto,
+         python-cinderclient,
+         python-crypto,
+         python-eventlet (>= 0.9.16),
+         python-extras,
+         python-glanceclient,
+         python-greenlet (>= 0.3.1),
+         python-httplib2,
+         python-iso8601,
+         python-keystoneclient,
+         python-kombu,
+         python-lxml (>= 2.3),
+         python-memcache,
+         python-migrate,
+         python-mysqldb,
+         python-novaclient,
+         python-oslo.config,
+         python-paste,
+         python-pastedeploy,
+         python-pycryptopp,
+         python-qpid,
+         python-quantumclient,
+         python-routes,
+         python-sendfile,
+         python-setuptools,
+         python-sqlalchemy (>= 0.7.8),
+         python-swiftclient,
+         python-webob,
+         python-yaml,
+         ${misc:Depends},
+         ${python:Depends}
 Description: OpenStack orchestration service - Python files
  Heat is a service to orchestrate multiple composite cloud applications using
  templates, through both an OpenStack-native ReST API and a
@@ -98,8 +99,11 @@ Description: OpenStack orchestration service - Python files
 Package: heat-common
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: dbconfig-common, ${python:Depends}, ${misc:Depends}, python-heat (=${binary:Version}),
- adduser
+Depends: adduser,
+         dbconfig-common,
+         python-heat (=${binary:Version}),
+         ${misc:Depends},
+         ${python:Depends}
 Description: OpenStack orchestration service - common files
  Heat is a service to orchestrate multiple composite cloud applications using
  templates, through both an OpenStack-native ReST API and a
@@ -110,8 +114,11 @@ Description: OpenStack orchestration service - common files
 Package: heat-engine
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${ostack-lsb-base}, ${python:Depends}, ${misc:Depends}, heat-common (=${binary:Version}),
- adduser
+Depends: adduser,
+         heat-common (=${binary:Version}),
+         ${misc:Depends},
+         ${ostack-lsb-base},
+         ${python:Depends}
 Description: OpenStack orchestration service - engine
  Heat is a service to orchestrate multiple composite cloud applications using
  templates, through both an OpenStack-native ReST API and a
@@ -123,8 +130,11 @@ Description: OpenStack orchestration service - engine
 Package: heat-api
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${ostack-lsb-base}, ${python:Depends}, ${misc:Depends}, heat-common (=${binary:Version}),
- adduser
+Depends: adduser,
+         heat-common (=${binary:Version}),
+         ${misc:Depends},
+         ${ostack-lsb-base},
+         ${python:Depends}
 Description: OpenStack orchestration service - ReST API
  Heat is a service to orchestrate multiple composite cloud applications using
  templates, through both an OpenStack-native ReST API and a
@@ -133,10 +143,13 @@ Description: OpenStack orchestration service - ReST API
  This package contains the ReST API.
 
 Package: heat-api-cfn
-Architecture: all   
+Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${ostack-lsb-base}, ${python:Depends}, ${misc:Depends}, heat-common (=${binary:Version}),
- adduser
+Depends: adduser,
+         heat-common (=${binary:Version}),
+         ${misc:Depends},
+         ${ostack-lsb-base},
+         ${python:Depends}
 Description: OpenStack orchestration service - CFN API
  Heat is a service to orchestrate multiple composite cloud applications using
  templates, through both an OpenStack-native ReST API and a
@@ -145,10 +158,13 @@ Description: OpenStack orchestration service - CFN API
  This package contains the CloudFormation (CFN) API.
 
 Package: heat-api-cloudwatch
-Architecture: all    
+Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${ostack-lsb-base}, ${python:Depends}, ${misc:Depends}, heat-common (=${binary:Version}),
- adduser
+Depends: adduser,
+         heat-common (=${binary:Version}),
+         ${misc:Depends},
+         ${ostack-lsb-base},
+         ${python:Depends}
 Description: OpenStack orchestration service - CloudWatch API
  Heat is a service to orchestrate multiple composite cloud applications using
  templates, through both an OpenStack-native ReST API and a

diff --git a/trusty/debian/copyright b/trusty/debian/copyright
index 0f2640c901a157914946e1ad9b1d7602f8025149..6e0954ae08ebc557a15dedc7286a7074aaaa47dc 100644 (file)
--- a/trusty/debian/copyright
+++ b/trusty/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: heat
-Upstream-Contact: 
+Upstream-Contact:
 Source: https://github.com/openstack/heat
 
 Files: debian/*

diff --git a/trusty/debian/heat-api-cfn.install b/trusty/debian/heat-api-cfn.install
index 5ff81e601ee3c271468fcef4679dfbc53ae32fa6..67b8b41e6b43b62a1fc85c3a8331cf9c66fbfa2c 100644 (file)
--- a/trusty/debian/heat-api-cfn.install
+++ b/trusty/debian/heat-api-cfn.install
@@ -1,3 +1,3 @@
-etc/heat/heat-api-cfn.conf
 etc/heat/heat-api-cfn-paste.ini        /usr/share/heat-api-cfn
+etc/heat/heat-api-cfn.conf
 usr/bin/heat-api-cfn

diff --git a/trusty/debian/heat-api-cloudwatch.install b/trusty/debian/heat-api-cloudwatch.install
index 0f2abf054882825d1ade0a63b3e410fe6386aeb1..1895206910db4f65d2cc5338f8b6ef816956648b 100644 (file)
--- a/trusty/debian/heat-api-cloudwatch.install
+++ b/trusty/debian/heat-api-cloudwatch.install
@@ -1,3 +1,3 @@
-etc/heat/heat-api-cloudwatch.conf
-etc/heat/heat-api-cloudwatch-paste.ini /usr/share/heat-api-cloudwatch
 /usr/bin/heat-api-cloudwatch
+etc/heat/heat-api-cloudwatch-paste.ini /usr/share/heat-api-cloudwatch
+etc/heat/heat-api-cloudwatch.conf

diff --git a/trusty/debian/heat-api.install b/trusty/debian/heat-api.install
index 851ce7e4a752b176c91c84af585da43ddfd822e9..5f738a824656e8b1c3a65acd7e7e7687cb1f8695 100644 (file)
--- a/trusty/debian/heat-api.install
+++ b/trusty/debian/heat-api.install
@@ -1,3 +1,3 @@
-usr/bin/heat-api
-etc/heat/heat-api.conf
 etc/heat/heat-api-paste.ini    /usr/share/heat-api
+etc/heat/heat-api.conf
+usr/bin/heat-api

diff --git a/trusty/debian/heat-common.install b/trusty/debian/heat-common.install
index 4cd71cc52581a3fd1acb2f6d58c8516841d12739..37fe8106038247de44cf7db8a621a032838e5de5 100644 (file)
--- a/trusty/debian/heat-common.install
+++ b/trusty/debian/heat-common.install
@@ -1,3 +1,3 @@
-/usr/bin/heat-cfn
 /usr/bin/heat-boto
+/usr/bin/heat-cfn
 /usr/bin/heat-watch