summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes 'josch' Schauer <josch@mister-muffin.de>2017-06-16 15:20:25 +0200
committerJohannes 'josch' Schauer <josch@mister-muffin.de>2017-06-16 15:20:25 +0200
commitf7df655a256265a625ee3b1de85376f9a57072fd (patch)
tree8b40d79f14aea516a1f9e10997e231c66d7bdecb
parent7ce0fd9bc004b1a928f6a760be5da30eb2902bdd (diff)
Commit Debian 3.0 (quilt) metadatadebian/0.12.0+dfsg1-1archive/debian/0.12.0+dfsg1-1
[dgit (3.10) quilt-fixup]
-rw-r--r--debian/patches/debian-changes88
-rw-r--r--debian/patches/series1
2 files changed, 89 insertions, 0 deletions
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
new file mode 100644
index 0000000..003b3eb
--- /dev/null
+++ b/debian/patches/debian-changes
@@ -0,0 +1,88 @@
+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.12.0+dfsg1.orig/manage.sh
++++ searx-0.12.0+dfsg1/manage.sh
+@@ -88,7 +88,6 @@ styles() {
+ build_style themes/legacy/less/style-rtl.less themes/legacy/css/style-rtl.css
+ build_style themes/courgette/less/style.less themes/courgette/css/style.css
+ 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/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/pix-art/less/style.less themes/pix-art/css/style.css
+--- searx-0.12.0+dfsg1.orig/searx/settings.yml
++++ searx-0.12.0+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.12.0+dfsg1.orig/searx/static/themes/oscar/gruntfile.js
++++ searx-0.12.0+dfsg1/searx/static/themes/oscar/gruntfile.js
+@@ -75,16 +75,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.12.0+dfsg1.orig/setup.py
++++ searx-0.12.0+dfsg1/setup.py
+@@ -51,23 +51,9 @@ setup(
+ },
+ package_data={
+ 'searx': [
+- 'settings.yml',
+- '../README.rst',
+- '../requirements.txt',
+- '../requirements-dev.txt',
+ 'data/*',
+ 'plugins/*/*',
+- 'static/*.*',
+- 'static/*/*.*',
+- 'static/*/*/*.*',
+- 'static/*/*/*/*.*',
+- 'static/*/*/*/*/*.*',
+- 'templates/*/*.*',
+- 'templates/*/*/*.*',
+- 'tests/*',
+- 'tests/*/*',
+- 'tests/*/*/*',
+- 'translations/*/*/*'
++ 'translations/*/*/*.mo'
+ ],
+ },
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7bb8252
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+debian-changes