[SCM] breeze packaging branch, kubuntu_stable, updated. db29d08dc2b4b7c8c91ceb3c515a1996b9289648

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/breeze.git;a=commitdiff;h=db29d08

The following commit has been merged in the kubuntu_stable branch:
commit db29d08dc2b4b7c8c91ceb3c515a1996b9289648
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Mar 12 15:49:21 2015 +0100

    merge with kubuntu_vivid_archive
---
 debian/patches/series                       |  1 -
 debian/patches/upstream_gtktheme-setup.diff | 31 -----------------------------
 2 files changed, 32 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 79c8be7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_gtktheme-setup.diff
diff --git a/debian/patches/upstream_gtktheme-setup.diff b/debian/patches/upstream_gtktheme-setup.diff
deleted file mode 100644
index d1f0c07..0000000
--- a/debian/patches/upstream_gtktheme-setup.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/misc/gtkbreeze/main.cpp b/misc/gtkbreeze/main.cpp
-index 186d37b..b4dfcaa 100644
---- a/misc/gtkbreeze/main.cpp
-+++ b/misc/gtkbreeze/main.cpp
-@@ -107,7 +107,7 @@ int setGtk2()
-     out << QStringLiteral("widget_class \"*\" style \"user-font\"
");
-     out << QStringLiteral("gtk-font-name=\"Oxygen-Sans Sans-Book 10\"
"); // matches plasma-workspace:startkde/startkde.cmake
-     out << QStringLiteral("gtk-theme-name=\"Orion\"
");
--    out << QStringLiteral("gtk-icon-theme-name=\"oxygen\"
"); // breeze icons don't seem to work with gtk
-+    out << QStringLiteral("gtk-icon-theme-name=\"breeze\"
");
-     out << QStringLiteral("gtk-fallback-icon-theme=\"gnome\"
");
-     out << QStringLiteral("gtk-toolbar-style=GTK_TOOLBAR_ICONS
");
-     out << QStringLiteral("gtk-menu-images=1
");
-@@ -138,6 +138,8 @@ int setGtk3()
-         qCDebug(GTKBREEZE) << "gtkrc3 already exists and is not using oxygen, quitting";
-         return 0;
-     }
-+    QDir dir = QFileInfo(gtkrc3path).dir();
-+    dir.mkpath(dir.path());
- 
-     qCDebug(GTKBREEZE) << "no gtkrc3 file or oxygen being used, setting to new theme";
-     QFile gtkrc3writer(gtkrc3path);
-@@ -150,7 +152,7 @@ int setGtk3()
-     out << QStringLiteral("[Settings]
");
-     out << QStringLiteral("gtk-font-name=Oxygen-Sans 10
"); // matches plasma-workspace:startkde/startkde.cmake
-     out << QStringLiteral("gtk-theme-name=")+gtk3Theme+QStringLiteral("
");
--    out << QStringLiteral("gtk-icon-theme-name=oxygen
"); // breeze icons don't seem to work with gtk
-+    out << QStringLiteral("gtk-icon-theme-name=breeze
");
-     out << QStringLiteral("gtk-fallback-icon-theme=gnome
");
-     out << QStringLiteral("gtk-toolbar-style=GTK_TOOLBAR_ICONS
");
-     out << QStringLiteral("gtk-menu-images=1
");

-- 
breeze packaging