d/changelog: bump version to 1.22.1-6

d/control: fix breaks/replaces

debian/changelog

@@ -1,3 +1,10 @@
+nginx (1.22.1-6) UNRELEASED; urgency=medium
+
+  * Added new package nginx-bin, and nginx-{light,core,extras} replaced by
+    dependency package.
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Thu, 05 Jan 2023 19:10:50 +0100
+
 nginx (1.22.1-5) unstable; urgency=medium
 
   [ Jan Mojžíš ]

debian/control

@@ -22,8 +22,8 @@ Rules-Requires-Root: no
 
 Package: nginx
 Architecture: all
-Depends: nginx-core (<< ${source:Version}.1~) | nginx-full (<< ${source:Version}.1~) | nginx-light (<< ${source:Version}.1~) | nginx-extras (<< ${source:Version}.1~),
-         nginx-core (>= ${source:Version}) | nginx-full (>= ${source:Version}) | nginx-light (>= ${source:Version}) | nginx-extras (>= ${source:Version}),
+Depends: nginx-bin (<< ${source:Version}.1~),
+         nginx-bin (>= ${source:Version}),
          ${misc:Depends}
 Description: small, powerful, scalable web/proxy server
  Nginx ("engine X") is a high-performance web and reverse proxy server
@@ -33,6 +33,24 @@ Description: small, powerful, scalable web/proxy server
  This is a dependency package to install either nginx-core (by default),
  nginx-full, nginx-light or nginx-extras.
 
+Package: nginx-bin
+Architecture: any
+Depends: iproute2,
+         nginx-common (<< ${source:Version}.1~),
+         nginx-common (>= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Breaks: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~),
+Replaces: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~),
+Provides: httpd, httpd-cgi, nginx
+Suggests: nginx-doc (= ${source:Version})
+Description: nginx web/proxy server (standard version)
+ Nginx ("engine X") is a high-performance web and reverse proxy server
+ created by Igor Sysoev. It can be used both as a standalone web server
+ and as a proxy to reduce the load on back-end HTTP or mail servers.
+ .
+ This package contains nginx binary.
+
 Package: nginx-doc
 Architecture: all
 Multi-Arch: foreign
@@ -62,8 +80,8 @@ Package: nginx-dev
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${S:Build-Depends},
-         nginx-core (<< ${source:Version}.1~) | nginx-light (<< ${source:Version}.1~) | nginx-extras (<< ${source:Version}.1~),
-         nginx-core (>= ${source:Version}) | nginx-light (>= ${source:Version}) | nginx-extras (>= ${source:Version})
+         nginx-bin (<< ${source:Version}.1~),
+         nginx-bin (>= ${source:Version}),
 Provides: dh-sequence-nginx
 Description: nginx web/proxy server - development headers
  Nginx ("engine X") is a high-performance web and reverse proxy server
@@ -75,29 +93,35 @@ Description: nginx web/proxy server - development headers
  additions to the Debian nginx web/proxy server packages.
 
 Package: nginx-core
-Architecture: any
-Depends: libnginx-mod-http-geoip (= ${binary:Version}),
-         libnginx-mod-http-image-filter (= ${binary:Version}),
-         libnginx-mod-http-xslt-filter (= ${binary:Version}),
-         libnginx-mod-mail (= ${binary:Version}),
-         libnginx-mod-stream (= ${binary:Version}),
-         libnginx-mod-stream-geoip (= ${binary:Version}),
+Architecture: all
+Depends: libnginx-mod-http-geoip (>= ${binary:Version}),
+         libnginx-mod-http-geoip (<< ${binary:Version}.1~),
+         libnginx-mod-http-image-filter (>= ${binary:Version}),
+         libnginx-mod-http-image-filter (<< ${binary:Version}.1~),
+         libnginx-mod-http-xslt-filter (>= ${binary:Version}),
+         libnginx-mod-http-xslt-filter (<< ${binary:Version}.1~),
+         libnginx-mod-mail (>= ${binary:Version}),
+         libnginx-mod-mail (<< ${binary:Version}.1~),
+         libnginx-mod-stream (>= ${binary:Version}),
+         libnginx-mod-stream (<< ${binary:Version}.1~),
+         libnginx-mod-stream-geoip (>= ${binary:Version}),
+         libnginx-mod-stream-geoip (<< ${binary:Version}.1~),
          nginx-common (<< ${source:Version}.1~),
          nginx-common (>= ${source:Version}),
