From f6da658cf1d976fdd7847593ba96857e2c14fc8b Mon Sep 17 00:00:00 2001 From: Johannes Schauer Date: Tue, 20 Feb 2018 13:49:55 +0100 Subject: New upstream version 0.14.0+dfsg1 --- debian/changelog | 7 ++ debian/patches/debian-changes | 194 ------------------------------------------ debian/patches/series | 1 - 3 files changed, 7 insertions(+), 195 deletions(-) delete mode 100644 debian/patches/debian-changes delete mode 100644 debian/patches/series (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4fe22db..77952b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +searx (0.14.0+dfsg1-1) unstable; urgency=medium + + * New upstream release + - settings.yaml can now contain non-ascii characters (closes: #886093) + + -- Johannes Schauer Tue, 20 Feb 2018 13:45:35 +0100 + searx (0.13.1+dfsg1-3) unstable; urgency=medium * Add ionicons font to build ion.woff from source using fontforge for the diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes deleted file mode 100644 index 7522f40..0000000 --- a/debian/patches/debian-changes +++ /dev/null @@ -1,194 +0,0 @@ -The Debian packaging of searx is maintained in git, using the merging workflow -described in dgit-maint-merge(7). There isn't a patch queue that can be -represented as a quilt series. - -A detailed breakdown of the changes is available from their canonical -representation - git commits in the packaging repository. For example, to see -the changes made by the Debian maintainer in the first upload of upstream -version 1.2.3, you could use: - - % git clone https://git.dgit.debian.org/searx - % cd searx - % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian' - -(If you have dgit, use `dgit clone searx`, rather than plain `git clone`.) - -A single combined diff, containing all the changes, follows. ---- searx-0.13.1+dfsg1.orig/manage.sh -+++ searx-0.13.1+dfsg1/manage.sh -@@ -93,7 +93,7 @@ tests() { - } - - build_style() { -- lessc --clean-css="--s1 --advanced --compatibility=ie9" "$BASE_DIR/searx/static/$1" "$BASE_DIR/searx/static/$2" -+ lessc -x "$BASE_DIR/searx/static/$1" "$BASE_DIR/searx/static/$2" - } - - styles() { -@@ -104,11 +104,10 @@ styles() { - build_style themes/courgette/less/style-rtl.less themes/courgette/css/style-rtl.css - build_style less/bootstrap/bootstrap.less css/bootstrap.min.css - build_style themes/pix-art/less/style.less themes/pix-art/css/style.css -- # built using grunt -- #build_style themes/oscar/less/pointhi/oscar.less themes/oscar/css/pointhi.min.css -- #build_style themes/oscar/less/logicodev/oscar.less themes/oscar/css/logicodev.min.css -- #build_style themes/simple/less/style.less themes/simple/css/searx.min.css -- #build_style themes/simple/less/style-rtl.less themes/simple/css/searx-rtl.min.css -+ build_style themes/oscar/less/pointhi/oscar.less themes/oscar/css/pointhi.min.css -+ build_style themes/oscar/less/logicodev/oscar.less themes/oscar/css/logicodev.min.css -+ build_style themes/simple/less/style.less themes/simple/css/searx.min.css -+ build_style themes/simple/less/style-rtl.less themes/simple/css/searx-rtl.min.css - } - - npm_packages() { ---- searx-0.13.1+dfsg1.orig/searx/settings.yml -+++ searx-0.13.1+dfsg1/searx/settings.yml -@@ -16,8 +16,8 @@ server: - http_protocol_version : "1.0" # 1.0 and 1.1 are supported - - ui: -- static_path : "" # Custom static path - leave it blank if you didn't change -- templates_path : "" # Custom templates path - leave it blank if you didn't change -+ static_path : "/usr/share/python3-searx/static" # Custom static path - leave it blank if you didn't change -+ templates_path : "/usr/share/python3-searx/templates" # Custom templates path - leave it blank if you didn't change - default_theme : oscar # ui theme - default_locale : "" # Default interface locale - leave blank to detect from browser information or use codes from the 'locales' config section - ---- searx-0.13.1+dfsg1.orig/searx/static/themes/oscar/gruntfile.js -+++ searx-0.13.1+dfsg1/searx/static/themes/oscar/gruntfile.js -@@ -79,16 +79,9 @@ module.exports = function(grunt) { - } - }); - -- grunt.loadNpmTasks('grunt-contrib-uglify'); -- grunt.loadNpmTasks('grunt-contrib-jshint'); -- grunt.loadNpmTasks('grunt-contrib-watch'); -- grunt.loadNpmTasks('grunt-contrib-concat'); -- grunt.loadNpmTasks('grunt-contrib-less'); -+ grunt.loadNpmTasks('grunt-contrib-uglify', '/usr/lib/nodejs'); -+ grunt.loadNpmTasks('grunt-contrib-concat', '/usr/lib/nodejs'); - -- grunt.registerTask('test', ['jshint']); -- -- grunt.registerTask('default', ['jshint', 'concat', 'uglify', 'less']); -- -- grunt.registerTask('styles', ['less']); -+ grunt.registerTask('default', ['concat', 'uglify']); - - }; ---- searx-0.13.1+dfsg1.orig/searx/static/themes/simple/gruntfile.js -+++ searx-0.13.1+dfsg1/searx/static/themes/simple/gruntfile.js -@@ -58,12 +58,6 @@ module.exports = function(grunt) { - production: { - options: { - paths: ["less"], -- plugins: [ -- new (require('less-plugin-clean-css'))({ -- advanced: true, -- compatibility: 'ie8' -- }) -- ], - banner: '/*! searx | <%= grunt.template.today("dd-mm-yyyy") %> | https://github.com/asciimoo/searx */\n' - }, - files: { -@@ -137,15 +131,8 @@ module.exports = function(grunt) { - } - }); - -- grunt.loadNpmTasks('grunt-contrib-watch'); -- grunt.loadNpmTasks('grunt-contrib-uglify'); -- grunt.loadNpmTasks('grunt-contrib-jshint'); -- grunt.loadNpmTasks('grunt-contrib-concat'); -- grunt.loadNpmTasks('grunt-contrib-less'); -- grunt.loadNpmTasks('grunt-contrib-cssmin'); -- grunt.loadNpmTasks('grunt-webfont'); -+ grunt.loadNpmTasks('grunt-contrib-uglify', '/usr/lib/nodejs'); -+ grunt.loadNpmTasks('grunt-contrib-concat', '/usr/lib/nodejs'); - -- grunt.registerTask('test', ['jshint']); -- -- grunt.registerTask('default', ['jshint', 'concat', 'uglify', 'less:development', 'less:production']); -+ grunt.registerTask('default', ['concat', 'uglify']); - }; ---- searx-0.13.1+dfsg1.orig/searx/static/themes/simple/js/searx_src/autocomplete.js -+++ searx-0.13.1+dfsg1/searx/static/themes/simple/js/searx_src/autocomplete.js -@@ -1,4 +1,51 @@ --(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.AutoComplete = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o