[SCM] plasma-framework packaging branch, master, updated. debian/5.19.0-1-27-g8927444
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 07:51:26 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/plasma-framework.git;a=commitdiff;h=aced6b7
The following commit has been merged in the master branch:
commit aced6b70fab80979615431da5b5ad0750a2d13fb
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date: Sun Apr 10 14:02:48 2016 +0200
Refresh patches
---
debian/patches/series | 1 -
debian/patches/upstream_fix_iconitem_test.patch | 42 -------------------------
2 files changed, 43 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 242f10c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_fix_iconitem_test.patch
diff --git a/debian/patches/upstream_fix_iconitem_test.patch b/debian/patches/upstream_fix_iconitem_test.patch
deleted file mode 100644
index 2d0f226..0000000
--- a/debian/patches/upstream_fix_iconitem_test.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-commit ab302872d300158a590af841bb890392d11489be
-Author: David Rosca <nowrep at gmail.com>
-Date: Sun Mar 6 16:13:54 2016 +0100
-
- Fix iconitem test - second try
-
-diff --git a/autotests/data/icons/test-theme/index.theme b/autotests/data/icons/test-theme/index.theme
-index 52a7275..5eaeff3 100644
---- a/autotests/data/icons/test-theme/index.theme
-+++ b/autotests/data/icons/test-theme/index.theme
-@@ -3,8 +3,6 @@ Name=Unittest Theme
-
- DisplayDepth=32
-
--Inherits=breeze
--
- DesktopDefault=48
- DesktopSizes=16,22,32,48,64,128,256
- ToolbarDefault=22
-@@ -21,7 +19,7 @@ DialogSizes=16,22,32,48,64,128,256
- ########## Directories
- ########## ordered by category and alphabetically
-
--Directories=apps/22,apps/32
-+Directories=apps/22,apps/32,apps/48
-
- [apps/22]
- Size=22
-diff --git a/autotests/iconitemtest.cpp b/autotests/iconitemtest.cpp
-index 5853f74..ae825a9 100644
---- a/autotests/iconitemtest.cpp
-+++ b/autotests/iconitemtest.cpp
-@@ -61,6 +61,9 @@ void IconItemTest::initTestCase()
-
- QFile::remove(configPath);
-
-+ QIcon::setThemeSearchPaths({QFINDTESTDATA("data/icons")});
-+ QIcon::setThemeName("test-theme");
-+
- KConfigGroup cg(KSharedConfig::openConfig(), "Icons");
- cg.writeEntry("Theme", "test-theme");
- KConfigGroup plasmaConfig(KSharedConfig::openConfig("plasmarc"), "Theme");
--
plasma-framework packaging
More information about the pkg-kde-commits
mailing list