[SCM] krecipes packaging branch, master, updated. upstream/2.0_beta2-13-g522a964

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/krecipes.git;a=commitdiff;h=522a964

The following commit has been merged in the master branch:
commit 522a964a1f857084d6b306bdb5e20de5aa08b2f9
Author: Pino Toscano <pino at debian.org>
Date:   Thu Sep 11 10:56:10 2014 +0200

    krecipes.xpm: install via .install file
    
    ... instead of copying it in rules
---
 debian/changelog             | 1 +
 debian/krecipes-data.install | 2 +-
 debian/rules                 | 3 ---
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 06145e9..2e03f02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ krecipes (2.0~beta2-4) UNRELEASED; urgency=medium
     - bump the debhelper build dependency to 9
     - bump compat to 9
   * Sort the .install files, and strip the debian/tmp prefix.
+  * Install krecipes.xpm via .install file, instead of copying it in rules.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Thu, 11 Sep 2014 10:28:36 +0200
 
diff --git a/debian/krecipes-data.install b/debian/krecipes-data.install
index 1fdade7..fc89695 100644
--- a/debian/krecipes-data.install
+++ b/debian/krecipes-data.install
@@ -1,5 +1,5 @@
+debian/krecipes.xpm usr/share/pixmaps/krecipes.xpm
 usr/share/icons
 usr/share/kde4
 usr/share/locale
 usr/share/mime
-usr/share/pixmaps
diff --git a/debian/rules b/debian/rules
index 437cc66..7c90f65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,9 +10,6 @@ DEB_KDE_LINK_WITH_AS_NEEDED := yes
 include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-install/krecipes-data::
-	install -D -m 644 -g root -o root debian/krecipes.xpm debian/tmp/usr/share/pixmaps/krecipes.xpm
-
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]

-- 
krecipes packaging