Merged with the default branch.1.27.0-1

7 files changed, 48 insertions, 21 deletions

diff --git a/pkg/deb/debian.module/copyright.unit-jsc10 b/pkg/deb/debian.module/copyright.unit-jsc10
index dbad728b..42dbd3b9 100644
--- a/pkg/deb/debian.module/copyright.unit-jsc10
+++ b/pkg/deb/debian.module/copyright.unit-jsc10
@@ -1,10 +1,17 @@
 
    NGINX Unit.
 
-   Copyright 2017-2019 NGINX, Inc.
-   Copyright 2017-2019 Igor Sysoev
-   Copyright 2017-2019 Valentin V. Bartenev
-   Copyright 2017-2019 Max Romanov
+   Copyright 2017-2022 NGINX, Inc.
+   Copyright 2017-2022 Valentin V. Bartenev
+   Copyright 2017-2022 Max Romanov
+   Copyright 2017-2022 Andrei Zeliankou
+   Copyright 2018-2022 Konstantin Pavlov
+   Copyright 2021-2022 Zhidao Hong
+   Copyright 2021-2022 Oisín Canty
+   Copyright 2017-2021 Igor Sysoev
+   Copyright 2017-2021 Andrei Belov
+   Copyright 2019-2021 Tiago Natel de Moura
+   Copyright 2019-2020 Axel Duch
    Copyright 2018-2019 Alexander Borisov
 
    Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/deb/debian.module/copyright.unit-jsc11 b/pkg/deb/debian.module/copyright.unit-jsc11
index 413c0094..b2e4a117 100644
--- a/pkg/deb/debian.module/copyright.unit-jsc11
+++ b/pkg/deb/debian.module/copyright.unit-jsc11
@@ -1,10 +1,17 @@
 
    NGINX Unit.
 
-   Copyright 2017-2019 NGINX, Inc.
-   Copyright 2017-2019 Igor Sysoev
-   Copyright 2017-2019 Valentin V. Bartenev
-   Copyright 2017-2019 Max Romanov
+   Copyright 2017-2022 NGINX, Inc.
+   Copyright 2017-2022 Valentin V. Bartenev
+   Copyright 2017-2022 Max Romanov
+   Copyright 2017-2022 Andrei Zeliankou
+   Copyright 2018-2022 Konstantin Pavlov
+   Copyright 2021-2022 Zhidao Hong
+   Copyright 2021-2022 Oisín Canty
+   Copyright 2017-2021 Igor Sysoev
+   Copyright 2017-2021 Andrei Belov
+   Copyright 2019-2021 Tiago Natel de Moura
+   Copyright 2019-2020 Axel Duch
    Copyright 2018-2019 Alexander Borisov
 
    Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/deb/debian.module/copyright.unit-jsc8 b/pkg/deb/debian.module/copyright.unit-jsc8
index 96b62102..1dab9cce 100644
--- a/pkg/deb/debian.module/copyright.unit-jsc8
+++ b/pkg/deb/debian.module/copyright.unit-jsc8
@@ -1,10 +1,17 @@
 
    NGINX Unit.
 
-   Copyright 2017-2019 NGINX, Inc.
-   Copyright 2017-2019 Igor Sysoev
-   Copyright 2017-2019 Valentin V. Bartenev
-   Copyright 2017-2019 Max Romanov
+   Copyright 2017-2022 NGINX, Inc.
+   Copyright 2017-2022 Valentin V. Bartenev
+   Copyright 2017-2022 Max Romanov
+   Copyright 2017-2022 Andrei Zeliankou
+   Copyright 2018-2022 Konstantin Pavlov
+   Copyright 2021-2022 Zhidao Hong
+   Copyright 2021-2022 Oisín Canty
+   Copyright 2017-2021 Igor Sysoev
+   Copyright 2017-2021 Andrei Belov
+   Copyright 2019-2021 Tiago Natel de Moura
+   Copyright 2019-2020 Axel Duch
    Copyright 2018-2019 Alexander Borisov
 
    Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/deb/debian.module/rules-noarch.in b/pkg/deb/debian.module/rules-noarch.in
