[SCM] parley packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-1-13-g4f5ac15

[Philip Muškovac]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-applications/parley.git;a=commitdiff;h=c4e97fb

The following commit has been merged in the kubuntu_vivid_archive branch:
commit c4e97fb32238aabec069afd3f6c351d4c2fd2e3f
Author: Philip Muskovac <yofel at gmx.net>
Date:   Sun Dec 14 11:28:51 2014 +0100

    Cherry pick part of c771075b43cbcb755d681f4aa0cda84018bcaaed as kubuntu_remove_edit-clear_icon.diff so parley-data doesn't conflict with oxygen-icon-theme (LP: #1400903)
---
 debian/changelog                                   |  8 +++
 debian/patches/kubuntu_remove_edit-clear_icon.diff | 57 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 66 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 06df9f6..c38dd08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+parley (4:14.11.97-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Cherry pick part of c771075b43cbcb755d681f4aa0cda84018bcaaed as
+    kubuntu_remove_edit-clear_icon.diff so parley-data doesn't conflict
+    with oxygen-icon-theme (LP: #1400903)
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Sun, 14 Dec 2014 10:28:35 +0100
+
 parley (4:14.11.97-0ubuntu1) vivid; urgency=medium
 
   * New upstream RC release
diff --git a/debian/patches/kubuntu_remove_edit-clear_icon.diff b/debian/patches/kubuntu_remove_edit-clear_icon.diff
new file mode 100644
index 0000000..30d831c
--- /dev/null
+++ b/debian/patches/kubuntu_remove_edit-clear_icon.diff
@@ -0,0 +1,57 @@
+From c771075b43cbcb755d681f4aa0cda84018bcaaed Mon Sep 17 00:00:00 2001
+From: Jeremy Whiting <jpwhiting at kde.org>
+Date: Wed, 3 Dec 2014 13:48:32 -0700
+Subject: [PATCH] Remove edit-clear icon since it's in oxygen-icons.
+
+---
+ icons/16-actions-edit-clear.png  | Bin 439 -> 0 bytes
+ icons/22-actions-edit-clear.png  | Bin 588 -> 0 bytes
+ icons/32-actions-edit-clear.png  | Bin 884 -> 0 bytes
+ icons/48-actions-edit-clear.png  | Bin 1524 -> 0 bytes
+ icons/CMakeLists.txt             |  10 +++++-----
+ icons/sc-actions-edit-clear.svgz | Bin 7299 -> 0 bytes
+ 6 files changed, 5 insertions(+), 5 deletions(-)
+ delete mode 100644 icons/16-actions-edit-clear.png
+ delete mode 100644 icons/22-actions-edit-clear.png
+ delete mode 100644 icons/32-actions-edit-clear.png
+ delete mode 100644 icons/48-actions-edit-clear.png
+ delete mode 100644 icons/sc-actions-edit-clear.svgz
+
+diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
+index 02d10bc..230a95f 100644
+--- a/icons/CMakeLists.txt
++++ b/icons/CMakeLists.txt
+@@ -1,28 +1,28 @@
+ include(ECMInstallIcons)
+ ecm_install_icons( ICONS
+   16-actions-cards-block.png        22-actions-lesson-remove.png      32-actions-practice-start.png
+-  16-actions-edit-clear.png         22-actions-list-add-card.png      32-actions-practice-stop.png
++  22-actions-list-add-card.png      32-actions-practice-stop.png
+   16-actions-edit-entry.png         22-actions-list-remove-card.png   32-actions-remove-duplicates.png
+   16-actions-edit-table-row.png     22-actions-multiple-choice.png    32-actions-set-language.png
+   16-actions-lesson-add.png         22-actions-practice-setup.png     32-actions-specific-setup.png
+   16-actions-lesson-remove.png      22-actions-practice-start.png     48-actions-cards-block.png
+-  16-actions-list-add-card.png      22-actions-practice-stop.png      48-actions-edit-clear.png
++  16-actions-list-add-card.png      22-actions-practice-stop.png      
+   16-actions-list-remove-card.png   22-actions-remove-duplicates.png  48-actions-edit-entry.png
+   16-actions-multiple-choice.png    22-actions-set-language.png       48-actions-edit-table-row.png
+   16-actions-practice-setup.png     22-actions-specific-setup.png     48-actions-lesson-add.png
+   16-actions-practice-start.png     32-actions-cards-block.png        48-actions-lesson-remove.png
+-  16-actions-practice-stop.png      32-actions-edit-clear.png         48-actions-list-add-card.png
++  16-actions-practice-stop.png      48-actions-list-add-card.png
+   16-actions-remove-duplicates.png  32-actions-edit-entry.png         48-actions-list-remove-card.png
+   16-actions-set-language.png       32-actions-edit-table-row.png     48-actions-multiple-choice.png
+   16-actions-specific-setup.png     32-actions-lesson-add.png         48-actions-practice-setup.png
+   22-actions-cards-block.png        32-actions-lesson-remove.png      48-actions-practice-start.png
+-  22-actions-edit-clear.png         32-actions-list-add-card.png      48-actions-practice-stop.png
++  32-actions-list-add-card.png      48-actions-practice-stop.png
+   22-actions-edit-entry.png         32-actions-list-remove-card.png   48-actions-remove-duplicates.png
+   22-actions-edit-table-row.png     32-actions-multiple-choice.png    48-actions-set-language.png
+   22-actions-lesson-add.png         32-actions-practice-setup.png     48-actions-specific-setup.png
+ 
+   sc-actions-cards-block.svgz     sc-actions-lesson-remove.svgz     sc-actions-remove-duplicates.svgz
+-  sc-actions-edit-clear.svgz      sc-actions-list-add-card.svgz     sc-actions-set-language.svgz
++  sc-actions-list-add-card.svgz   sc-actions-set-language.svgz
+   sc-actions-edit-entry.svgz      sc-actions-list-remove-card.svgz  sc-actions-specific-setup.svgz
+   sc-actions-edit-table-row.svgz  sc-actions-practice-setup.svgz
+   sc-actions-lesson-add.svgz      sc-actions-practice-start.svgz
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ca47e76
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kubuntu_remove_edit-clear_icon.diff

-- 
parley packaging