split pm-ublock into two dirs

17 files changed, 1 insertions, 153 deletions

diff --git a/palemoon-ublock-origin/debian/.debhelper/generated/palemoon-ublock-origin/installed-by-dh_installdocs b/palemoon-ublock-origin/debian/.debhelper/generated/palemoon-ublock-origin/installed-by-dh_installdocs
deleted file mode 100644
index e69de29..0000000
--- a/palemoon-ublock-origin/debian/.debhelper/generated/palemoon-ublock-origin/installed-by-dh_installdocs
+++ /dev/null
diff --git a/palemoon-ublock-origin/debian/Makefile b/palemoon-ublock-origin/debian/Makefile
deleted file mode 100644
index 3531a3e..0000000
--- a/palemoon-ublock-origin/debian/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Makefile for palemoon-ublock-origin for devuan
-SOURCE0=uBlock0.firefox-legacy.xpi
-MOZ_EXTENSIONS=/usr/lib/palemoon/browser/extensions
-
-# this needs to be overwritten by the debian/rules file.
-DESTDIR=/tmp
-
-install:
-	unzip ${SOURCE0} install.rdf
-	mkdir -p $(DESTDIR)${MOZ_EXTENSIONS}
-	newfilename="$$( grep 'em:id' install.rdf 2>/dev/null | head -n1 | sed -r -e 's/^.*<em:id>//;' -e 's/<\/em:id>.*$$//;' ).xpi" ; \
-		test -z "$${newfilename}" && newfilename="$$( basename $${SOURCE0} )" ; \
-		install -Dp -m0644 ${SOURCE0} $(DESTDIR)${MOZ_EXTENSIONS}/$${newfilename}
-	rm -f install.rdf || :
-
-uninstall:
-	rm -f $(DESTDIR)${MOZ_EXTENSIONS}/uBlock0@raymondhill.net.xpi
diff --git a/palemoon-ublock-origin/debian/README.Debian b/palemoon-ublock-origin/debian/README.Debian
deleted file mode 100644
index 3d345f5..0000000
--- a/palemoon-ublock-origin/debian/README.Debian
+++ /dev/null
@@ -1,9 +0,0 @@
-palemoon-ublock-origin for Devuan
-
-Initial release of palemoon-ublock-origin for devuan.
-Build orig tarball to resemble:
-$ tar -ztf palemoon-ublock-origin_1.16.4.8.orig.tar.gz 
-palemoon-ublock-origin/
-palemoon-ublock-origin/uBlock0.firefox-legacy.xpi
-
- -- B Stack <bgstack15@gmail.com> Wed, 13 Feb 2019 17:38:58 -0500
diff --git a/palemoon-ublock-origin/debian/changelog b/palemoon-ublock-origin/debian/changelog
deleted file mode 100644
index dc2a54d..0000000
--- a/palemoon-ublock-origin/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-palemoon-ublock-origin (1.16.4.8-1devuan) manual; urgency=low
-
-  * Initial release for devuan
-
- -- B Stack <bgstack15@gmail.com>  Wed, 13 Feb 2019 17:38:58 -0500
diff --git a/palemoon-ublock-origin/debian/compat b/palemoon-ublock-origin/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/palemoon-ublock-origin/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/palemoon-ublock-origin/debian/control b/palemoon-ublock-origin/debian/control
deleted file mode 100644
index a58a276..0000000
--- a/palemoon-ublock-origin/debian/control
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: palemoon-ublock-origin
-Section: web
-Priority: optional
-Maintainer: B Stack <bgstack15@gmail.com>
-Build-Depends: debhelper (>=11~),
-   unzip,
-   make
-Standards-Version: 4.1.4
-Homepage: https://github.com/gorhill/uBlock/releases
-
-Package: palemoon-ublock-origin
-Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: An efficient blocker for Chromium and Firefox. Fast and lean.
diff --git a/palemoon-ublock-origin/debian/copyright b/palemoon-ublock-origin/debian/copyright
deleted file mode 100644
index bb755b9..0000000
--- a/palemoon-ublock-origin/debian/copyright
+++ /dev/null
@@ -1,8 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: palemoon-ublock
-Source: https://github.com/gorhill/uBlock/releases/
-uBlock0.firefox-legacy.xpi GPLv3
-
-#----------------------------------------------------------------------------
-# Files marked as NO_LICENSE_TEXT_FOUND may be covered by the following
-# license/copyright files.
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 b0dc4d6..0000000
--- a/palemoon-ublock-origin/debian/files
+++ /dev/null
@@ -1,2 +0,0 @@
-palemoon-ublock-origin_1.16.4.8-1devuan_all.deb web optional
-palemoon-ublock-origin_1.16.4.8-1devuan_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/patches/series b/palemoon-ublock-origin/debian/patches/series
deleted file mode 100644
index 4a97dfa..0000000
--- a/palemoon-ublock-origin/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-# You must remove unused comment lines for the released package.
diff --git a/palemoon-ublock-origin/debian/rules b/palemoon-ublock-origin/debian/rules
deleted file mode 100755
index cc4c963..0000000
--- a/palemoon-ublock-origin/debian/rules
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/make -f
-# You must remove unused comment lines for the released package.
-#export DH_VERBOSE = 1
-#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
-#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-export NAME=palemoon-ublock-origin
-export MOZ_EXTENSIONS=/usr/lib/palemoon/browser/extensions
-export SOURCE0=uBlock0.firefox-legacy.xpi
-
-%:
-	dh $@
-
-override_dh_auto_install:
-	make -e -f debian/Makefile install -- DESTDIR=debian/${NAME}
-
-#override_dh_auto_clean:
-#	rm -rf debian/usr
diff --git a/palemoon-ublock-origin/debian/source/format b/palemoon-ublock-origin/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/palemoon-ublock-origin/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/palemoon-ublock-origin/debian/source/local-options b/palemoon-ublock-origin/debian/source/local-options
deleted file mode 100644
index 00131ee..0000000
--- a/palemoon-ublock-origin/debian/source/local-options
+++ /dev/null
@@ -1,2 +0,0 @@
-#abort-on-upstream-changes
-#unapply-patches
diff --git a/palemoon-ublock-origin/debian/watch b/palemoon-ublock-origin/debian/watch
deleted file mode 100644
index 76575dc..0000000
--- a/palemoon-ublock-origin/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-# You must remove unused comment lines for the released package.
-version=3
diff --git a/palemoon-ublock-origin/palemoon-stackrpms-ublock-origin.spec b/palemoon-ublock-origin/palemoon-stackrpms-ublock-origin.spec
deleted file mode 100644
index 0b39836..0000000
--- a/palemoon-ublock-origin/palemoon-stackrpms-ublock-origin.spec
+++ /dev/null
@@ -1,68 +0,0 @@
-# palemoon globals
-%global moz_extensions %{_libdir}/palemoon-stackrpms/browser/extensions
-%global app_name palemoon-stackrpms
-#%%global app_id
-
-Name:           %{app_name}-ublock-origin
-Version:        1.16.4.8
-Release:        1
-Summary:        uBlock Origin installed to the system Pale Moon extensions directory
-
-Group:          Applications/Internet
-License:        GPLv3
-URL:            https://github.com/gorhill/uBlock
-Source0:        https://github.com/gorhill/uBlock/releases/download/firefox-legacy-%{version}/uBlock0.firefox-legacy.xpi
-BuildRequires:  unzip
-BuildRequires:  coreutils
-BuildArch:      noarch
-
-#Requires:       mozilla-filesystem
-#Requires:       %%{app_name}-filesystem
-
-%description
-The "legacy" release of uBlock Origin (NPAPI) for tradional Mozilla-style
-web browsers. This is packaged for %{app_name}.
-
-More than just an ad blocker, uBlock Origin provides the ability to block
-at will and easy defaults based on various common lists, such as EasyList,
-EasyPrivacy, and Peter Lowe's ad/tracking/malware servers.
-
-%prep
-#%setup -q -c
-
-%build
-
-%install
-# learn extension id to name the file
-%{__unzip} -o %{SOURCE0} install.rdf
-newfilename="$( grep 'em:id' install.rdf 2>/dev/null | head -n1 | sed -r -e 's/^.*<em:id>//;' -e 's/<\/em:id>.*$//;' ).xpi"
-test -z "${newfilename}" && newfilename="$( basename %{SOURCE0} )"
-
-mkdir -p %{buildroot}%{moz_extensions}
-install -Dp -m0644 %{SOURCE0} %{buildroot}%{moz_extensions}/${newfilename}
-
-rm -rf install.rdf
-
-%clean
-rm -rf %{buildroot}
-
-%files
-%defattr(-,root,root,-)
-%{moz_extensions}/*.xpi
-
-%changelog
-* Sat Sep 15 2018 B Stack <bgstack15@gmail.com> 1.16.4.4-2
-- Customize for stackrpms
-
-* Wed Aug 2 2017 Ian Firns <firnsy@kororaproject.org>- 1.13.8-1
-- Update to 1.13.8 release
-
-* Thu Jan 7 2016 Chris Smart <csmart@kororaproject.org>- 1.9.16-1
-- Update to 1.9.16 release
-
-* Thu Jan 7 2016 Chris Smart <csmart@kororaproject.org>- 1.5.3-1
-- Update to 1.5.3 release
-- Use signed xpi from Mozilla so that it works in Firefox 43
-
-* Tue Nov 3 2015 Chris Smart <csmart@kororaproject.org>- 1.3.2-1
-- Initial build
diff --git a/palemoon-ublock-origin/palemoon-ublock-origin.spec b/palemoon-ublock-origin/palemoon-ublock-origin.spec
index 51fedf0..12b4126 100644
--- a/palemoon-ublock-origin/palemoon-ublock-origin.spec
+++ b/palemoon-ublock-origin/palemoon-ublock-origin.spec
@@ -1,6 +1,6 @@
 # palemoon globals
-%global moz_extensions %{_libdir}/palemoon/browser/extensions
 %global app_name palemoon
+%global moz_extensions %{_libdir}/%{app_name}/browser/extensions
 #%%global app_id
 
 Name:           %{app_name}-ublock-origin