index a24602c4..0f05aaba 100644
--- a/pkg/deb/debian.module/rules-noarch.in
+++ b/pkg/deb/debian.module/rules-noarch.in
@@ -26,7 +26,8 @@ config.env.%:
 	cp -Pa $(CURDIR)/CHANGES $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/LICENSE $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/NOTICE $(BUILDDIR_$*)/
-	cp -Pa $(CURDIR)/README $(BUILDDIR_$*)/
+	cp -Pa $(CURDIR)/README.md $(BUILDDIR_$*)/
+	cp -Pa $(CURDIR)/CONTRIBUTING.md $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/go $(BUILDDIR_$*)/
 	touch $@
 
diff --git a/pkg/deb/debian.module/rules.in b/pkg/deb/debian.module/rules.in
index 8ee277b3..f1217553 100755
--- a/pkg/deb/debian.module/rules.in
+++ b/pkg/deb/debian.module/rules.in
@@ -26,7 +26,8 @@ config.env.%:
 	cp -Pa $(CURDIR)/CHANGES $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/LICENSE $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/NOTICE $(BUILDDIR_$*)/
-	cp -Pa $(CURDIR)/README $(BUILDDIR_$*)/
+	cp -Pa $(CURDIR)/README.md $(BUILDDIR_$*)/
+	cp -Pa $(CURDIR)/CONTRIBUTING.md $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/go $(BUILDDIR_$*)/
 	touch $@
 
diff --git a/pkg/deb/debian/copyright b/pkg/deb/debian/copyright
index 2a2c5fd0..487c92c5 100644
--- a/pkg/deb/debian/copyright
+++ b/pkg/deb/debian/copyright
@@ -1,13 +1,15 @@
 
    NGINX Unit.
 
-   Copyright 2017-2021 NGINX, Inc.
+   Copyright 2017-2022 NGINX, Inc.
+   Copyright 2017-2022 Valentin V. Bartenev
+   Copyright 2017-2022 Max Romanov
+   Copyright 2017-2022 Andrei Zeliankou
+   Copyright 2018-2022 Konstantin Pavlov
+   Copyright 2021-2022 Zhidao Hong
+   Copyright 2021-2022 Oisín Canty
    Copyright 2017-2021 Igor Sysoev
-   Copyright 2017-2021 Valentin V. Bartenev
-   Copyright 2017-2021 Max Romanov
-   Copyright 2017-2021 Andrei Zeliankou
    Copyright 2017-2021 Andrei Belov
-   Copyright 2018-2021 Konstantin Pavlov
    Copyright 2019-2021 Tiago Natel de Moura
    Copyright 2019-2020 Axel Duch
    Copyright 2018-2019 Alexander Borisov
diff --git a/pkg/deb/debian/rules.in b/pkg/deb/debian/rules.in
index fe7d5c7c..d2e34796 100644
--- a/pkg/deb/debian/rules.in
+++ b/pkg/deb/debian/rules.in
@@ -31,7 +31,8 @@ config.env.%:
 	cp -Pa $(CURDIR)/CHANGES $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/LICENSE $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/NOTICE $(BUILDDIR_$*)/
-	cp -Pa $(CURDIR)/README $(BUILDDIR_$*)/
+	cp -Pa $(CURDIR)/README.md $(BUILDDIR_$*)/
+	cp -Pa $(CURDIR)/CONTRIBUTING.md $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/go $(BUILDDIR_$*)/
 	mkdir -p $(BUILDDIR_$*)/docs/man
 	cp -Pa $(CURDIR)/docs/man/unitd.8.in $(BUILDDIR_$*)/docs/man/
@@ -109,7 +110,8 @@ install: build do.tests
 	mkdir -p $(INSTALLDIR)/usr/share/doc/unit/examples
 	install -m 644 debian/unit.example.config $(INSTALLDIR)/usr/share/doc/unit/examples/example.config
 	install -m 644 CHANGES $(INSTALLDIR)/usr/share/doc/unit/changelog
-	install -m 644 README $(INSTALLDIR)/usr/share/doc/unit/
+	install -m 644 README.md $(INSTALLDIR)/usr/share/doc/unit/
+	install -m 644 CONTRIBUTING.md $(INSTALLDIR)/usr/share/doc/unit/
 	install -m 644 NOTICE $(INSTALLDIR)/usr/share/doc/unit/
 
 binary-indep: build install