Packages: switched to common address for package maintainers.

7 files changed, 15 insertions, 7 deletions

diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile
index 8c33fc53..d28351d0 100644
--- a/pkg/deb/Makefile
+++ b/pkg/deb/Makefile
@@ -8,6 +8,8 @@ DEFAULT_RELEASE := 1
 VERSION ?= $(DEFAULT_VERSION)
 RELEASE ?= $(DEFAULT_RELEASE)
 
+PACKAGE_VENDOR = NGINX Packaging <nginx-packaging@f5.com>
+
 SRCDIR=	unit-$(VERSION)
 
 CODENAME = $(shell lsb_release -cs)
@@ -205,6 +207,9 @@ debuild/$(SRCDIR)/debian:
 	echo '9' > debuild/$(SRCDIR)/debian/compat ; \
 	mkdir -p debuild/$(SRCDIR)/debian/source ; \
 	echo '3.0 (quilt)' > debuild/$(SRCDIR)/debian/source/format ; \
+	cat debian/control.in | sed \
+		-e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \
+	> debuild/$(SRCDIR)/debian/control ; \
         cat debian/rules.in | sed \
                 -e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS)#g" \
         > debuild/$(SRCDIR)/debian/rules ; \
@@ -280,6 +285,7 @@ endif
                 -e "s#%%UNIT_RELEASE%%#$(RELEASE)#g" \
                 -e "s#%%VERSION%%#$(MODULE_VERSION_$*)#g" \
                 -e "s#%%RELEASE%%#$(MODULE_RELEASE_$*)#g" \
+                -e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \
                 -e "s#%%MODULE_BUILD_DEPENDS%%#$(MODULE_BUILD_DEPENDS_$*)#g" \
                 -e "s#%%MODULE_DEPENDS%%#$(MODULE_DEPENDS_$*)#g" \
         > $@/$(SRCDIR)/debian/control ; \
diff --git a/pkg/deb/debian.module/control-noarch.in b/pkg/deb/debian.module/control-noarch.in
index e22bb49a..d9d9e5e1 100644
--- a/pkg/deb/debian.module/control-noarch.in
+++ b/pkg/deb/debian.module/control-noarch.in
@@ -1,7 +1,7 @@
 Source: %%NAME%%
 Section: admin
 Priority: extra
-Maintainer: Andrei Belov <defan@nginx.com>
+Maintainer: %%PACKAGE_VENDOR%%
 Build-Depends: debhelper (>= 9),
                linux-libc-dev%%MODULE_BUILD_DEPENDS%%
 Standards-Version: 3.9.5
diff --git a/pkg/deb/debian.module/control.in b/pkg/deb/debian.module/control.in
index 7e28f5e9..9a6fa797 100644
--- a/pkg/deb/debian.module/control.in
+++ b/pkg/deb/debian.module/control.in
@@ -1,7 +1,7 @@
 Source: %%NAME%%
 Section: admin
 Priority: extra
-Maintainer: Andrei Belov <defan@nginx.com>
+Maintainer: %%PACKAGE_VENDOR%%
 Build-Depends: debhelper (>= 9),
                linux-libc-dev,
                libssl-dev,
diff --git a/pkg/deb/debian/control b/pkg/deb/debian/control.in
index a8e8cdc4..4d59520e 100644
--- a/pkg/deb/debian/control
+++ b/pkg/deb/debian/control.in
@@ -1,7 +1,7 @@
 Source: unit
 Section: admin
 Priority: extra
-Maintainer: Andrei Belov <defan@nginx.com>
+Maintainer: %%PACKAGE_VENDOR%%
 Build-Depends: debhelper (>= 9),
                linux-libc-dev,
                libssl-dev,
diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile
index f9c57b5b..e67846cf 100644
--- a/pkg/rpm/Makefile
+++ b/pkg/rpm/Makefile
@@ -8,6 +8,8 @@ DEFAULT_RELEASE := 1
 VERSION ?= $(DEFAULT_VERSION)
 RELEASE ?= $(DEFAULT_RELEASE)
 
+PACKAGE_VENDOR = NGINX Packaging <nginx-packaging@f5.com>
+
 ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 6 -a 0%{?amzn} -eq 0'`; echo $$?), 0)
 OSVER = centos6
 else ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 7 -a 0%{?amzn} -eq 0'`; echo $$?), 0)
@@ -205,6 +207,7 @@ rpmbuild/SPECS/unit.spec: unit.spec.in ../../docs/changes.xml | rpmbuild/SPECS
 		sed -e "s#%%VERSION%%#$(VERSION)#g" \
 		    -e "s#%%RELEASE%%#$(RELEASE)#g" \
 		    -e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS)#g" \
+		    -e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \
 		> rpmbuild/SPECS/unit.spec
 	cd ../../docs && make ../build/unit.rpm-changelog
 ifneq ($(DEFAULT_VERSION)$(DEFAULT_RELEASE), $(VERSION)$(RELEASE))
@@ -252,6 +255,7 @@ rpmbuild/SPECS/unit-%.spec: unit.module.spec.in ../../docs/changes.xml | rpmbuil
 		-e "s#%%RELEASE%%#$(MODULE_RELEASE_$*)#g" \
 		-e "s#%%UNIT_VERSION%%#$(VERSION)#g" \
 		-e "s#%%UNIT_RELEASE%%#$(RELEASE)#g" \
+		-e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \
 		-e "s#%%MODULE_SOURCES%%#$${sources}#g" \
 		-e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS)#g" \
 		-e "s#%%MODULE_CONFARGS%%#$(MODULE_CONFARGS_$*)#g" \
diff --git a/pkg/rpm/unit.module.spec.in b/pkg/rpm/unit.module.spec.in
index 101b4991..4f096c73 100644
--- a/pkg/rpm/unit.module.spec.in
+++ b/pkg/rpm/unit.module.spec.in
@@ -32,9 +32,8 @@ Summary: %%SUMMARY%%
 Version: %%VERSION%%
 Release: %%RELEASE%%%{?dist}.ngx
 License: ASL 2.0
-Vendor: Nginx Software, Inc.
+Vendor: %%PACKAGE_VENDOR%%
 URL: https://unit.nginx.org/
-Packager: Nginx Software, Inc. <https://www.nginx.com>
 Group: System Environment/Daemons
 
 Source0: unit-%{version}.tar.gz
diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in
index 07ca9e6f..b35b8998 100644
--- a/pkg/rpm/unit.spec.in
+++ b/pkg/rpm/unit.spec.in
@@ -33,9 +33,8 @@ Summary: NGINX Unit
 Version: %%VERSION%%
 Release: %%RELEASE%%%{?dist}.ngx
 License: ASL 2.0
-Vendor: Nginx Software, Inc.
+Vendor: %%PACKAGE_VENDOR%%
 URL: https://unit.nginx.org/
-Packager: Nginx Software, Inc. <https://www.nginx.com>
 Group: System Environment/Daemons
 
 Source0: unit-%{version}.tar.gz