[SCM] breeze-icons packaging branch, master, updated. debian/5.25.0-1-4-gf940944

Pino Toscano pino at moszumanska.debian.org
Sat Aug 27 14:34:03 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/breeze-icons.git;a=commitdiff;h=69a1751

The following commit has been merged in the master branch:
commit 69a175190575e946729555227cf3c6ac947e06e4
Author: Pino Toscano <pino at debian.org>
Date:   Sat Aug 27 16:25:50 2016 +0200

    de-duplicate the icons
---
 debian/changelog             |  5 +++++
 debian/control               |  1 +
 debian/rules                 |  6 ++++++
 debian/symlink_duplicates.sh | 27 +++++++++++++++++++++++++++
 4 files changed, 39 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e1d7fde..4d19d80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 breeze-icons (4:5.25.0-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * De-duplicate common files:
+    - copy the symlink_duplicates.sh script from oxygen-icon5, and use it
+      in rules
+    - add the fdupes build dependency
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 27 Aug 2016 16:22:13 +0200
 
diff --git a/debian/control b/debian/control
index b9b4226..e070b0a 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 2.8.12),
                debhelper (>= 9),
                extra-cmake-modules (>= 5.25.0~),
+               fdupes,
                pkg-kde-tools,
                qtbase5-dev (>= 5.5.0~)
 Standards-Version: 3.9.8
diff --git a/debian/rules b/debian/rules
index b57f3e9..2722b4f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,9 @@
 #!/usr/bin/make -f
 
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
+
+# dhmk does not support -indep variant!
+override_dh_install:
+	$(overridden_command)
+	find $(CURDIR)/debian/breeze-icon-theme -type d -print0 |xargs -0 rmdir --ignore-fail-on-non-empty
+	bash $(CURDIR)/debian/symlink_duplicates.sh $(CURDIR)/debian/breeze-icon-theme $(CURDIR)/debian/breeze-icon-theme/usr/share/icons
diff --git a/debian/symlink_duplicates.sh b/debian/symlink_duplicates.sh
new file mode 100644
index 0000000..06cc272
--- /dev/null
+++ b/debian/symlink_duplicates.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# Recursively identifies duplicate files and symlinks them
+# Arguments:
+# $1 Root directory for absolute path calculation
+# $2 Directory for searching duplicate files
+
+echo "Symlinking duplicate files, this may take some time..."
+
+symlink_root=${1/%\//}
+symlink_search_path=$2
+
+target=""
+fdupes -r $symlink_search_path | while read line; do
+	if [ -z "$line" ]; then
+		# New group of duplicate files begins
+		target=""
+	elif [ -z "$target" ]; then
+		# Setting a new target for symlinking
+		target=${line/$symlink_root/}
+	else
+		# Symlink duplicate
+		ln -sf "$target" "$line"
+	fi
+done
+
+echo "...finished"

-- 
breeze-icons packaging



More information about the pkg-kde-commits mailing list