[Pkg-sugar-commit] [sugar-artwork] 06/07: Drop patches cherry-picked upstream: Applied upstream.

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository sugar-artwork.

commit 0158c9fdea773ca82ff538f3bfd79c120c3adc4c
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Jul 6 20:23:29 2015 -0500

    Drop patches cherry-picked upstream: Applied upstream.
---
 debian/patches/020150701~00ebb38.patch | 36 ----------------------------------
 debian/patches/020150702~1cd50f1.patch | 29 ---------------------------
 debian/patches/series                  |  2 --
 3 files changed, 67 deletions(-)

diff --git a/debian/patches/020150701~00ebb38.patch b/debian/patches/020150701~00ebb38.patch
deleted file mode 100644
index 62bd18e..0000000
--- a/debian/patches/020150701~00ebb38.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Revert "Fix treeview background, fixes #4855"
-Origin: upstream, https://github.com/sugarlabs/sugar-toolkit-gtk3/commit/00ebb38
-Author: Martin Abente Lahaye <tch at sugarlabs.org>
-Forwarded: yes
-Last-Update: 2015-07-01
-
---- a/gtk3/theme/gtk-widgets.css.em
-+++ b/gtk3/theme/gtk-widgets.css.em
-@@ -1,10 +1,5 @@
- ${
- import math
--from gi.repository import Gtk
--
--gtk_major = int(Gtk.get_major_version())
--gtk_minor = int(Gtk.get_minor_version())
--treeview_pseudo_element = gtk_major >= 3 and gtk_minor > 8
- 
- def my_floor(num):
-     return int(math.floor(num))
-@@ -226,14 +221,10 @@
-     border-width: 0px;
- }
- 
--$[if treeview_pseudo_element] GtkTreeView row:even
--$[else] GtkTreeView row:nth-child(even)
--$[end if] {
-+GtkTreeView row:nth-child(even) {
-     background-color: @row_even;
- }
--$[if treeview_pseudo_element] GtkTreeView row:odd
--$[else] GtkTreeView row:nth-child(odd)
--$[end if] {
-+GtkTreeView row:nth-child(odd) {
-     background-color: @row_odd;
- }
- 
diff --git a/debian/patches/020150702~1cd50f1.patch b/debian/patches/020150702~1cd50f1.patch
deleted file mode 100644
index b2e4a7f..0000000
--- a/debian/patches/020150702~1cd50f1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Fix TreeView rows colors
- Add parallel rules for fixing rows colors alternation in TreeViews,
- e.g, in Log activity side list, for Gtk 3.16+.
- .
- Note that parser will skip the previous rules if he fails to parse the
- new rules. Therefore, when adding "parallel" rules for newer gtk
- versions, these rules must be added separately. Otherwise, it will
- break the previous rules for older gtk versions.
-Origin: upstream, https://github.com/sugarlabs/sugar-toolkit-gtk3/commit/1cd50f1
-Author: Martin Abente Lahaye <tch at sugarlabs.org>
-Forwarded: yes
-Last-Update: 2015-07-02
-
---- a/gtk3/theme/gtk-widgets.css.em
-+++ b/gtk3/theme/gtk-widgets.css.em
-@@ -221,6 +221,13 @@
-     border-width: 0px;
- }
- 
-+GtkTreeView row:even {
-+    background-color: @row_even;
-+}
-+GtkTreeView row:odd {
-+    background-color: @row_odd;
-+}
-+
- GtkTreeView row:nth-child(even) {
-     background-color: @row_even;
- }
diff --git a/debian/patches/series b/debian/patches/series
index 9f0584a..9fa8a32 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-020150701~00ebb38.patch
-020150702~1cd50f1.patch
 2001_empy_from_system.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sugar/sugar-artwork.git