Updated N+ module templates to follow new versioning scheme.
diff --git a/debian/Makefile b/debian/Makefile
index c8cdab5..e49aa3b 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -2,8 +2,7 @@
BASE_VERSION= 1.13.11
BASE_RELEASE= 1
-BASE_PREV= 1.13.10
-BASE_NEXT= 1.13.12
+PLUS_VERSION= 15
BASE_SRC= nginx-$(BASE_VERSION).tar.gz
SRCDIR= nginx-$(BASE_VERSION)
SRCPATH?= ../..
@@ -354,8 +353,7 @@
-e "s#%%CODENAME%%#$(CODENAME)#g" \
-e "s#%%MAIN_VERSION%%#$(BASE_VERSION)#g" \
-e "s#%%MAIN_RELEASE%%#$(BASE_RELEASE)#g" \
- -e "s#%%MAIN_PREV%%#$(BASE_PREV)#g" \
- -e "s#%%MAIN_NEXT%%#$(BASE_NEXT)#g" \
+ -e "s#%%PLUS_VERSION%%#$(PLUS_VERSION)#g" \
-e "s#%%VERSION_PREFIX%%#$(MODULE_VERSION_PREFIX_$(call modname, $@))#g" \
-e "s#%%MODULE_VERSION%%#$(MODULE_VERSION_$(call modname, $@))#g" \
-e "s#%%MODULE_RELEASE%%#$(MODULE_RELEASE_$(call modname, $@))#g" \
diff --git a/debian/nginx-plus-module.control.in b/debian/nginx-plus-module.control.in
index 5bbe0c1..f5d2495 100644
--- a/debian/nginx-plus-module.control.in
+++ b/debian/nginx-plus-module.control.in
@@ -16,7 +16,8 @@
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
- nginx-plus (>> %%MAIN_PREV%%), nginx-plus (<< %%MAIN_NEXT%%)%%MODULE_DEPENDS%%%%ADD_CONTROL_TAGS%%
+ nginx-plus-r%%PLUS_VERSION%%%%MODULE_DEPENDS%%%%ADD_CONTROL_TAGS%%
+Provides: nginx-plus-module-%%MODULE%%-r%%PLUS_VERSION%%
Description: %%SUMMARY%%
%%SHORT_SUMMARY%% for NGINX Plus
@@ -24,7 +25,7 @@
Architecture: any
Section: debug
Priority: extra
-Depends: nginx-plus (>> %%MAIN_PREV%%), nginx-plus (<< %%MAIN_NEXT%%),
+Depends: nginx-plus-r%%PLUS_VERSION%%,
nginx-plus-module-%%MODULE%% (= %%VERSION_PREFIX%%%%MODULE_VERSION%%-%%MODULE_RELEASE%%~%%CODENAME%%),
${misc:Depends}
Description: debug symbols for the nginx-plus-module-%%MODULE%%
diff --git a/rpm/SPECS/Makefile b/rpm/SPECS/Makefile
index 6008351..eb1fbf3 100644
--- a/rpm/SPECS/Makefile
+++ b/rpm/SPECS/Makefile
@@ -2,6 +2,7 @@
BASE_VERSION= 1.13.11
BASE_RELEASE= 1
+PLUS_VERSION= 15
BASE_SRC= nginx-$(BASE_VERSION).tar.gz
SRCPATH?= ../SOURCES
BUILD_ENV_PATH= ${HOME}/rpmbuild
@@ -373,6 +374,7 @@
-e "s#%%SHORT_SUMMARY%%#$(MODULE_SUMMARY_$(call modname, $@))#g" \
-e "s#%%MAIN_VERSION%%#$(BASE_VERSION)#g" \
-e "s#%%MAIN_RELEASE%%#$(BASE_RELEASE)#g" \
+ -e "s#%%PLUS_VERSION%%#$(PLUS_VERSION)#g" \
-e "s#%%VERSION_PREFIX%%#$(MODULE_VERSION_PREFIX_$(call modname, $@))#g" \
-e "s#%%VERSION%%#$(MODULE_VERSION_$(call modname, $@))#g" \
-e "s#%%RELEASE%%#$(MODULE_RELEASE_$(call modname, $@))#g" \
diff --git a/rpm/SPECS/nginx-plus-module.spec.in b/rpm/SPECS/nginx-plus-module.spec.in
index 2922019..58cc436 100644
--- a/rpm/SPECS/nginx-plus-module.spec.in
+++ b/rpm/SPECS/nginx-plus-module.spec.in
@@ -48,7 +48,8 @@
BuildRoot: %{_tmppath}/%{name}-%{main_version}-%{main_release}-root
BuildRequires: zlib-devel
BuildRequires: pcre-devel
-Requires: nginx-plus == %%MAIN_VERSION%%
+Requires: nginx-plus-r%%PLUS_VERSION%%
+Provides: %{name}-r%{plus_version}
%description
NGINX Plus: %%SHORT_SUMMARY%%.
