v=1.36.0,r=1

3 files changed, 7 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 952dd91d83c7..b870f7155163 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = zoneminder
 	pkgdesc = A full-featured, open source, state-of-the-art video surveillance software system
-	pkgver = 1.35.28+g6f977da94d6096f05dee781d19a4f88b75ecdbe4
-	pkgrel = 2
+	pkgver = 1.36.0
+	pkgrel = 1
 	url = https://www.zoneminder.com/
 	install = zoneminder.install
 	arch = any
@@ -54,7 +54,7 @@ pkgbase = zoneminder
 	backup = etc/nginx/sites-available/zoneminder.conf
 	backup = etc/httpd/conf/extra/zoneminder.conf
 	backup = etc/php/conf.d/zoneminder.ini
-	source = zoneminder-git::git+https://github.com/ZoneMinder/zoneminder.git#commit=6f977da94d6096f05dee781d19a4f88b75ecdbe4
+	source = zoneminder-git::git+https://github.com/ZoneMinder/zoneminder.git#tag=1.36.0
 	source = zoneminder-nginx.conf
 	source = zoneminder-httpd.conf
 	source = zoneminder-php.ini
diff --git a/PKGBUILD b/PKGBUILD
index f60af98317a1..0c16c7ca4ce1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -40,11 +40,11 @@
 #   Bug reports and packaging suggestions are always welcome at https://aur.archlinux.org/packages/zoneminder/
 
 
-_commit=6f977da94d6096f05dee781d19a4f88b75ecdbe4
+
 
 pkgname=zoneminder
-pkgver=1.35.28+g$_commit
-pkgrel=2
+pkgver=1.36.0
+pkgrel=1
 pkgdesc='A full-featured, open source, state-of-the-art video surveillance software system'
 arch=('any')
 url='https://www.zoneminder.com/'
@@ -78,7 +78,7 @@ backup=("etc/nginx/sites-available/$pkgname.conf"
         "etc/httpd/conf/extra/$pkgname.conf"
         "etc/php/conf.d/$pkgname.ini")
 install=$pkgname.install
-source=("$pkgname-git::git+https://github.com/ZoneMinder/zoneminder.git#commit=$_commit"
+source=("$pkgname-git::git+https://github.com/ZoneMinder/zoneminder.git#tag=$pkgver"
         "zoneminder-nginx.conf"
         "zoneminder-httpd.conf"
         "zoneminder-php.ini"
diff --git a/zoneminder.install b/zoneminder.install
index a03cb08a4f2e..83e300144f2e 100644
--- a/zoneminder.install
+++ b/zoneminder.install
@@ -31,15 +31,6 @@ post_install() {
 
 post_upgrade() {
     echo
-    echo "********************************************************************************************"
-    echo "* IMPORTANT NOTICE: Due to ZoneMinder 1.35.xx being a development branch, it may become    *"
-    echo "* necessary at some point in the future to return your setup back to the 1.34.xx branch.   *"
-    echo "*                                                                                          *"
-    echo "* For this reason, PLEASE MAKE SURE TO BACKUP YOUR DATABASE before using the following     *"
-    echo "* commands to upgrade the database from the 1.34.xx scheme to the 1.35.xx one. Failure to  *"
-    echo "* do so will make it impossible for you to return to 1.34.xx if something goes wrong.      *"
-    echo "********************************************************************************************"
-    echo
     echo "ZoneMinder's database needs to be updated. As the root user, run the following:"
     echo
     echo "/usr/bin/zmupdate.pl --nointeractive"