[SCM] oxygen-icons5 packaging branch, master, updated. debian/5.23.0-1-8-g1cac0f8

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 2b55fabfac463aea3761cf7900933126c45bada2
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jul 31 17:29:12 2016 +0200

    re-enable duplicates cleanup
    
    using the dh override that dhmk understand
---
 debian/changelog | 2 ++
 debian/rules     | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index dade812..13b143f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ oxygen-icons5 (5:5.24.0-0r1) UNRELEASED; urgency=medium
   * Remove symlinking of some icons to the hicolor icon theme: other than not
     working currently, it does not make sense for an icon theme to place stuff
     outside its own directory.
+  * Re-enable duplicates cleanup, but using the dh override that dhmk
+    understand.
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 31 Jul 2016 16:29:12 +0200
 
diff --git a/debian/rules b/debian/rules
index 6d7b0d9..33e11b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,8 @@ include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 override_dh_auto_install:
 	$(overridden_command) --destdir=debian/oxygen-icon-theme
 
-override_dh_install-indep:
+# dhmk does not support -indep variant!
+override_dh_install:
 	$(overridden_command)
 	find $(CURDIR)/debian/oxygen-icon-theme -type d -print0 |xargs -0 rmdir --ignore-fail-on-non-empty
 	bash $(CURDIR)/debian/symlink_duplicates.sh $(CURDIR)/debian/oxygen-icon-theme $(CURDIR)/debian/oxygen-icon-theme/usr/share/icons

-- 
oxygen-icons5 packaging