[SCM] oxygen-icons5 packaging branch, master, updated. 65aa7282c9308bff4eb18902a83fc503e5f60030

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/oxygen-icons5.git;a=commitdiff;h=799c35b

The following commit has been merged in the master branch:
commit 799c35b503cabfb94ce639579b1fe18286ab093a
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Aug 19 14:33:33 2014 +0200

    Fix x-office-document.png in 22x22. (Closes: #677675)
---
 debian/changelog | 1 +
 debian/control   | 6 +++++-
 debian/rules     | 6 ++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1df1c7d..17f2878 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 oxygen-icons (4:4.14.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Fix x-office-document.png in 22x22. (Closes: #677675)
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 18 Aug 2014 18:26:41 +0200
 
diff --git a/debian/control b/debian/control
index 5529b1e..26fe149 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,11 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            Modestas Vainius <modax at debian.org>,
            Maximiliano Curia <maxy at debian.org>,
            Eshat Cakar <info at eshat.de>
-Build-Depends: cmake, debhelper (>= 9), fdupes, pkg-kde-tools (>= 0.14)
+Build-Depends: cmake,
+               debhelper (>= 9),
+               fdupes,
+               imagemagick,
+               pkg-kde-tools (>= 0.14)
 Standards-Version: 3.9.5
 Homepage: http://www.kde.org/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/oxygen-icons.git
diff --git a/debian/rules b/debian/rules
index 2bc7498..f66755a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,12 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
+override_dh_auto_build:
+	convert 64x64/mimetypes/x-office-document.png \
+	    -scale "22x22" \
+	    22x22/mimetypes/x-office-document.png
+	$(overridden_command)
+
 override_dh_auto_install:
 	$(overridden_command) --destdir=debian/tmp
 

-- 
oxygen-icons5 packaging