[SCM] breeze packaging branch, master, updated. debian/5.3.2-2-10-g1c6590c

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/breeze.git;a=commitdiff;h=a60dd47

The following commit has been merged in the master branch:
commit a60dd472df9becfae87fb055b668edc7f4ae727a
Author: Felix Geyer <fgeyer at debian.org>
Date:   Wed Jul 29 22:42:25 2015 +0200

    Move the breeze qt4 plugin to the default qt4 plugin path instead of adding a symlink.
---
 debian/changelog | 5 +++++
 debian/rules     | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 88dc68c..90e7724 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 breeze (4:5.3.2-3~) UNRELEASED; urgency=medium
 
+  [ Maximiliano Curia ]
   * Add a symlink for kde-style-breeze-qt4 in the qt4 plugins dirs.
     (Closes: #792119)
 
+  [ Felix Geyer ]
+  * Move the breeze qt4 plugin to the default qt4 plugin path instead
+    of adding a symlink.
+
  -- Maximiliano Curia <maxy at debian.org>  Mon, 13 Jul 2015 10:33:37 +0200
 
 breeze (4:5.3.2-2) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 0d0ac15..b48f7f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,8 +19,14 @@ override_dh_auto_build:
 override_dh_auto_install:
 	$(overridden_command)
 	$(overridden_command) --builddirectory=build-qt4
+
+override_dh_install:
+	dh_install
 	mkdir -p debian/kde-style-breeze-qt4/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/plugins/styles/
-	ln -s /usr/lib/kde4/plugins/styles/breeze.so debian/kde-style-breeze-qt4/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/plugins/styles/
+	mv debian/kde-style-breeze-qt4/usr/lib/kde4/plugins/styles/breeze.so \
+	    debian/kde-style-breeze-qt4/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/plugins/styles/
+	rmdir debian/kde-style-breeze-qt4/usr/lib/kde4/plugins/styles \
+	    debian/kde-style-breeze-qt4/usr/lib/kde4/plugins
 
 override_dh_strip:
 	$(overridden_command) --dbg-package=breeze-dbg

-- 
breeze packaging