[sagenb] 08/14: Update patch headers

Ximin Luo infinity0 at debian.org
Fri Dec 2 22:52:48 UTC 2016


This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository sagenb.

commit 4925667b816df69adf040faef205480071a50fbd
Author: Ximin Luo <infinity0 at pwned.gg>
Date:   Fri Dec 2 21:41:30 2016 +0100

    Update patch headers
---
 debian/patches/disable-bgiframe.patch                           | 3 +++
 debian/patches/disable-farbtastic-jpicker.patch                 | 3 +++
 debian/patches/fix-bullshit.patch                               | 3 +++
 debian/patches/fix-sass-syntax.patch                            | 2 +-
 debian/patches/series                                           | 2 +-
 debian/patches/switch-system-jquery-vanderlee-colorpicker.patch | 7 +++++++
 debian/patches/use-system-jquery.patch                          | 3 +++
 7 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/debian/patches/disable-bgiframe.patch b/debian/patches/disable-bgiframe.patch
index 53fa03f..9a2d611 100644
--- a/debian/patches/disable-bgiframe.patch
+++ b/debian/patches/disable-bgiframe.patch
@@ -1,3 +1,6 @@
+Description: Disable bgiframe, an IE-specific fix
+Author: Ximin Luo <infinity0 at debian.org>
+Forwarded: not-needed
 --- a/sagenb/data/sage/html/notebook/base.html
 +++ b/sagenb/data/sage/html/notebook/base.html
 @@ -25,7 +25,6 @@
diff --git a/debian/patches/disable-farbtastic-jpicker.patch b/debian/patches/disable-farbtastic-jpicker.patch
index 75dc491..0a29217 100644
--- a/debian/patches/disable-farbtastic-jpicker.patch
+++ b/debian/patches/disable-farbtastic-jpicker.patch
@@ -1,3 +1,6 @@
+Description: Disable farbtastic and jpicker instead of bundling them
+Author: Ximin Luo <infinity0 at debian.org>
+Forwarded: not-needed
 --- a/sagenb/notebook/interact.py
 +++ b/sagenb/notebook/interact.py
 @@ -448,8 +448,8 @@
diff --git a/debian/patches/fix-bullshit.patch b/debian/patches/fix-bullshit.patch
index f53fb81..4af6ed0 100644
--- a/debian/patches/fix-bullshit.patch
+++ b/debian/patches/fix-bullshit.patch
@@ -1,3 +1,6 @@
+Description: Fix some bullshit, otherwise uglifyjs fails
+Author: Ximin Luo <infinity0 at debian.org>
+Forwarded: TODO
 --- a/sagenb/data/graph_editor/processing.editor.js
 +++ b/sagenb/data/graph_editor/processing.editor.js
 @@ -432,7 +432,8 @@
diff --git a/debian/patches/fix-sass-syntax.patch b/debian/patches/fix-sass-syntax.patch
index 23c21bc..515a3b3 100644
--- a/debian/patches/fix-sass-syntax.patch
+++ b/debian/patches/fix-sass-syntax.patch
@@ -1,4 +1,4 @@
-Description: Fix SASS syntax errors
+Description: Fix SASS syntax errors, otherwise compass fails
 Author: Ximin Luo <infinity0 at debian.org>
 Forwarded: TODO
 --- a/sass/src/main.scss
diff --git a/debian/patches/series b/debian/patches/series
index a28c0fd..4ada37d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,9 @@
 #fix-test-case.patch
 fix-sass-syntax.patch
+fix-bullshit.patch
 use-system-jquery.patch
 update-flask-0.11.patch
 update-codemirror-version.patch
 switch-system-jquery-vanderlee-colorpicker.patch
 disable-bgiframe.patch
 disable-farbtastic-jpicker.patch
-fix-bullshit.patch
diff --git a/debian/patches/switch-system-jquery-vanderlee-colorpicker.patch b/debian/patches/switch-system-jquery-vanderlee-colorpicker.patch
index 7a54e36..5e67482 100644
--- a/debian/patches/switch-system-jquery-vanderlee-colorpicker.patch
+++ b/debian/patches/switch-system-jquery-vanderlee-colorpicker.patch
@@ -1,3 +1,10 @@
+Description: Use vanderlee's colorpicker instead of the eyecon one
+ It's more popular, better maintained, and requires less boilerplate to use
+ New: https://github.com/vanderlee/colorpicker
+ Old: http://www.eyecon.ro/colorpicker/
+Author: Ximin Luo <infinity0 at debian.org>
+Forwarded: not-needed
+
 --- a/sagenb/notebook/interact.py
 +++ b/sagenb/notebook/interact.py
 @@ -523,18 +523,12 @@
diff --git a/debian/patches/use-system-jquery.patch b/debian/patches/use-system-jquery.patch
index 4eda616..1ff909e 100644
--- a/debian/patches/use-system-jquery.patch
+++ b/debian/patches/use-system-jquery.patch
@@ -1,3 +1,6 @@
+Description: Use Debian system jquery
+Author: Ximin Luo <infinity0 at debian.org>
+Forwarded: not-needed
 --- a/sagenb/data/graph_editor/graph_editor.html
 +++ b/sagenb/data/graph_editor/graph_editor.html
 @@ -26,9 +26,9 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagenb.git



More information about the debian-science-commits mailing list