Merge branch 'updates' into 'master'

palemoon 28.8.1 and ublock-origin

See merge request bgstack15/stackrpms!114

6 files changed, 11 insertions, 7 deletions

diff --git a/palemoon-ublock-origin/debian/changelog b/palemoon-ublock-origin/debian/changelog
index 2f33e6a..2b701a7 100644
--- a/palemoon-ublock-origin/debian/changelog
+++ b/palemoon-ublock-origin/debian/changelog
@@ -1,3 +1,9 @@
+palemoon-ublock-origin (1.16.4.14-1+devuan) obs; urgency=medium
+
+  * Update
+
+ -- B Stack <bgstack15@gmail.com>  Tue, 14 Jan 2020 17:47:55 -0500
+
 palemoon-ublock-origin (1.16.4.12-1+devuan) obs; urgency=low
 
   * Update
diff --git a/palemoon-ublock-origin/debian/debhelper-build-stamp b/palemoon-ublock-origin/debian/debhelper-build-stamp
deleted file mode 100644
index cdc3502..0000000
--- a/palemoon-ublock-origin/debian/debhelper-build-stamp
+++ /dev/null
@@ -1 +0,0 @@
-palemoon-ublock-origin
diff --git a/palemoon-ublock-origin/debian/files b/palemoon-ublock-origin/debian/files
deleted file mode 100644
index a04d3ec..0000000
--- a/palemoon-ublock-origin/debian/files
+++ /dev/null
@@ -1,2 +0,0 @@
-palemoon-ublock-origin_1.16.4.12-1+devuan_all.deb web optional
-palemoon-ublock-origin_1.16.4.12-1+devuan_amd64.buildinfo web optional
diff --git a/palemoon-ublock-origin/debian/palemoon-ublock-origin.substvars b/palemoon-ublock-origin/debian/palemoon-ublock-origin.substvars
deleted file mode 100644
index 978fc8b..0000000
--- a/palemoon-ublock-origin/debian/palemoon-ublock-origin.substvars
+++ /dev/null
@@ -1,2 +0,0 @@
-misc:Depends=
-misc:Pre-Depends=
diff --git a/palemoon-ublock-origin/debian/watch b/palemoon-ublock-origin/debian/watch
index 069939d..23b0381 100644
--- a/palemoon-ublock-origin/debian/watch
+++ b/palemoon-ublock-origin/debian/watch
@@ -1,4 +1,4 @@
-# You must remove unused comment lines for the released package.
+# This can pull in the source code, but not the real xpi file. Unfortunately you need to hand-assemble a tarball with the xpi file in it. See README.debian
 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/ \
diff --git a/palemoon-ublock-origin/palemoon-ublock-origin.spec b/palemoon-ublock-origin/palemoon-ublock-origin.spec
index 8b45344..ae7ea7a 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.12
+Version:        1.16.4.14
 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 Jan 14 2020 B Stack <bgstack15@gmail.com> - 1.16.4.14-1
+- Update
+
 * Wed Dec 18 2019 B Stack <bgstack15@gmail.com> - 1.16.4.12-1
 - Update