Updates debian/patches/updates-versioninfo.patch and fixes debian/patches/removes...

Rewritten-From: e7d7859693b9fc74869644add5e078546d5c7f96

diff --git a/xenial/debian/patches/removes-pecan-from-toolspip-requires b/xenial/debian/patches/removes-pecan-from-toolspip-requires
deleted file mode 100644 (file)
index d8d5fac..0000000
--- a/xenial/debian/patches/removes-pecan-from-toolspip-requires
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- ceilometer (2013.1~g0.3+ad5ff3e4e5-1) experimental; urgency=low
- .
-   * Initial release (Closes: #693406).
-Author: Thomas Goirand <zigo@debian.org>
-Bug-Debian: http://bugs.debian.org/693406
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- ceilometer-2013.1~g0.3+ad5ff3e4e5.orig/MANIFEST.in
-+++ ceilometer-2013.1~g0.3+ad5ff3e4e5/MANIFEST.in
-@@ -6,14 +6,3 @@ exclude .gitreview
- 
- global-exclude *.pyc
- 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
---- ceilometer-2013.1~g0.3+ad5ff3e4e5.orig/tools/pip-requires
-+++ ceilometer-2013.1~g0.3+ad5ff3e4e5/tools/pip-requires
-@@ -15,5 +15,4 @@ python-glanceclient
- python-novaclient>=2.6.10
- python-keystoneclient>=0.2,<0.3
- python-swiftclient
--pecan
- lxml

diff --git a/xenial/debian/patches/removes-pecan-from-toolspip-requires.patch b/xenial/debian/patches/removes-pecan-from-toolspip-requires.patch
new file mode 100644 (file)
index 0000000..2ed0333
--- /dev/null
+++ b/xenial/debian/patches/removes-pecan-from-toolspip-requires.patch
@@ -0,0 +1,12 @@
+Description: Removes pecan from tools/piprequires
+Author: Thomas Goirand <zigo@debian.org>
+Origin: upstream
+
+--- ceilometer-2013.1~g0.3+ad5ff3e4e5.orig/tools/pip-requires
++++ ceilometer-2013.1~g0.3+ad5ff3e4e5/tools/pip-requires
+@@ -15,5 +15,4 @@ python-glanceclient
+ python-novaclient>=2.6.10
+ python-keystoneclient>=0.2,<0.3
+ python-swiftclient
+-pecan
+ lxml

diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series
index 473f500993d4a10d4c902b49bd842e09daf49b4f..ed81c185264146547c57fa2fa76251bc47faf761 100644 (file)
--- a/xenial/debian/patches/series
+++ b/xenial/debian/patches/series
@@ -1,2 +1,3 @@
 install-missing-files.patch
-removes-pecan-from-toolspip-requires
+removes-pecan-from-toolspip-requires.patch
+updates-versioninfo.patch

diff --git a/xenial/debian/patches/updates-versioninfo.patch b/xenial/debian/patches/updates-versioninfo.patch
new file mode 100644 (file)
index 0000000..4a3cf18
--- /dev/null
+++ b/xenial/debian/patches/updates-versioninfo.patch
@@ -0,0 +1,8 @@
+Description: Updates versioninfo file
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: not-needed
+
+--- /dev/null
++++ ceilometer-2013.1~g0.3+ad5ff3e4e5/ceilometer/versioninfo
+@@ -0,0 +1 @@
++2013.1~g0.3+ad5ff3e4e5