Rename packages to google-fluentd-catch-all-config-structured. (#21)

Makefile

@@ -1,8 +1,9 @@
 # package google-fluentd configuration files.
 
 BASE_PACKAGE_NAME=google-fluentd
-PACKAGE_NAME=${BASE_PACKAGE_NAME}-catch-all-config
+PACKAGE_NAME=${BASE_PACKAGE_NAME}-catch-all-config-structured
 PACKAGE_VERSION=0.7
+BUILD_DESCRIPTION="Automated Build"
 
 BUILD_DIR=build
 
@@ -21,11 +22,14 @@ all: pkg tar
 pkg: deb rpm
 
 deb: populate-deb
+	(cd pkg/deb/ && \
+	 dch --controlmaint --package "${PACKAGE_NAME}" \
+	     -v "${PACKAGE_VERSION}" "${BUILD_DESCRIPTION}")
 	cp -a pkg/deb/debian ${DEB_PACKAGE_DIR}
 	(cd ${DEB_PACKAGE_DIR} && debuild --no-tgz-check -us -uc)
 
 rpm: populate-el
-	rpmbuild -v -bb --nodeps --target noarch --define "buildroot `pwd`/${RPM_PACKAGE_DIR}/files" --define "_rpmdir `pwd`/${BUILD_DIR}/el" --define "package_version ${PACKAGE_VERSION}" --define "package_build_num 1" pkg/el/google-fluentd-catch-all-config.spec
+	rpmbuild -v -bb --nodeps --target noarch --define "buildroot `pwd`/${RPM_PACKAGE_DIR}/files" --define "_rpmdir `pwd`/${BUILD_DIR}/el" --define "package_version ${PACKAGE_VERSION}" --define "package_build_num 1" "pkg/el/${PACKAGE_NAME}.spec"
 
 tar: deb-tar el-tar
 

pkg/deb/debian/control

@@ -1,11 +1,11 @@
-Source: google-fluentd-catch-all-config
+Source: google-fluentd-catch-all-config-structured
 Section: misc
 Priority: extra
 Maintainer: Stackdriver Agents <[email protected]>
 Build-Depends: debhelper (>= 7.0.0~), config-package-dev (>= 5.0)
 Standards-Version: 3.9.5
 
-Package: google-fluentd-catch-all-config
+Package: google-fluentd-catch-all-config-structured
 Architecture: all
 Depends: ${misc:Depends}, google-fluentd (>= 1.3.0)
 Description: Catch-all configuration files for google-fluentd on GCE.

pkg/deb/debian/copyright

@@ -1,5 +1,5 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: google-fluentd-catch-all-config
+Upstream-Name: google-fluentd-catch-all-config-structured
 Source: https://github.com/GoogleCloudPlatform/fluentd-catch-all-config
 
 Files: *

pkg/el/google-fluentd-catch-all-config.spec → pkg/el/google-fluentd-catch-all-config-structured.spec

@@ -1,5 +1,5 @@
 Summary: Catch-all configuration files for google-fluentd on GCE.
-Name: google-fluentd-catch-all-config
+Name: google-fluentd-catch-all-config-structured
 Version: %{package_version}
 Release: %{package_build_num}%{?dist}
 License: ASL 2.0