Merge "Fix invalid changelog entries and Makefile"

Juniper · Jul 17, 2015 · 9d2e77a · 9d2e77a
2 parents 534f893 + 6706dc6
commit 9d2e77a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/debian/ceilometer-plugin-contrail/debian/changelog b/debian/ceilometer-plugin-contrail/debian/changelog
@@ -2,4 +2,4 @@ ceilometer-plugin-contrail (VERSION) SERIES; urgency=low
 
   * Initial release.
 
- -- Megh Bhatt <meghb@juniper.net>  Fri Feb 20 17:21:32 PST 2015
+ -- Megh Bhatt <meghb@juniper.net>  Fri, 20 Feb 2015 17:21:32 -0800
diff --git a/debian/contrail-heat/debian/changelog b/debian/contrail-heat/debian/changelog
@@ -2,4 +2,4 @@ contrail-heat (VERSION) SERIES; urgency=low
 
   * Initial release.
 
- -- Praneet Bachheti <praneetb@juniper.net>  Fri, 8 Oct 2014
+ -- Praneet Bachheti <praneetb@juniper.net>  Fri, 8 Oct 2014 00:00:00 -0000
diff --git a/packages.make b/packages.make
@@ -32,27 +32,30 @@ ifeq ($(SERIES),trusty)
     CONTRAIL_VROUTER_DPDK := contrail-vrouter-dpdk
 endif
 
-source-all: source-package-contrail \
-        source-package-contrail-web-core \
-        source-package-contrail-web-controller
-
-all: package-contrail \
-     package-ifmap-server \
-     package-ifmap-python-client \
-     $(CONTRAIL_VROUTER_DPDK)
+source-all: source-package-contrail-web-core \
+	source-package-contrail-web-controller \
+	source-package-contrail \
+	source-package-ifmap-server \
+	source-package-neutron-plugin-contrail \
+	source-package-ceilometer-plugin-contrail \
+	source-package-contrail-heat
+
+all: package-ifmap-server \
+	package-contrail-webui-bundle \
+	package-contrail-web-core \
+	package-contrail-web-controller \
+	package-contrail \
+	package-neutron-plugin-contrail \
+	package-ceilometer-plugin-contrail \
+	package-contrail-heat \
+	$(CONTRAIL_VROUTER_DPDK)
 
 package-ifmap-server: clean-ifmap-server debian-ifmap-server
 	$(eval PACKAGE := $(patsubst package-%,%,$@))
 	@echo "Building package $(PACKAGE)"
 	(cd build/packages/$(PACKAGE); fakeroot debian/rules get-orig-source)
 	(cd build/packages/$(PACKAGE); dpkg-buildpackage -uc -us -b -rfakeroot)
 
-package-ifmap-python-client: clean-ifmap-python-client debian-ifmap-python-client
-	$(eval PACKAGE := $(patsubst package-%,%,$@))
-	@echo "Building package $(PACKAGE)"
-	(cd build/packages/$(PACKAGE); fakeroot debian/rules get-orig-source)
-	(cd build/packages/$(PACKAGE); dpkg-buildpackage -uc -us -b -rfakeroot)
-
 package-contrail-webui-bundle: clean-contrail-webui-bundle debian-contrail-webui-bundle
 	$(eval PACKAGE := $(patsubst package-%,%,$@))
 	@echo "Building package $(PACKAGE)"