-         iproute2,
+         nginx-bin (>= ${source:Version}),
+         nginx-bin (<< ${source:Version}.1~),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: nginx-full (<< 1.18.0-1),
 Replaces: nginx-full (<< 1.18.0-1),
 Provides: httpd, httpd-cgi, nginx
-Conflicts: nginx-extras, nginx-light
 Suggests: nginx-doc (= ${source:Version})
 Description: nginx web/proxy server (standard version)
  Nginx ("engine X") is a high-performance web and reverse proxy server
  created by Igor Sysoev. It can be used both as a standalone web server
  and as a proxy to reduce the load on back-end HTTP or mail servers.
  .
- This package provides a version of nginx identical to that of nginx-full,
+ This metapackage provides a version of nginx identical to that of nginx-full,
  but without any third-party modules, and only modules in the original
  nginx code base.
  .
@@ -123,8 +147,8 @@ Depends: libnginx-mod-http-auth-pam,
          libnginx-mod-http-subs-filter,
          libnginx-mod-http-upstream-fair,
          libnginx-mod-stream-geoip2,
-         nginx-core (>= ${source:Version}),
-         nginx-core (<< ${source:Version}.1~),
+         nginx-bin (>= ${source:Version}),
+         nginx-bin (<< ${source:Version}.1~),
          ${misc:Depends},
          ${shlibs:Depends}
 Provides: httpd, httpd-cgi, nginx
@@ -155,22 +179,20 @@ Description: nginx web/proxy server (standard version with 3rd parties)
  Upstream Fair Queue.
 
 Package: nginx-light
-Architecture: any
+Architecture: all
 Depends: libnginx-mod-http-echo (>= 1:0.63-3~),
-         nginx-common (<< ${source:Version}.1~),
-         nginx-common (>= ${source:Version}),
-         iproute2,
+         nginx-bin (>= ${source:Version}),
+         nginx-bin (<< ${source:Version}.1~),
          ${misc:Depends},
          ${shlibs:Depends}
 Provides: httpd, httpd-cgi, nginx
-Conflicts: nginx-extras, nginx-core
 Suggests: nginx-doc (= ${source:Version})
 Description: nginx web/proxy server (basic version)
  Nginx ("engine X") is a high-performance web and reverse proxy server
  created by Igor Sysoev. It can be used both as a standalone web server
  and as a proxy to reduce the load on back-end HTTP or mail servers.
  .
- This package provides a very light version of nginx with only the
+ This metapackage provides a very light version of nginx with only the
  minimal set of features and modules.
  .
  STANDARD HTTP MODULES: Core, Access, Auth Basic, Auto Index, Empty GIF,
@@ -189,35 +211,40 @@ Depends: libnginx-mod-http-auth-pam (>= 1:1.5.3-2~),
          libnginx-mod-http-dav-ext (>= 1:3.0.0-2~),
          libnginx-mod-http-echo (>= 1:0.63-3~),
          libnginx-mod-http-fancyindex (>= 1:0.5.2-2~),
-         libnginx-mod-http-geoip (= ${binary:Version}),
+         libnginx-mod-http-geoip (>= ${binary:Version}),
+         libnginx-mod-http-geoip (<< ${binary:Version}.1~),
          libnginx-mod-http-geoip2 (>= 1:3.4-2~),
          libnginx-mod-http-headers-more-filter (>= 1:0.34-2~),
-         libnginx-mod-http-image-filter (= ${binary:Version}),
+         libnginx-mod-http-image-filter (>= ${binary:Version}),
+         libnginx-mod-http-image-filter (<< ${binary:Version}.1~),
          libnginx-mod-http-lua (>=1:0.10.22-3~) [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc],
