Merge branch 'ublock-bump' into 'master'

ublock origin 1.16.4.18

See merge request bgstack15/stackrpms!127

9 files changed, 36 insertions, 5 deletions

diff --git a/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec b/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec
index 0db5a35..b61f608 100644
--- a/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec
+++ b/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec
@@ -4,7 +4,7 @@
 #%%global app_id
 
 Name:           %{app_name}-ublock-origin
-Version:        1.16.4.16
+Version:        1.16.4.18
 Release:        1
 Summary:        uBlock Origin installed to the system Pale Moon extensions directory
 
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{moz_extensions}/*.xpi
 
 %changelog
+* Tue Feb 18 2020 B Stack <bgstack15@gmail.com> - 1.16.4.18-1
+- Update
+
 * Mon Jan 27 2020 B Stack <bgstack15@gmail.com> - 1.16.4.16-1
 - Update
 - Upstream changed locations
diff --git a/palemoon-ublock-origin/debian/changelog b/palemoon-ublock-origin/debian/changelog
index 0473964..083b21c 100644
--- a/palemoon-ublock-origin/debian/changelog
+++ b/palemoon-ublock-origin/debian/changelog
@@ -1,3 +1,9 @@
+palemoon-ublock-origin (1.16.4.18-1+devuan) obs; urgency=medium
+
+  * Update
+
+ -- B Stack <bgstack15@gmail.com>  Tue, 18 Feb 2020 13:44:00  -0500
+
 palemoon-ublock-origin (1.16.4.16-1+devuan) obs; urgency=medium
 
   * Update
diff --git a/palemoon-ublock-origin/debian/control b/palemoon-ublock-origin/debian/control
index ba46875..3972948 100644
--- a/palemoon-ublock-origin/debian/control
+++ b/palemoon-ublock-origin/debian/control
@@ -13,3 +13,8 @@ Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: An efficient blocker for Chromium and Firefox. Fast and lean.
+ uBlock Origin is NOT an "ad blocker": it is a
+ wide-spectrum blocker -- which happens to be able
+ to function as a mere "ad blocker". The default
+ behavior of uBlock Origin when newly installed is
+ to block ads, trackers and malware sites
diff --git a/palemoon-ublock-origin/debian/watch b/palemoon-ublock-origin/debian/watch
index 23b0381..e7e7f09 100644
--- a/palemoon-ublock-origin/debian/watch
+++ b/palemoon-ublock-origin/debian/watch
@@ -2,4 +2,4 @@
 version=4
 # uscan will make a nice symlink, so no name mangling is required.
 #opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/firefox-legacy-$1\.tar\.gz/ \
-  https://github.com/gorhill/uBlock/tags .*/firefox-legacy-v?([\d\.]+)\.tar\.gz
+  https://github.com/gorhill/uBlock-for-firefox-legacy/tags .*/firefox-legacy-v?([\d\.]+)\.tar\.gz
diff --git a/palemoon-ublock-origin/palemoon-ublock-origin.spec b/palemoon-ublock-origin/palemoon-ublock-origin.spec
index de5fa4d..09e01ae 100644
--- a/palemoon-ublock-origin/palemoon-ublock-origin.spec
+++ b/palemoon-ublock-origin/palemoon-ublock-origin.spec
@@ -4,7 +4,7 @@
 #%%global app_id
 
 Name:           %{app_name}-ublock-origin
-Version:        1.16.4.16
+Version:        1.16.4.18
 Release:        1
 Summary:        uBlock Origin installed to the system Pale Moon extensions directory
 
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{moz_extensions}/*.xpi
 
 %changelog
+* Tue Feb 18 2020 B Stack <bgstack15@gmail.com> - 1.16.4.18-1
+- Update
+
 * Mon Jan 27 2020 B Stack <bgstack15@gmail.com> - 1.16.4.16-1
 - Update
 - Upstream changed locations
diff --git a/waterfox-ublock-origin/debian/changelog b/waterfox-ublock-origin/debian/changelog
index 428e2eb..d6c8d66 100644
--- a/waterfox-ublock-origin/debian/changelog
+++ b/waterfox-ublock-origin/debian/changelog
@@ -1,3 +1,9 @@
+waterfox-ublock-origin (1.16.4.18-1+devuan) obs; urgency=medium
+
+  * Update
+
+ -- B Stack <bgstack15@gmail.com>  Tue, 18 Feb 2020 13:44:00  -0500
+
 waterfox-ublock-origin (1.16.4.16-1+devuan) obs; urgency=medium
 
   * Update
diff --git a/waterfox-ublock-origin/debian/control b/waterfox-ublock-origin/debian/control
index 13a72ca..1380e7a 100644
--- a/waterfox-ublock-origin/debian/control
+++ b/waterfox-ublock-origin/debian/control
@@ -13,3 +13,8 @@ Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: An efficient blocker for Chromium and Firefox. Fast and lean.
+ uBlock Origin is NOT an "ad blocker": it is a
+ wide-spectrum blocker -- which happens to be able
+ to function as a mere "ad blocker". The default
+ behavior of uBlock Origin when newly installed is
+ to block ads, trackers and malware sites
diff --git a/waterfox-ublock-origin/debian/watch b/waterfox-ublock-origin/debian/watch
index 23b0381..e7e7f09 100644
--- a/waterfox-ublock-origin/debian/watch
+++ b/waterfox-ublock-origin/debian/watch
@@ -2,4 +2,4 @@
 version=4
 # uscan will make a nice symlink, so no name mangling is required.
 #opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/firefox-legacy-$1\.tar\.gz/ \
-  https://github.com/gorhill/uBlock/tags .*/firefox-legacy-v?([\d\.]+)\.tar\.gz
+  https://github.com/gorhill/uBlock-for-firefox-legacy/tags .*/firefox-legacy-v?([\d\.]+)\.tar\.gz
diff --git a/waterfox-ublock-origin/waterfox-ublock-origin.spec b/waterfox-ublock-origin/waterfox-ublock-origin.spec
index 042f490..f717808 100644
--- a/waterfox-ublock-origin/waterfox-ublock-origin.spec
+++ b/waterfox-ublock-origin/waterfox-ublock-origin.spec
@@ -4,7 +4,7 @@
 %global app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 
 Name:           %{app_name}-ublock-origin
-Version:        1.16.4.16
+Version:        1.16.4.18
 Release:        1
 Summary:        uBlock Origin installed to system Waterfox extensions directory
 
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{moz_extensions}/*/*.xpi
 
 %changelog
+* Tue Feb 18 2020 B Stack <bgstack15@gmail.com> - 1.16.4.18-1
+- Update
+
 * Mon Jan 27 2020 B Stack <bgstack15@gmail.com> - 1.16.4.16-1
 - Update
 - Upstream changed locations