Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

Conflicts:
	libre/mozilla-searchplugins/PKGBUILD

4 files changed, 36 insertions, 2 deletions

diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD
index f30d4f04a..b621fbabb 100644
--- a/libre/mozilla-searchplugins/PKGBUILD
+++ b/libre/mozilla-searchplugins/PKGBUILD
@@ -3,13 +3,14 @@
 # Contributor: Figue <ffigue at gmail>
 # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): vando <facundo@esdebian.org>
+# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
 # Thank you very much to the older contributors:
 # Contributor: evr <evanroman at gmail>
 # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
 
 pkgname=mozilla-searchplugins
-pkgver=1.1
-pkgrel=1
+pkgver=1.2
+pkgrel=2
 pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers."
 arch=('any')
 license=('MPL' 'GPL' 'LGPL')
@@ -19,6 +20,8 @@ source=(
   internet-archive.xml
   jamendo-en.xml
   logless-search.xml
+  parabola-packages.xml
+  parabola-wiki-en.xml
   scroogle-ssl-english.xml
   seeks-search.xml
   wikipedia.xml
@@ -34,6 +37,8 @@ md5sums=('e1bda0854de7d764f7401c81bb82b5ef'
          '462c68585461f8cdc23c93c46f6ee4cf'
          '2d492295c4308f9bba9ece28d8b3af2d'
          '937ac0e5392b060d93bd33e761fbfa51'
+         '3c4a7f901bfe9000a702c68f7f78428c'
+         '5bf9ca2558026fa3f4ec52d8e64fee47'
          'cf97082e77e3ef5f1bd74b1db9329965'
          '86ccb1d02683e69e6bc0543cb77a06bc'
          'c35f4971feff8387e0570d7a165eb6fa'
diff --git a/libre/mozilla-searchplugins/parabola-gnulinux-libre-wiki-en.xml b/libre/mozilla-searchplugins/parabola-gnulinux-libre-wiki-en.xml
new file mode 100644
index 000000000..124f04609
--- /dev/null
+++ b/libre/mozilla-searchplugins/parabola-gnulinux-libre-wiki-en.xml
@@ -0,0 +1,9 @@
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
+<os:ShortName>Parabola GNU/Linux-Libre Wiki (en)</os:ShortName>
+<os:Description>Parabola GNU/Linux-Libre Wiki (en)</os:Description>
+<os:InputEncoding>UTF-8</os:InputEncoding>
+<SearchForm>https://wiki.parabolagnulinux.org/Special:Search</SearchForm>
+<os:Url type="text/html" method="GET" template="https://wiki.parabolagnulinux.org/index.php?title=Special:Search&amp;search={searchTerms}">
+</os:Url><os:Url type="application/x-suggestions+json" method="GET" template="https://wiki.parabolagnulinux.org/api.php?action=opensearch&amp;search={searchTerms}&amp;namespace=0">
+</os:Url>
+</SearchPlugin>
\ No newline at end of file
diff --git a/libre/mozilla-searchplugins/parabola-packages.xml b/libre/mozilla-searchplugins/parabola-packages.xml
new file mode 100644
index 000000000..8f20628dc
--- /dev/null
+++ b/libre/mozilla-searchplugins/parabola-packages.xml
@@ -0,0 +1,9 @@
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
+<os:ShortName>Parabola Packages</os:ShortName>
+<os:Description>Search the Parabola package repositories.</os:Description>
+<os:InputEncoding>UTF-8</os:InputEncoding>
+<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA==</os:Image>
+<os:Url type="text/html" method="GET" template="http://parabolagnulinux.org/packages/?q={searchTerms}">
+</os:Url><os:Url type="application/opensearchdescription+xml" method="GET" template="http://parabolagnulinux.org/opensearch/packages/" rel="self">
+</os:Url>
+</SearchPlugin>
\ No newline at end of file
diff --git a/libre/mozilla-searchplugins/parabola-wiki-en.xml b/libre/mozilla-searchplugins/parabola-wiki-en.xml
new file mode 100644
index 000000000..d218b21f8
--- /dev/null
+++ b/libre/mozilla-searchplugins/parabola-wiki-en.xml
@@ -0,0 +1,11 @@
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
+<os:ShortName>Parabola GNU/Linux-Libre Wiki (en)</os:ShortName>
+<os:Description>Parabola GNU/Linux-Libre Wiki (en)</os:Description>
+<os:InputEncoding>UTF-8</os:InputEncoding>
+<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///
+8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA==</os:Image>
+<SearchForm>https://wiki.parabolagnulinux.org/Special:Search</SearchForm>
+<os:Url type="text/html" method="GET" template="https://wiki.parabolagnulinux.org/index.php?title=Special:Search&amp;search={searchTerms}">
+</os:Url><os:Url type="application/x-suggestions+json" method="GET" template="https://wiki.parabolagnulinux.org/api.php?action=opensearch&amp;search={searchTerms}&amp;namespace=0">
+</os:Url>
+</SearchPlugin>
\ No newline at end of file