-         libnginx-mod-http-perl (= ${binary:Version}),
+         libnginx-mod-http-perl (>= ${binary:Version}),
+         libnginx-mod-http-perl (<< ${binary:Version}.1~),
          libnginx-mod-http-subs-filter (>= 1:0.6.4-2~),
          libnginx-mod-http-uploadprogress (>= 1:0.9.2-2~),
          libnginx-mod-http-upstream-fair (>= 1:0.0~git20120408.a18b409-2~),
-         libnginx-mod-http-xslt-filter (= ${binary:Version}),
-         libnginx-mod-mail (= ${binary:Version}),
+         libnginx-mod-http-xslt-filter (>= ${binary:Version}),
+         libnginx-mod-http-xslt-filter (<< ${binary:Version}.1~),
+         libnginx-mod-mail (>= ${binary:Version}),
+         libnginx-mod-mail (<< ${binary:Version}.1~),
          libnginx-mod-nchan (>= 1:1.3.5+dfsg-3~),
-         libnginx-mod-stream (= ${binary:Version}),
-         libnginx-mod-stream-geoip (= ${binary:Version}),
+         libnginx-mod-stream (>= ${binary:Version}),
+         libnginx-mod-stream (<< ${binary:Version}.1~),
+         libnginx-mod-stream-geoip (>= ${binary:Version}),
+         libnginx-mod-stream-geoip (<< ${binary:Version}.1~),
          libnginx-mod-stream-geoip2 (>= 1:3.4-2~),
-         nginx-common (<< ${source:Version}.1~),
-         nginx-common (>= ${source:Version}),
-         iproute2,
+         nginx-bin (>= ${source:Version}),
+         nginx-bin (<< ${source:Version}.1~),
          ${misc:Depends},
          ${shlibs:Depends}
 Provides: httpd, httpd-cgi, nginx
-Conflicts: nginx-core, nginx-light
 Suggests: nginx-doc (= ${source:Version})
 Description: nginx web/proxy server (extended version)
  Nginx ("engine X") is a high-performance web and reverse proxy server
  created by Igor Sysoev. It can be used both as a standalone web server
  and as a proxy to reduce the load on back-end HTTP or mail servers.
  .
- This package provides a version of nginx with the standard modules, plus
+ This metapackage provides a version of nginx with the standard modules, plus
  extra features and modules such as the Perl module, which allows the
  addition of Perl in configuration files.
  .

debian/libnginx-mod-http-geoip.nginx

@@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//;
 $modulepath = $module;
 $modulepath =~ s/-/_/g;
 
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n";
 print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";

debian/libnginx-mod-http-image-filter.nginx

@@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//;
 $modulepath = $module;
 $modulepath =~ s/-/_/g;
 
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n";
 print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";

debian/libnginx-mod-http-perl.install

@@ -3,5 +3,5 @@
 use Config;
 
 my $vendorarch = substr($Config{vendorarch}, 1);
-print "debian/build-extras/objs/src/http/modules/perl/blib/arch/auto/nginx/* $vendorarch/auto/nginx\n";
-print "debian/build-extras/objs/src/http/modules/perl/blib/lib/nginx.pm $vendorarch\n";
+print "debian/build-bin/objs/src/http/modules/perl/blib/arch/auto/nginx/* $vendorarch/auto/nginx\n";
+print "debian/build-bin/objs/src/http/modules/perl/blib/lib/nginx.pm $vendorarch\n";

debian/libnginx-mod-http-perl.nginx

@@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//;
 $modulepath = $module;
 $modulepath =~ s/-/_/g;
 
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n";
 print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";

debian/libnginx-mod-http-xslt-filter.nginx

@@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//;
 $modulepath = $module;
 $modulepath =~ s/-/_/g;
 
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n";
 print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";

debian/libnginx-mod-mail.nginx

@@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//;
 $modulepath = $module;
 $modulepath =~ s/-/_/g;
 
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n";
 print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";

