Ran wrap-and-sort.

Rewritten-From: 8cb2ca8ed20e323b8ffb1216c651415739b93ab6

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index bbc0dd0ae820e2a0102ee86eae6a4cc15d8d08c8..3f6f5e5c13edd18887d31e560c9511a70f3b7d94 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,9 @@
+horizon (2013.1.1-3) UNRELEASED; urgency=low
+
+  * Ran wrap-and-sort.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 30 May 2013 11:23:28 +0800
+
 horizon (2013.1.1-2) unstable; urgency=low
 
   * Added missing symlink to /var for the css and js dynamic generation folder.

diff --git a/trusty/debian/control b/trusty/debian/control
index 9c9640c17f8958246e8c4270815cde90ead8f828..9d4b96e14b5ae5c6c324486227834d3a21295bf6 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -8,32 +8,32 @@ 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~),
- python-setuptools
-Build-Depends-Indep: openstack-pkg-tools,
- pep8 (>= 1.3.3),
- python-cloudfiles,
- python-compressor,
- python-coverage,
- python-django-nose,
- python-docutils,
- python-glanceclient,
- python-cinderclient,
- python-keystoneclient,
- python-mox,
- python-netaddr,
- python-nose,
- python-nosexcover,
- python-novaclient (>= 2:2.10),
- python-openstack-auth,
- python-quantumclient (>= 1:2.0),
- python-sphinx,
- python-swiftclient,
- python-tz,
- pylint,
- nodejs-legacy, 
- node-less
+               po-debconf,
+               python-all (>= 2.6.6-3~),
+               python-setuptools
+Build-Depends-Indep: node-less,
+                     nodejs-legacy,
+                     openstack-pkg-tools,
+                     pep8 (>= 1.3.3),
+                     pylint,
+                     python-cinderclient,
+                     python-cloudfiles,
+                     python-compressor,
+                     python-coverage,
+                     python-django-nose,
+                     python-docutils,
+                     python-glanceclient,
+                     python-keystoneclient,
+                     python-mox,
+                     python-netaddr,
+                     python-nose,
+                     python-nosexcover,
+                     python-novaclient (>= 2:2.10),
+                     python-openstack-auth,
+                     python-quantumclient (>= 1:2.0),
+                     python-sphinx,
+                     python-swiftclient,
+                     python-tz
 Standards-Version: 3.9.3
 Homepage: http://horizon.openstack.org
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/horizon.git;a=summary
@@ -43,22 +43,23 @@ Package: python-django-horizon
 Section: python
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${misc:Depends}, ${python:Depends},
- python-cinderclient,
- python-cloudfiles,
- python-compressor,
- python-django,
- python-django-nose,
- python-glanceclient,
- python-keystoneclient,
- python-lockfile,
- python-memcache,
- python-netaddr,
- python-novaclient (>= 2:2.10),
- python-openstack-auth,
- python-quantumclient (>= 1:2.0),
- python-swiftclient,
- python-tz,
+Depends: python-cinderclient,
+         python-cloudfiles,
+         python-compressor,
+         python-django,
+         python-django-nose,
+         python-glanceclient,
+         python-keystoneclient,
+         python-lockfile,
+         python-memcache,
+         python-netaddr,
+         python-novaclient (>= 2:2.10),
+         python-openstack-auth,
+         python-quantumclient (>= 1:2.0),
+         python-swiftclient,
+         python-tz,
+         ${misc:Depends},
+         ${python:Depends}
 Recommends: memcached
 Description: Django module providing web interaction with OpenStack
  The OpenStack Dashboard is a Web application allowing to control an OpenStack
@@ -72,15 +73,15 @@ Description: Django module providing web interaction with OpenStack
 Package: openstack-dashboard
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- ${python:Depends},
- python-django-horizon (= ${source:Version}),
- libjs-jquery,
- libjs-jquery-cookie,
- node-less,
- adduser,
- libapache2-mod-wsgi (>= 2.3)
+Depends: adduser,
+         libapache2-mod-wsgi (>= 2.3),
+         libjs-jquery,
+         libjs-jquery-cookie,
+         node-less,
+         python-django-horizon (= ${source:Version}),
+         ${misc:Depends},
+         ${python:Depends},
+         ${shlibs:Depends}
 Recommends: memcached, openstack-dashboard-apache
 Description: OpenStack Dashboard
  The OpenStack Dashboard is a Web application allowing to control an OpenStack
@@ -91,9 +92,7 @@ Description: OpenStack Dashboard
 Package: openstack-dashboard-apache
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: debconf,
- openstack-dashboard,
- ${misc:Depends}
+Depends: debconf, openstack-dashboard, ${misc:Depends}
 Description: OpenStack Dashboard - Apache support
  The OpenStack Dashboard is a Web application allowing to control an OpenStack
  cloud. It connects to OpenStack services including Nova, Swift, Keystone, etc.

diff --git a/trusty/debian/openstack-dashboard.install b/trusty/debian/openstack-dashboard.install
index 748e04443085ebd6bbc03f9d757307509124f1c8..b835c9d75022cbb9260e127d6b669e60691bb87b 100644 (file)
--- a/trusty/debian/openstack-dashboard.install
+++ b/trusty/debian/openstack-dashboard.install
@@ -1,2 +1,2 @@
-usr/share/openstack-dashboard
 etc/openstack-dashboard
+usr/share/openstack-dashboard

diff --git a/trusty/debian/python-django-horizon.install b/trusty/debian/python-django-horizon.install
index 7077017da032fecbcca32ac3a43f0347de4d888e..d9462f9794f4e36de84859cb354e954dbda16b4d 100644 (file)
--- a/trusty/debian/python-django-horizon.install
+++ b/trusty/debian/python-django-horizon.install
@@ -1 +1 @@
-usr/lib/python*/dist-packages/horizon
\ No newline at end of file
+usr/lib/python*/dist-packages/horizon