* Deletes now useless dont-rely-on-network.patch and lower-pymongo.patch
authorThomas Goirand <thomas@goirand.fr>
Wed, 28 Nov 2012 13:37:17 +0000 (13:37 +0000)
committerThomas Goirand <thomas@goirand.fr>
Wed, 28 Nov 2012 13:37:17 +0000 (13:37 +0000)
* Updates Adds-versioninfo-files.patch to match debian/changelog

Rewritten-From: 6c65704e6f6a8f489e411143260c7075dc29a4d9

xenial/debian/patches/Adds-versioninfo-files.patch
xenial/debian/patches/dont-rely-on-network.patch [deleted file]
xenial/debian/patches/lower-pymongo.patch [deleted file]
xenial/debian/patches/series

index 405bf36818900f833d81ea02b715f32eb17646de..93c7c4f644b3ec6f201b5235153db20bec07ca2a 100644 (file)
@@ -4,8 +4,8 @@ Author: Thomas Goirand <zigo@debian.org>
 --- /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/xenial/debian/patches/dont-rely-on-network.patch b/xenial/debian/patches/dont-rely-on-network.patch
deleted file mode 100644 (file)
index 4fee192..0000000
+++ /dev/null
@@ -1,64 +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+48d8f574e8-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+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/xenial/debian/patches/lower-pymongo.patch b/xenial/debian/patches/lower-pymongo.patch
deleted file mode 100644 (file)
index 81a2a96..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: lowers pip-requires for pymongo from 2.2.1 to 2.2
-Author: Julien Danjou <acid@debian.org>
-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
index c8dfb48a1798cb3169afefd33c8ce9d7928005a9..2feb111a03e33cbbbb4e46b5189a8470c4317887 100644 (file)
@@ -1,4 +1,2 @@
 Adds-versioninfo-files.patch
-dont-rely-on-network.patch
-lower-pymongo.patch
 install-missing-files.patch