[SCM] KDevelop packaging branch, master, updated. debian/4.5.2-1-6-g9bbe3cc

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/kdevelop.git;a=commitdiff;h=9bbe3cc

The following commit has been merged in the master branch:
commit 9bbe3cc56df2393e5dccfd49b8b8071c268f2f6e
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jan 19 10:52:22 2014 +0100

    install kdevelop.xpm using .install file
---
 debian/changelog        | 1 +
 debian/kdevelop.install | 1 +
 debian/rules            | 4 ----
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e5f2f02..f04cf2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ kdevelop (4:4.6.0-0r1) UNRELEASED; urgency=medium
   * Bump kdevplatform-dev build dependency to 1.6.0.
   * Add the pkg-config build dependency.
   * Update install files.
+  * Install kdevelop.xpm using .install file.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 19 Jan 2014 09:41:18 +0100
 
diff --git a/debian/kdevelop.install b/debian/kdevelop.install
index 3c513c2..aeff8e8 100644
--- a/debian/kdevelop.install
+++ b/debian/kdevelop.install
@@ -1,3 +1,4 @@
+debian/kdevelop.xpm usr/share/pixmaps/
 usr/bin/kdevelop
 usr/bin/kdevelop!
 usr/lib/kde4/*
diff --git a/debian/rules b/debian/rules
index f799d56..09f21b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,10 +2,6 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 
-binary-install/kdevelop::
-	install -D -p -m0644 debian/kdevelop.xpm \
-		debian/kdevelop/usr/share/pixmaps/kdevelop.xpm
-
 # Work around a conflict with kapptemplate
 binary-install/kdevelop-data::
 	find debian/$(cdbs_curpkg) -type f -name qmake_qt4guiapp.tar.bz2 | xargs rm -f

-- 
KDevelop packaging