From: Thomas Goirand <thomas@goirand.fr>
Date: Wed, 20 Jan 2016 10:04:46 +0000 (+0000)
Subject:   * Added extend-diff-ignore = "^[^/]*[.]egg-info/" in d/source/options.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2fff8c0e22bc6f80aa177da998335e6733dae3ab;p=openstack-build%2Fneutron-build.git

  * Added extend-diff-ignore = "^[^/]*[.]egg-info/" in d/source/options.
  * Did some cleanups in debian/rules.

Rewritten-From: fb08ad23616e316ad45dde20f3f907577b17a60f
---

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 0cf5d3d31..fe44a8c91 100644
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -3,6 +3,8 @@ neutron (1:8.0.0~b2-1) experimental; urgency=medium
   * New upstream release.
   * Fixed (build-)depeneds for this release.
   * Rebased better-config-defaults.patch.
+  * Added extend-diff-ignore = "^[^/]*[.]egg-info/" in d/source/options.
+  * Did some cleanups in debian/rules.
 
  -- Thomas Goirand <zigo@debian.org>  Fri, 04 Dec 2015 09:03:42 +0100
 
diff --git a/xenial/debian/rules b/xenial/debian/rules
index 9dd08e3b1..b21531892 100755
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -26,7 +26,6 @@ override_dh_install:
 	done
 	dh_install -O--buildsystem=python_distutils --fail-missing -X/usr/etc -X/usr/bin
 	rm -rf $(CURDIR)/debian/neutron-common/usr/lib
-	rm -rf $(CURDIR)/debian/neutron-common/usr/bin/quantum*
 	rm -rf $(CURDIR)/debian/neutron-common/usr/etc
 
 	install -D -m 0640 etc/neutron/plugins/ml2/openvswitch_agent.ini		$(CURDIR)/debian/neutron-common/usr/share/neutron-common/openvswitch_agent.ini
@@ -40,10 +39,8 @@ override_dh_install:
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -f neutron/vcsversion.py
 	find . -type f -name "*.pyc" | xargs rm -fr
 	rm -rf build neutron.egg-info
-	rm -rf setuptools_git-*-py*.egg/
 	rm -f debian/neutron-common.config \
 		debian/neutron-common.postinst \
 		debian/neutron-server.config \
diff --git a/xenial/debian/source/options b/xenial/debian/source/options
new file mode 100644
index 000000000..cb61fa526
--- /dev/null
+++ b/xenial/debian/source/options
@@ -0,0 +1 @@
+extend-diff-ignore = "^[^/]*[.]egg-info/"