From b08cc3454f99295f93171cf5c951fa4e7e932e94 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 17 Feb 2014 15:42:00 +0800 Subject: [PATCH] Applied changes from the Havana branch. Change-Id: Idf16b5d2546c94864dcf9e135ac1f80d6bbec798 Rewritten-From: 02e51934662ce2573f9f5b14dbce1a858e66f6ab --- trusty/debian/changelog | 66 +++++++++++++++++++++++++++++++++++++++-- trusty/debian/control | 6 ++-- 2 files changed, 66 insertions(+), 6 deletions(-) diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 0dcbd0b12..a3c4ad1a7 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,14 +1,74 @@ neutron (2014.1~b2-2) UNRELEASED; urgency=low + * New upstream release (Icehouse beta 2). * Fixed /var/lib/neutron/dhcp folder rights for Ubuntu. -- Thomas Goirand Sat, 14 Dec 2013 00:44:19 +0800 -neutron (2014.1~b1-1) experimental; urgency=low +neutron (2013.2.2-1) unstable; urgency=medium - * New upstream release (Icehouse beta 1). + [ gustavo panizzo ] + * New upstream release. + * Patch 0003-Fix-MeteringLabel-model-to-not-clear-router-s-tenant-id-on + deletion was merged upstream. Removed from debian/patches. + + [ Thomas Goirand ] + * Refreshed patches. + + -- Thomas Goirand Fri, 14 Feb 2014 07:01:38 +0000 + +neutron (2013.2.1-5) unstable; urgency=medium + + * Fix /var/lib/neutron and /var/lib/neutron/dhcp folder rights in + debian/neutron-common.postinst.in. + + -- Thomas Goirand Thu, 13 Feb 2014 19:43:22 +0800 + +neutron (2013.2.1-4) unstable; urgency=medium - -- Thomas Goirand Mon, 09 Dec 2013 23:31:02 +0800 + * Restart daemons after logrotate. + + -- Thomas Goirand Mon, 03 Feb 2014 16:40:52 +0800 + +neutron (2013.2.1-3) unstable; urgency=medium + + * Added new Debconf template translations thanks to: + - Spanish: Camaleón (Closes: #734286). + - Swedish: Martin Bagge (Closes: #734705). + * Downgrades openswan from depends to suggests, because openswan is hardly + maintained, and not available from testing, which is blocking Neutron from + migrating: this isn't worth the trouble. + + -- Thomas Goirand Sun, 12 Jan 2014 17:31:46 +0800 + +neutron (2013.2.1-2) unstable; urgency=low + + [ gustavo panizzo ] + * patch backported from icehouse-1 to simplify use of metadata on + provider networks. + + [ Thomas Goirand ] + * Added a bunch of bugfix in advance from the next point release. Thanks + * to + Sylvain Afchain for helping gathering and + testing these. + + -- Thomas Goirand Mon, 30 Dec 2013 23:12:45 +0800 + +neutron (2013.2.1-1) unstable; urgency=high + + * New upstream release. This fixes CVE-2013-6419. + * Refresh better-config-default.patch. + * Fixed rights of /var/lib/neutron/dhcp in the Ubuntu case. + * Added python-neutronclient (>= 2.3.0) as dependency of python-neutron. + * Fixes French debconf translation thanks to our Cheesemaster Christian + Perrier (Closes: #732266). + * Added Italian debconf translation, thanks to Beatrice Torracca + (Closes: #732078). + * Fixed version of (build-)depends for python-six and python-iso8601. + * Added openswan as dependency for neutron-vpn-agent. + + -- Thomas Goirand Sat, 14 Dec 2013 00:44:51 +0800 neutron (2013.2-9) unstable; urgency=medium diff --git a/trusty/debian/control b/trusty/debian/control index 797acc6e9..f0637b93e 100644 --- a/trusty/debian/control +++ b/trusty/debian/control @@ -6,7 +6,7 @@ Uploaders: Julien Danjou , Thomas Goirand , Mehdi Abaakouk Build-Depends: debhelper (>= 9), - openstack-pkg-tools (>= 4), + openstack-pkg-tools (>= 9), po-debconf, python-all (>= 2.6), python-pbr (>= 0.5.21) @@ -60,7 +60,7 @@ Build-Depends-Indep: alembic (>= 0.4.1), python-webtest (>= 2.0.9), subunit, testrepository (>= 0.0.17) -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Homepage: http://neutron.openstack.org/ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/neutron.git;a=summary Vcs-Git: git://anonscm.debian.org/openstack/neutron.git @@ -321,10 +321,10 @@ Depends: adduser, debconf, lsb-base, neutron-common (= ${source:Version}), - openswan, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} +Suggests: openswan Provides: neutron-plugin-vpn-agent Conflicts: neutron-l3-agent Breaks: quantum-server (<< 2013.2~) -- 2.45.2