debian/libnginx-mod-stream-geoip.nginx

@@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//;
 $modulepath = $module;
 $modulepath =~ s/-/_/g;
 
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n";
 print "mod debian/libnginx-mod.conf/mod-${module}.conf 70\n";

debian/libnginx-mod-stream.nginx

@@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//;
 $modulepath = $module;
 $modulepath =~ s/-/_/g;
 
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n";
 print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";

debian/nginx-bin.install

@@ -0,0 +1 @@
+debian/build-bin/objs/nginx usr/sbin

debian/nginx-bin.manpages

@@ -0,0 +1 @@
+debian/build-bin/objs/nginx.8

debian/nginx-core.install

@@ -1 +0,0 @@
-debian/build-core/objs/nginx usr/sbin

debian/nginx-core.manpages

@@ -1 +0,0 @@
-debian/build-core/objs/nginx.8

debian/nginx-extras.NEWS

@@ -1,6 +0,0 @@
-nginx-extras (1.10.1-2) unstable; urgency=medium
-
-  Starting with this release the HTTP Push module has been replaced by Nchan.
-  More info for the upgrade can be found at https://nchan.slact.net/upgrade.
-
- -- Christos Trochalakis <yatiohi@ideopolis.gr>  Wed, 31 Aug 2016 15:07:20 +0300

debian/nginx-extras.install

@@ -1 +0,0 @@
-debian/build-extras/objs/nginx usr/sbin

debian/nginx-extras.manpages

@@ -1 +0,0 @@
-debian/build-extras/objs/nginx.8

debian/nginx-extras.postinst

@@ -1,33 +0,0 @@
-#!/bin/sh
-set -e
-
-case "$1" in
-  abort-upgrade|abort-remove|abort-deconfigure|configure)
-    ;;
-  triggered)
-    if invoke-rc.d --quiet nginx status >/dev/null; then
-      echo "Triggering nginx reload ..."
-      invoke-rc.d nginx reload || true
-    fi
-    exit 0
-    ;;
-  *)
-    echo "postinst called with unknown argument \`$1'" >&2
-    exit 1
-    ;;
-esac
-
-if invoke-rc.d --quiet nginx status >/dev/null; then
-  invoke-rc.d nginx upgrade || invoke-rc.d nginx restart
-  exit $?
-else
-  if [ -z "$(ss -nlt 'sport = 80' | grep -v ^State)" ]; then
-    invoke-rc.d nginx start || exit $?
-    echo "Not attempting to start NGINX, port 80 is already in use."
-    exit 0
-  fi
-fi
-
-#DEBHELPER#
-
-exit 0

debian/nginx-extras.prerm

@@ -1,22 +0,0 @@
-#!/bin/sh
-set -e
-
-case "$1" in
-  remove|remove-in-favour|deconfigure|deconfigure-in-favour)
-    if [ -x /etc/init.d/nginx ]; then
-      invoke-rc.d nginx stop || exit $?
-    fi
-    ;;
-
-  upgrade|failed-upgrade)
-    ;;
-
-  *)
-    echo "prerm called with unknown argument \`$1'" >&2
-    exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0

debian/nginx-extras.triggers

@@ -1 +0,0 @@
-interest-noawait nginx-reload

debian/nginx-light.dirs

@@ -1 +0,0 @@
-usr/sbin

debian/nginx-light.install

@@ -1 +0,0 @@
-debian/build-light/objs/nginx usr/sbin

debian/nginx-light.manpages

@@ -1 +0,0 @@
-debian/build-light/objs/nginx.8

debian/nginx-light.postinst

