From e16adadd5dbeff218b0d875a6edee0d3ca8785ac Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 28 Nov 2012 13:37:17 +0000 Subject: [PATCH] * Deletes now useless dont-rely-on-network.patch and lower-pymongo.patch * Updates Adds-versioninfo-files.patch to match debian/changelog Rewritten-From: 6c65704e6f6a8f489e411143260c7075dc29a4d9 --- .../patches/Adds-versioninfo-files.patch | 4 +- .../debian/patches/dont-rely-on-network.patch | 64 ------------------- trusty/debian/patches/lower-pymongo.patch | 17 ----- trusty/debian/patches/series | 2 - 4 files changed, 2 insertions(+), 85 deletions(-) delete mode 100644 trusty/debian/patches/dont-rely-on-network.patch delete mode 100644 trusty/debian/patches/lower-pymongo.patch diff --git a/trusty/debian/patches/Adds-versioninfo-files.patch b/trusty/debian/patches/Adds-versioninfo-files.patch index 405bf36..93c7c4f 100644 --- a/trusty/debian/patches/Adds-versioninfo-files.patch +++ b/trusty/debian/patches/Adds-versioninfo-files.patch @@ -4,8 +4,8 @@ Author: Thomas Goirand --- /dev/null +++ ceilometer-2013.1~g0+48d8f574e8/versioninfo @@ -0,0 +1 @@ -+2013.1~g0+48d8f574e8 ++2013.1~g0.1+0ca8c83df9 --- /dev/null +++ ceilometer-2013.1~g0+48d8f574e8/ceilometer/versioninfo @@ -0,0 +1 @@ -+2013.1~g0+48d8f574e8 ++2013.1~g0.1+0ca8c83df9 diff --git a/trusty/debian/patches/dont-rely-on-network.patch b/trusty/debian/patches/dont-rely-on-network.patch deleted file mode 100644 index 4fee192..0000000 --- a/trusty/debian/patches/dont-rely-on-network.patch +++ /dev/null @@ -1,64 +0,0 @@ -Description: - 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+48d8f574e8-1) experimental; urgency=low - . - * Initial release (Closes: #693406). -Author: Thomas Goirand -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: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- ceilometer-2013.1~g0+48d8f574e8.orig/ceilometer/openstack/common/setup.py -+++ ceilometer-2013.1~g0+48d8f574e8/ceilometer/openstack/common/setup.py -@@ -137,7 +137,7 @@ def _get_git_next_version_suffix(branch_ - revno_prefix = "r" - else: - revno_prefix = "" -- _run_shell_command("git fetch origin +refs/meta/*:refs/remotes/meta/*") -+ #_run_shell_command("git fetch origin +refs/meta/*:refs/remotes/meta/*") - milestone_cmd = "git show meta/openstack/release:%s" % branch_name - milestonever = _run_shell_command(milestone_cmd) - if milestonever: -@@ -267,7 +267,7 @@ def get_cmdclass(): - # sdist.sdist is an old style class, can't use super() - sdist.sdist.run(self) - -- cmdclass['sdist'] = LocalSDist -+ #cmdclass['sdist'] = LocalSDist - - # If Sphinx is installed on the box running setup.py, - # enable setup.py to build the documentation, otherwise, -@@ -337,7 +337,7 @@ def get_git_branchname(): - def get_pre_version(projectname, base_version): - """Return a version which is leading up to a version that will - be released in the future.""" -- if os.path.isdir('.git'): -+ if False and os.path.isdir('.git'): - current_tag = _get_git_current_tag() - if current_tag is not None: - version = current_tag -@@ -359,7 +359,7 @@ def get_post_version(projectname): - revision if there is one, or tag plus number of additional revisions - if the current revision has no tag.""" - -- if os.path.isdir('.git'): -+ if False and os.path.isdir('.git'): - version = _get_git_post_version() - write_versioninfo(projectname, version) - return version diff --git a/trusty/debian/patches/lower-pymongo.patch b/trusty/debian/patches/lower-pymongo.patch deleted file mode 100644 index 81a2a96..0000000 --- a/trusty/debian/patches/lower-pymongo.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: lowers pip-requires for pymongo from 2.2.1 to 2.2 -Author: Julien Danjou -Forwarded: not-neede - -Index: ceilometer/tools/pip-requires -=================================================================== ---- ceilometer.orig/tools/pip-requires 2012-11-28 12:26:57.572879971 +0000 -+++ ceilometer/tools/pip-requires 2012-11-28 12:28:52.000000000 +0000 -@@ -6,7 +6,7 @@ - argparse - SQLAlchemy>=0.7.3,<=0.7.9 - sqlalchemy-migrate>=0.7.2 --pymongo>=2.2.1 -+pymongo>=2.2 - eventlet - anyjson>=0.3.1 - Flask==0.9 diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series index c8dfb48..2feb111 100644 --- a/trusty/debian/patches/series +++ b/trusty/debian/patches/series @@ -1,4 +1,2 @@ Adds-versioninfo-files.patch -dont-rely-on-network.patch -lower-pymongo.patch install-missing-files.patch -- 2.32.3