Added Build-Conflicts: python-unittest2

Rewritten-From: 2075f6562e33384be3a72d1fe220b8b342fa5020

explicitely write long format for ./run_tests.sh command.

Rewritten-From: 441fda82e368b768c391aa7e56de4df98e8f3a0e

Fixed dh_link in the css folder, which contained css file for rickshow.

Rewritten-From: 6ec9313bcd0c949182fe728d6e9bb5f913408f39

New (build-)depends for Juno b2.

Rewritten-From: 814ded17405174413165dcc15e2e52ba81124b1f

Now packaging Juno b2.

Rewritten-From: 9fc0e2f73947e0fc843e6a7703ed1eca419b43ca

Fixed the sed call to fix the secre_key path.

Rewritten-From: 9fc44aafd3e631339dd242bd56a826ffdecb81b8

Removed fix-python-m-coverage.patch FINALLY applied upstream !!! :)

Rewritten-From: 9a47028acfe5b5d63b3fd7b366fa46d1b3220f4a

Using debian/juno for building in debian/gbp.conf

Rewritten-From: 4f9979f6e2a8867e21d7e294c45d1f2fa33a4fd8

Fixed (build-)depends for this release.

Rewritten-From: 8f0b194e7eea48342c9e7685ffadc6aa7bc42bb0

Now packaging 2014.2~b1

Rewritten-From: 6b6b57a9bd9edb619e0c65a6013db182d7d01871

