diff options
Diffstat (limited to '')
| -rw-r--r-- | pkg/deb/Makefile | 16 | ||||
| -rw-r--r-- | pkg/deb/Makefile.go | 2 | ||||
| -rw-r--r-- | pkg/deb/debian.module/copyright.unit-jsc10 | 15 | ||||
| -rw-r--r-- | pkg/deb/debian.module/copyright.unit-jsc11 | 15 | ||||
| -rw-r--r-- | pkg/deb/debian.module/copyright.unit-jsc8 | 15 | ||||
| -rw-r--r-- | pkg/deb/debian.module/rules-noarch.in | 3 | ||||
| -rwxr-xr-x | pkg/deb/debian.module/rules.in | 3 | ||||
| -rw-r--r-- | pkg/deb/debian/copyright | 12 | ||||
| -rw-r--r-- | pkg/deb/debian/rules.in | 6 |
9 files changed, 64 insertions, 23 deletions
diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index 66a5f33a..52813e37 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -19,6 +19,20 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit) MODULES= +# Ubuntu 22.04 +ifeq ($(CODENAME),jammy) +include Makefile.php +include Makefile.python27 +include Makefile.python310 +include Makefile.go +include Makefile.perl +include Makefile.ruby +include Makefile.jsc-common +include Makefile.jsc11 +include Makefile.jsc17 +include Makefile.jsc18 +endif + # Ubuntu 21.10 ifeq ($(CODENAME),impish) include Makefile.php @@ -180,7 +194,7 @@ endif debuild/unit_$(VERSION).orig.tar.gz: | debuild/$(SRCDIR)/debian cd ../.. && tar -czf pkg/deb/debuild/$(SRCDIR).tar.gz \ --transform "s#^#$(SRCDIR)/#" \ - LICENSE NOTICE CHANGES README configure auto src test version go docs/man/unitd.8.in + LICENSE NOTICE CHANGES README.md CONTRIBUTING.md configure auto src test version go docs/man/unitd.8.in mv debuild/$(SRCDIR).tar.gz debuild/unit_$(VERSION).orig.tar.gz cd debuild && tar zxf unit_$(VERSION).orig.tar.gz diff --git a/pkg/deb/Makefile.go b/pkg/deb/Makefile.go index cdccb5ed..b9463076 100644 --- a/pkg/deb/Makefile.go +++ b/pkg/deb/Makefile.go @@ -36,7 +36,7 @@ The $(MODULE_SUMMARY_go) has been installed. To check out the sample app, run these commands: - GOPATH=/usr/share/gocode go build -o /tmp/go-app /usr/share/doc/unit-$(MODULE_SUFFIX_go)/examples/go-app/let-my-people.go + GOPATH=/usr/share/gocode GO111MODULE=auto go build -o /tmp/go-app /usr/share/doc/unit-$(MODULE_SUFFIX_go)/examples/go-app/let-my-people.go sudo service unit restart cd /usr/share/doc/unit-$(MODULE_SUFFIX_go)/examples sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config 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 |