[SCM] parley packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-1-14-gab002bf
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Thu Dec 18 14:28:39 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-applications/parley.git;a=commitdiff;h=ab002bf
The following commit has been merged in the kubuntu_vivid_archive branch:
commit ab002bf2e036c4f53c6ee158949da3846ff7c0d0
Author: Jonathan Riddell <jr at jriddell.org>
Date: Thu Dec 18 15:28:32 2014 +0100
NOCI
---
debian/changelog | 6 +++
debian/control | 2 +-
debian/patches/kubuntu_remove_edit-clear_icon.diff | 57 ----------------------
debian/patches/series | 1 -
4 files changed, 7 insertions(+), 59 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5ac7419..12ac927 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+parley (4:14.12.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 18 Dec 2014 15:20:26 +0100
+
parley (4:14.11.97-0ubuntu2) vivid; urgency=medium
* Cherry pick part of c771075b43cbcb755d681f4aa0cda84018bcaaed as
diff --git a/debian/control b/debian/control
index b7b80f7..25a8866 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Build-Depends: cmake,
pkg-kde-tools (>= 0.12),
qtmultimedia5-dev,
qtscript5-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
XS-Testsuite: autopkgtest
Homepage: https://projects.kde.org/projects/kde/kdeedu/parley
Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/parley.git
diff --git a/debian/patches/kubuntu_remove_edit-clear_icon.diff b/debian/patches/kubuntu_remove_edit-clear_icon.diff
deleted file mode 100644
index 30d831c..0000000
--- a/debian/patches/kubuntu_remove_edit-clear_icon.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-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
deleted file mode 100644
index ca47e76..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-kubuntu_remove_edit-clear_icon.diff
--
parley packaging
More information about the pkg-kde-commits
mailing list