@@ -1,33 +0,0 @@
-#!/bin/sh
-set -e
-
-case "$1" in
-  abort-upgrade|abort-remove|abort-deconfigure|configure)
-    ;;
-  triggered)
-    if invoke-rc.d --quiet nginx status >/dev/null; then
-      echo "Triggering nginx reload ..."
-      invoke-rc.d nginx reload || true
-    fi
-    exit 0
-    ;;
-  *)
-    echo "postinst called with unknown argument \`$1'" >&2
-    exit 1
-    ;;
-esac
-
-if invoke-rc.d --quiet nginx status >/dev/null; then
-  invoke-rc.d nginx upgrade || invoke-rc.d nginx restart
-  exit $?
-else
-  if [ -z "$(ss -nlt 'sport = 80' | grep -v ^State)" ]; then
-    invoke-rc.d nginx start || exit $?
-    echo "Not attempting to start NGINX, port 80 is already in use."
-    exit 0
-  fi
-fi
-
-#DEBHELPER#
-
-exit 0

debian/nginx-light.prerm

@@ -1,22 +0,0 @@
-#!/bin/sh
-set -e
-
-case "$1" in
-  remove|remove-in-favour|deconfigure|deconfigure-in-favour)
-    if [ -x /etc/init.d/nginx ]; then
-      invoke-rc.d nginx stop || exit $?
-    fi
-    ;;
-
-  upgrade|failed-upgrade)
-    ;;
-
-  *)
-    echo "prerm called with unknown argument \`$1'" >&2
-    exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0

debian/nginx-light.triggers

@@ -1 +0,0 @@
-interest-noawait nginx-reload

debian/rules

@@ -5,7 +5,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 debian_cflags:=$(shell dpkg-buildflags --get CFLAGS) -fPIC $(shell dpkg-buildflags --get CPPFLAGS)
 debian_ldflags:=$(shell dpkg-buildflags --get LDFLAGS) -fPIC
 
-FLAVOURS := core light extras
+FLAVOURS := bin
 DYN_MODS := \
 	http-geoip \
 	http-image-filter \
@@ -53,53 +53,34 @@ basic_configure_flags := \
 			--with-http_v2_module \
 			--with-http_dav_module \
 			--with-http_slice_module \
-			--with-threads
+			--with-threads \
+			--with-http_addition_module \
+			--with-http_flv_module \
+			--with-http_gunzip_module \
+			--with-http_gzip_static_module \
+			--with-http_mp4_module \
+			--with-http_random_index_module \
+			--with-http_secure_link_module \
+			--with-http_sub_module \
+			--with-mail_ssl_module \
+			--with-stream_ssl_module \
+			--with-stream_ssl_preread_module \
+			--with-stream_realip_module
 
 common_configure_flags := \
 			--with-cc-opt="$(debian_cflags)" \
 			--with-ld-opt="$(debian_ldflags)" \
 			$(basic_configure_flags)
 
-light_configure_flags := \
+bin_configure_flags := \
 			$(common_configure_flags) \
-			--with-http_gzip_static_module \
-			--without-http_browser_module \
-			--without-http_geo_module \
-			--without-http_limit_req_module \
-			--without-http_limit_conn_module \
-			--without-http_memcached_module \
-			--without-http_referer_module \
-			--without-http_split_clients_module \
-			--without-http_userid_module
-
-core_configure_flags := \
-			$(common_configure_flags) \
-			--with-http_addition_module \
-			--with-http_gunzip_module \
-			--with-http_gzip_static_module \
-			--with-http_sub_module \
-
-extras_configure_flags := \
-			$(common_configure_flags) \
-			--with-http_addition_module \
-			--with-http_flv_module \
 			--with-http_geoip_module=dynamic \
-			--with-http_gunzip_module \
-			--with-http_gzip_static_module \
 			--with-http_image_filter_module=dynamic \
-			--with-http_mp4_module \
 			--with-http_perl_module=dynamic \
-			--with-http_random_index_module \
-			--with-http_secure_link_module \
-			--with-http_sub_module \
 			--with-http_xslt_module=dynamic \
 			--with-mail=dynamic \
-			--with-mail_ssl_module \
 			--with-stream=dynamic \
-			--with-stream_geoip_module=dynamic \
-			--with-stream_ssl_module \
-			--with-stream_ssl_preread_module \
-			--with-stream_realip_module
+			--with-stream_geoip_module=dynamic
 
 %:
 	dh $@ --without autoreconf