Merge lp:~yolanda.robla/ceilometer/grizzly into lp:~openstack-ubuntu-testing/ceilometer/grizzly

[Yolanda Robla]

Removed not-needed patches

[James Page (james-page)]

Minor nitpick - the changelog does not actually reflect the name of the file being removed.

+ * debian/patches/exclude-tests-when-isntall.patch: removed, not needed

+ * debian/patches/exclude-tests-when-installing.patch: removed, not needed

Please merge when that is fixed.

review: Approve

[lp:~yolanda.robla/ceilometer/grizzly]

20. By Yolanda Robla on 2013-03-11

debian/patches/exclude-tests-when-installing.patch: removed, not needed

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-04 14:20:41 +0000
+++ debian/changelog	2013-03-11 15:43:21 +0000
@@ -31,8 +31,9 @@
   * d/control: refreshed dependencies
   * d/files: copying pipeline.yaml
   * d/control: fixed typo (LP: #1140309)
+  * debian/patches/exclude-tests-when-installing.patch: removed, not needed
 
- -- Yolanda Robla <[e-mail]>  Mon, 04 Mar 2013 10:46:00 +0100
+ -- Yolanda Robla <[e-mail]>  Mon, 11 Mar 2013 14:23:00 +0100
 
 ceilometer (0.1-0ubuntu1) quantal; urgency=low
 

=== removed directory 'debian/patches'
=== removed file 'debian/patches/exclude-tests-when-installing.patch'
--- debian/patches/exclude-tests-when-installing.patch	2013-03-01 18:25:18 +0000
+++ debian/patches/exclude-tests-when-installing.patch	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-From e10fd2c0961bca3e23c743d1403fd535d2328596 Mon Sep 17 00:00:00 2001
-From: Chuck Short <[e-mail]>
-Date: Fri, 1 Mar 2013 10:34:39 -0600
-Subject: [PATCH] Exclude tests when installing ceilometer
-
-Dont include the tests directory when installing
-ceilometer as they might conflict with other
-poorly installed packages on the users systems.
-
-Fixes LP: #1102110
-
-Signed-off-by: Chuck Short <[e-mail]>
----
- setup.py          | 2 +-
- tests/__init__.py | 0
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 tests/__init__.py
-
-diff --git a/setup.py b/setup.py
-index 9fe04fb..9135f40 100755
---- a/setup.py
-+++ b/setup.py
-@@ -63,7 +63,7 @@ setuptools.setup(
-         'Topic :: System :: Monitoring',
-     ],
- 
--    packages=setuptools.find_packages(exclude=['bin']),
-+    packages=setuptools.find_packages(exclude=['tests', 'bin']),
-     cmdclass=common_setup.get_cmdclass(),
-     package_data={
-         "ceilometer":
-diff --git a/tests/__init__.py b/tests/__init__.py
-deleted file mode 100644
-index e69de29..0000000
--- 
-1.8.1.2
-

=== removed file 'debian/patches/series'
--- debian/patches/series	2013-03-01 18:25:18 +0000
+++ debian/patches/series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-exclude-tests-when-installing.patch