Updated de.po thanks to Chris Leick <c.leick@vollbio.de> (Closes: #751163).

Rewritten-From: bad4efa8b6fa56246fa25941d64b6c1c86efbeb8

Now needs python-six >= 1.6.0.

Rewritten-From: 926bde6f8f7cc5b04d9d20eba0546b4b5ac2418c

Removed Use_escapejs_filter_on_JavaScript_strings.patch applied upstream.

Rewritten-From: e006cf1b8af350a692df403e7271dedca5e3e344

Now packaging upstream release 2014.1.1

Rewritten-From: 07723577b53238a1f317e03a3e00bdad47899737

Fixed patch header format

Rewritten-From: f7eb03ab5018ea9f2b6688a7d2ad2f7ed261ba09

Added: Use_escapejs_filter_on_JavaScript_strings.patch

Rewritten-From: 214fc669356cb15fce5e8600bf8d534c3829c90b

Uploading Icehouse first release to unstable.

Rewritten-From: 59ad49ef901f48bb5164dd8eb8173c150d191a84

Fixed wrong version in changelog.

Rewritten-From: 090e274fc5f96e0da02d1e4a61f2894561d1e6d4

Now packaging Icehouse RC2

Rewritten-From: 32695704bf34c771205f2d2fbcf17ac280a53b43

Removed node-less as depends

Change-Id: Iaeb4564bcbf703e37ac373dff24b6c7a91ccc17a

Rewritten-From: 750c912ccde67927293fbdc500079c572f59828f

Refreshed fix-python-m-coverage.patch

Change-Id: I38c4a14aba88ecc43379f15ea69b2abc369f46e8

Rewritten-From: 6441e8cc728d3a31628d0b6d1f66e98dce6166df

Reviewed (build-)depends for this release.

Change-Id: I47f1ebbb3de196f30b672ff1178f1b3dbe329eb6

Rewritten-From: 5a9dbab0588b7c2ed4c9cb2f856dd47271489665

Now packaging 2014.1~rc1

Change-Id: I0bf9c527ec52e430eb3a5dd7aeca6a5fab6e1120

Rewritten-From: e4e777d28a9dd59ce4d075653e4a1ea63702d246

Fixed MANIFEST.in which was missing the openstack_dashboard *.py.

Change-Id: I26bcf078b58acf79b9d518a66b686107e7d58991

Rewritten-From: 86ffec38c13d95e997b12b1396c32569ecc745da

Taking over last changelog entry.

Rewritten-From: 5cc39eb9a8064c25191ea585bfdc3bd7d81c0f72

Fixed (build-)depends for Icehouse beta 3.

Change-Id: I2bb6ffdda2f7a004b945c8c6393153518f72cf1a

Rewritten-From: 3310615b19482df3aff57dcaef5858cfd9c814f9

Refreshed fix-python-m-coverage.patch

Change-Id: I8c0332d606432de6ada6be8186d7094d3c269d51

Rewritten-From: e9c9d5cfd7297d6d7adbe57b2a32907a8c0439c4

Now packaging Icehouse beta 3.

Change-Id: I958bc7f754fde9db6b25070e7a067fc1cd56942c

Rewritten-From: 3deb21c6dd4e1261aa4ac4f9d9a49de381173bf7

call debconf-updatepo to refresh the i18n template

(cherry picked from commit aeb8a4739a13fbf0f9e3240ccabcb0fc8b77be9c)

Rewritten-From: a6da37545205267c721a080f0967895f9fb023f6

fix the changelog

(cherry picked from commit c079970ea5f6993064b3fb163256302532ac0347)

Rewritten-From: 915da26855c0d8aa607615f817911a149d931618

use horizon user to run the WSGI process

(cherry picked from commit fc690ff9570abbd2409c4520a8ad4b44e43d244f)

Rewritten-From: 6427db82d3114b43f7cb7e2b93e4c0ede3449ec6

adjust the secret-key owner to www-data

(cherry picked from commit 9ee8959772c2d995447fbf6358ecacec7d9eb066)

Rewritten-From: 7a98ecc595a0b434e7a7b6d4e6f43042ecc97612

call manage.py compress with www-data

use www-data to call manage.py compress to get the correct owner on
the cache file and the secret-key

(cherry picked from commit 692e3cf3f59778387d781a670ebe9556a9c197d8)

Rewritten-From: 9c50f23084c980f3ad1d1979bb7159b28af51a55

avoid postinst failure

if the default vhost was removed, a2dissite was not able to disable
it as expected. Instead it produces a non 0 return code

(cherry picked from commit 6a146da2aafc8acea43d658beda9f1824a09bd09)

Rewritten-From: 68a365938dfab885033701481b60501722f8db98

set COMPRESS_OFFLINE=True

(cherry picked from commit 7edeaf643caad09781ae964d64b50453059f1be8)

Rewritten-From: 0d14acce1f9c0cf5edfa705e062e8854386bfc07

bump standard version

Rewritten-From: a1f47f0b471c05d9a78a687fc4e27b7c734376fa

add myself in Uploaders

(cherry picked from commit 720ca206a7ecd2f2409b57f90e22a4219aff907f)
(cherry picked from commit 07ee11cbb2c9e3716822822dec5061ecc0611b08)

Rewritten-From: fa246d0f01a20da4a7775de8e41a6be8060c953a

Compress the CSS and JS during the postinst

Closes: #739698
(cherry picked from commit 2d7b2f4276529124356da2d06b5bcdf2344e3f8e)

Rewritten-From: 49f61e8d96e11ecebd0d9a505519c28626c18765

Reviewed (build-)dependencies for Icehouse b2.

Change-Id: Iffe00862b1c39e7512890d26431d6c0b494e5e4c

Rewritten-From: 332aa21cf581bcda75264fa05e240ec0a4192020

Refresh coverage patch.

Change-Id: Ifc8bff59825cf04d0ad8d5badbbeb8738be3718a

Rewritten-From: dd71bcde27db92f5fc00061011feff11d59fd584

Removed patches.

Change-Id: I0d1b1ea6c0ae16a35178dcd5715342ffa13a2741

Rewritten-From: f76263a5d6a8051aee67f1ad6fd87fd9577d8101

Now packaging 2014.1~b2

Change-Id: I9c724e2ccac3f7680c014bce96b8818f5acafa74

Rewritten-From: ab5eb5543d0e7d2a137df972fec589155cec3806

Added coverage patches

Change-Id: I4fc0e23bd202febcb3ad7bebb88a02204758a4cf

Rewritten-From: 60fdfd1495317ce7be1bf50f783093d3404af800

Added missing build-depends: python-nose-exclude.

Change-Id: I34c41d3b0bde211983a8a5462eca21e3ba164296

Rewritten-From: d6e27dd3865a0fcfca0f99290f8dfeb5ca28b03b

  * Added/updated debconf template translations, with thanks to:
    - Spanish: Matias A. Bellone (Closes: #732537)
    - German: Martin Schauer (Closes: #734737)

Change-Id: Ia6645123825fce4f6444fd630642a2633de5fbf5
(cherry picked from commit eb8181ce139840f317ce5024aa6de5197cd6d2cd)

Rewritten-From: e43786324795a0900d0cb0c40c1830b406aabd44

we need python-iso8601 >= 0.1.8

Change-Id: Ie332b2f1a13f8ea6386ea64f48cd75645b7ff8c7

Rewritten-From: 40200a436233b839968ad6f0942529c0f7cb2f8c

Ignore changes in .mo files

Change-Id: Idd28c4a455821983cce8dfbab196d74a4491e880

Rewritten-From: bedd2d7783dd8cde0dd6311ed33592327b82dfb8

Removes CVE-2013-6858 patch applied upstream.
Refreshed patch.

Change-Id: I361a264a9c46dc00e3889948208b72d7afe8f29f

Rewritten-From: 0113a8a147117a20a6bb9231f4df6820c6d36b1a

New upstream release (Icehouse beta 1).

Change-Id: I9ae33ccd1eebe705371e6ad44fed5b12bd4f96cb

Rewritten-From: 881f9e0f43d22ec63d648d12c8bfa6e1e1a64490

Adds and updates debconf translations.

Change-Id: I00846632205bf77c3f79e1895ed805513bbd6a3d

Rewritten-From: dae8703bce214502c8a74c120507e62ba93f6e2d

CVE-2013-6858: persistent XSS vulnerability. Applies upstream patch: Fix bug by escaping strings from Nova before displaying them (Closes: #730752).

Change-Id: I70ded71b3f320be826c111e66195fe46c11e5ee1

Rewritten-From: 16a924f55c6e24e2c55ece098acef973c847ab64

Now packaging 2013.2

Change-Id: I1e6db859b54751d2414e9dca5076eb7df30e0090

Rewritten-From: edbbe44b0b1daa45db7f12fcddaf3c78f49fcb4d

added a debian/source/options file with extend-diff-ignore = ".*\.secret_key_store"

Rewritten-From: 80271534b4171f5994949f91ba88785aaff3a9ac

Now running the upstream unit tests.

Rewritten-From: 943428c3607ecfac878a1d33a12696c34798a0cd

Now packaging upstream release 2013.2~rc3

Change-Id: Icf75cae426eb1281b3565e964ade3ab1c187c05c

Rewritten-From: 26f9697b20c640717ddc38d12dfbadaf77f42d2a

Now packaging 2013.2~rc2

Change-Id: Icc2d41a03f3935453b69bbfe1ab70c26aff5007d

Rewritten-From: ce6d825f8f71ce557b1279010d0ff74d1c645b44

Now creates /var/lib/openstack-dashboard/secret-key in the postinst, and
 sets this path as default in /etc/openstack-dashbaord/local_settings.py,
 instead of the path in /usr/share (Closes: #726373).

Change-Id: I3bf3de5ba6710de7751174321b9e6702cc31ed8d

Rewritten-From: 6fb60f8afa0bfe580be1c7793df21f6184013cf3

debian/changelog for: Updated 3 debconf translations, added swedish.

Change-Id: Ia1ce6af395e070dbff184ebd8c07cc1353984357

Rewritten-From: 70d93b357bf95feb753b8742b17467e242273a74

Updated 3 debconf translations, added swedish.

Change-Id: Icdae5705367f1bf9a0c7bcad40c50b79e7bb4a6e
(cherry picked from commit 2a4b540a1ddfd7a3d25a0cd3d558d723210547bd)

Rewritten-From: 6e56abb742bebf3bbf93ce203d30e0b11344bc47

Fixed debian/changelog

Rewritten-From: 64fdd0ad9651d6dc1712a44e0ac8020d9ab20231

Reviewed (build-)depends for the rc1.

Change-Id: I47ceddbccfd1bb69dd83796b71ba4f2e9c5ea09e

Rewritten-From: fc1dc39c46a50c146849f8c4ebdbea3aa72c756b

Now packaging 2013.2~rc1

Change-Id: Ib873a06a4d38b01ccbef750c3b9e1afb048f70f8

Rewritten-From: 8d09f8d738e32c35ea5363107cd8d70fa619711f

Replaces nodejs-legacy by nodejs package.

Change-Id: If2aa3904402462fdbf1404084501a858421484a7

Rewritten-From: 47ecfd44337de17c4c77af264e524f2e7e4c7f91

Added new french debconf translation.

Change-Id: Ib4abd4ec67ec49d18e2ef88f1423ccc29c888348
(cherry picked from commit a8c5729e9a5cb123872b8e0351c7ee1feb2aba14)

Rewritten-From: 097823114d23d1c799bacafe1d8f198fc36a7d19

Added *.py in the MANIFEST.in

Change-Id: I528262c80c597ed761b473d52400c350d048efc5

Rewritten-From: 12fa87a892fc540625908c0b97b5695dbc93b14d

Fixes python-pbr and python-d2to1 minimum versions

Change-Id: I0a2da3ba842b46c736d8268927265897f4ad171a

Rewritten-From: 9c96363fcfd49f2014ff64d8864dc8a8d08de1e2

Another egg-info fix trial

Change-Id: I21876de7eb09f7ed70f6a4c615b1faea58f9f95c

Rewritten-From: cff5dd4642ce62adb49c17794f9b118d4d4d3ff9

Removes some uploaders.

Change-Id: I40cc2f2f2d00245ac08446359ad90ef532fc309a

Rewritten-From: 2ea0ed497850b191437e71c9e2996c671ad97161

Adds the egg-info folder in the python package.

Change-Id: Ib06ef689e155b267d26ab6e0e91a9a102c4d526f

Rewritten-From: c9be4286cb8ab9f6162e1677ade879b6f07b3f6d

Revert "Don't clean egg-info while cleaning."

This reverts commit b8c3174379dbb6ec4d9a144b2e7ec9cf2d597bcf.

Rewritten-From: 6fa8ff8e251dd8931cd50069536fb54cdde0247d

Refresh patches.

Change-Id: Iac35bc7bcaac7baa62b7e3ef44ad50fa9d974fb7

Rewritten-From: 76d0be098e3320ce93a968755a507c7f4cea006b

Don't clean egg-info while cleaning.

Change-Id: Icdb35c65e616327130de69c955415387e66ad64f

Rewritten-From: b8c3174379dbb6ec4d9a144b2e7ec9cf2d597bcf

Now packaging Havana b3.

Change-Id: I3736e406725c82813ea92e73a54f0a3a8473fa2f

Rewritten-From: c7fe794d1e128ce43bad96878d2dc8ac90dd910e

Added 4 debconf translations.

Change-Id: I4bbd5a9e68ad3620ab6fceccb56cf2f4d80e6b27
(cherry picked from commit 8c74a3b692548019fe27a9741fa230cc3ee86904)

Rewritten-From: b2b907b82e4f89a05f5130ff9abf94931244b803

Added ja.po japaneese translation thanks to victory <victory.deb@gmail.com> (Closes: #719723).

Change-Id: I0162e4acd7de3f883a37ec2b68920dcdcf488130
(cherry picked from commit 7c9e22febb0a57ad01f0f827595a4e186c1b1ee1)

Rewritten-From: 8391c163937074ee690368f274e6f416ce7eff51

Review (build-)depends for Havana.

Change-Id: Ibc1d3e8c831f29c2bcc62bf5c215ea0c1f692840

Rewritten-From: f8e601369bee39698bda1ae69883a05094d8b047

Removed python-selenium from build-depends and replaced python-quantumclient by python-neutronclient

Change-Id: I7d4131c27a97135d0783d9ae41d19d7e18db8175

Rewritten-From: 8028162087eb7da2a2344c1115956731504f585d

Now packaging 2013.2~b2

Change-Id: Iddce697d2b61e73a28a244d822b4d79c575fde2e

Rewritten-From: f98c65bcbf7703fe59aa1ec9a29ba8cfe249d4b9

sites-enabled and not sites-available

Change-Id: I3812a8519b142487ebeb316760277f9af4492a95
(cherry picked from commit b16996402bd6a3b714f8f637d327f35a851a37aa)

Rewritten-From: 9d348ba45e3a821e83a8bf85882b879c90a37960

Fixes prerm so that it uninstalls the correct .conf files for apache, since
old apache vhost has been rename because of apache 2.4. Also remove the old
ones as a transition, but using || true to avoid failure (Closes: #669836).

Change-Id: I586290a42eed25ec097e09ab52396fbde892064b
(cherry picked from commit aacbc8c17353119a5c7bd72dd0c662100182e24d)

Conflicts:
debian/changelog

Rewritten-From: c258b111704b4d7913d58430ef1a2d93d1b8d854

[debconf_rewrite] includes the fixes from the debian-l10n-english (Closes: #709000).

Change-Id: I499ef363de09250fc251e5c9f0d079dcec078102
(cherry picked from commit ec6c3af9059676700ce944358120b756dab29231)

Rewritten-From: 05ba2ad6393c6adfebf5fb591995faf55ee26f69

Now using .conf as extension for the apache2 site files.

Change-Id: Ibd9c1ec07221d60d78f02fce23c7ad0b6be5e90b
(cherry picked from commit 8c677a0dc69423997f92949f9fe5f7200a8d279a)

Rewritten-From: bd60c8b0df2b34a18eceea96e60dd1c6de96ed82

Removed CHANGELOG since FTP masters don't like it.

Change-Id: I8b51977e0d59298aa63654d2988bce5baaca0f0e

Rewritten-From: d406bc9d46e867eb1123d595e0f79b40fe3aa86b

Fixed (build-)dependencies for havana.

Rewritten-From: f7a383a89ab4d7f2ba0b42d1bfd651c8fbf8cfad

Removes fix-package-version-detection-when-building-doc.patch

Rewritten-From: 560a39a75e560cfb62086991f8ab5dcd6c23e246

Now packaging 2013.2~b1

Rewritten-From: 4d58d7ed31f136c57ebdd9400125ca8ea24f7d9d

Only does db_set if the defaults file is found.

Rewritten-From: bb6529d68d3debb6f0363d64b774e6d9747f7358

Added a /etc/defaults/openstack-dashboard-apache to save the values of debconf for setting-up apache vhosts.

Rewritten-From: 61eb48465bfded8724f304e603902cf2a10d0fe3

New upstream release.

Rewritten-From: 2228c82c9a6802e2c0a568748c9e0eb0f2391773

Stop doing chown -R, does more selective chown instead.

Rewritten-From: 446136ce370016c88a5eaf7d4da66fb8607d476c

Also rm -rf /var/lib/horizon on purge (Closes: #668760)

Rewritten-From: e88652f8d1dcbf8d17566340458bfdfb0cba0f3a

Ran wrap-and-sort.

Rewritten-From: 8cb2ca8ed20e323b8ffb1216c651415739b93ab6

Same synlink fix, but for js this time.

Rewritten-From: bcc8f0cf8f983132b684b136423fd2f28504ca27

Added missing symlink to /var for the css dynamic generation folder.

Rewritten-From: ae6d57f968e6937b8342be26e06dfd5d210bb38f

Edited debian/changelog

Rewritten-From: 447d2226cc6b8f770d014d9ec4f3240f3a975b4f

Removes duplicate dependency: python-compressor.

Rewritten-From: 5e0bc13659ff486f471277ebcaebce45ca1dd272

Remove build of js and css (it is done dynamically now).

Rewritten-From: 4602dbb81bcd9c0710935e6bfbff3815b0759187

Cleans better.

Rewritten-From: cd7128b8988abad9ed1f326aa29f6b28e8e4e093

Disable the call of the compressor, because it's failing.

Rewritten-From: e0cff756e62ae8b1e4448f9faa90a25a43ef826c

Make the doc correctly.

Rewritten-From: 8d3f17e31094c634cac9c48922a3f328c6b76328