From: Thomas Goirand <thomas@goirand.fr>
Date: Thu, 21 Jan 2016 04:44:38 +0000 (+0000)
Subject: Fixed debian/copyright ordering.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1740723a212f905419b522d6cf574f312ca15037;p=openstack-build%2Fheat-build.git

Fixed debian/copyright ordering.

Rewritten-From: 16bebca321ec6cc5e0325f6a4095633390c1c56f
---

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index a465bba2..d6ff938d 100644
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -4,6 +4,7 @@ heat (1:6.0.0~b2-1) experimental; urgency=medium
   * Fixed (build-)depends for this release.
   * Removed the patch for allowing routes 2.0.
   * Also package new /usr/bin/heat-wsgi-api{,-cloudwatch,-cfn}
+  * Fixed debian/copyright ordering.
 
  -- Thomas Goirand <zigo@debian.org>  Tue, 08 Dec 2015 14:16:00 +0100
 
diff --git a/trusty/debian/copyright b/trusty/debian/copyright
index 6e0954ae..cc03f35a 100644
--- a/trusty/debian/copyright
+++ b/trusty/debian/copyright
@@ -1,12 +1,8 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: heat
-Upstream-Contact:
+Upstream-Contact: OpenStack Devel <openstack-dev@lists.openstack.org>
 Source: https://github.com/openstack/heat
 
-Files: debian/*
-Copyright: 2012 Thomas Goirand <zigo@debian.org>
-License: Apache-2
-
 Files: *
 Copyright: Angus Salkeld <asalkeld@redhat.com>
 	Zane Bitter <zbitter@redhat.com>
@@ -30,6 +26,10 @@ Copyright: Angus Salkeld <asalkeld@redhat.com>
 	Jeremy Stanley <fungi@yuggoth.org>
 License: Apache-2
 
+Files: debian/*
+Copyright: (c) 2012-2016, Thomas Goirand <zigo@debian.org>
+License: Apache-2
+
 License: Apache-2
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.