From: Thomas Goirand <thomas@goirand.fr>
Date: Thu, 13 Dec 2012 15:05:14 +0000 (+0000)
Subject: Refreshed debian/patches/install-missing-files.patch
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3bbb66590c74420512d04034d520a07de9a14a74;hp=8415fcb4923da7f0a7544e5134c2ab81d6d03956;p=openstack-build%2Fceilometer-build.git

Refreshed debian/patches/install-missing-files.patch

Rewritten-From: 305db533846229734e69d3cabb0c24d2ede9f973
---

diff --git a/trusty/debian/patches/Adds-versioninfo-files.patch b/trusty/debian/patches/Adds-versioninfo-files.patch
index 93c7c4f..8028483 100644
--- a/trusty/debian/patches/Adds-versioninfo-files.patch
+++ b/trusty/debian/patches/Adds-versioninfo-files.patch
@@ -1,11 +1,15 @@
 Description: Adds version info
 Author: Thomas Goirand <zigo@debian.org>
 
---- /dev/null
-+++ ceilometer-2013.1~g0+48d8f574e8/versioninfo
+Index: ceilometer/versioninfo
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ ceilometer/versioninfo	2012-12-13 15:01:35.986122431 +0000
 @@ -0,0 +1 @@
 +2013.1~g0.1+0ca8c83df9
---- /dev/null
-+++ ceilometer-2013.1~g0+48d8f574e8/ceilometer/versioninfo
+Index: ceilometer/ceilometer/versioninfo
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ ceilometer/ceilometer/versioninfo	2012-12-13 15:01:35.986122431 +0000
 @@ -0,0 +1 @@
 +2013.1~g0.1+0ca8c83df9
diff --git a/trusty/debian/patches/install-missing-files.patch b/trusty/debian/patches/install-missing-files.patch
index 4a7fd86..451e368 100644
--- a/trusty/debian/patches/install-missing-files.patch
+++ b/trusty/debian/patches/install-missing-files.patch
@@ -1,24 +1,21 @@
-Description: Adds missing files in MANIFEST.in
+Description: Install missing files as MANIFEST.in is wrong if using git-buildpackage
 Author: Thomas Goirand <zigo@debian.org>
-Forwarded: no
+Forwarded: not-needed
 
-Index: ceilometer/MANIFEST.in
-===================================================================
---- ceilometer.orig/MANIFEST.in	2012-11-28 12:26:57.492882696 +0000
-+++ ceilometer/MANIFEST.in	2012-11-28 12:28:52.000000000 +0000
-@@ -4,3 +4,15 @@
- exclude .gitreview
+--- ceilometer-2013.1~g0.3+ad5ff3e4e5.orig/MANIFEST.in
++++ ceilometer-2013.1~g0.3+ad5ff3e4e5/MANIFEST.in
+@@ -6,3 +6,14 @@ exclude .gitreview
  
  global-exclude *.pyc
-+include ceilometer/api/static/bootstrap/css/bootstrap-responsive.css
-+include ceilometer/api/static/bootstrap/css/bootstrap.css
-+include ceilometer/api/static/bootstrap/img/glyphicons-halflings-white.png
-+include ceilometer/api/static/bootstrap/img/glyphicons-halflings.png
-+include ceilometer/api/static/bootstrap/js/bootstrap.js
-+include ceilometer/api/static/d3.v2.js
-+include ceilometer/api/static/jquery-1.8.3.js
-+include ceilometer/api/static/rickshaw.css
-+include ceilometer/api/static/rickshaw.js
-+include ceilometer/api/templates/list_event.html
+ recursive-include public *
++include ceilometer/api/v1/static/bootstrap/css/bootstrap-responsive.css
++include ceilometer/api/v1/static/bootstrap/css/bootstrap.css
++include ceilometer/api/v1/static/bootstrap/img/glyphicons-halflings-white.png
++include ceilometer/api/v1/static/bootstrap/img/glyphicons-halflings.png
++include ceilometer/api/v1/static/bootstrap/js/bootstrap.js
++include ceilometer/api/v1/static/d3.v2.js
++include ceilometer/api/v1/static/rickshaw.css
++include ceilometer/api/v1/static/rickshaw.js
++include ceilometer/api/v1/templates/list_event.html
 +include ceilometer/storage/sqlalchemy/migrate_repo/README
 +include ceilometer/storage/sqlalchemy/migrate_repo/migrate.cfg