[neon/kde/breeze-icons/Neon/delme] debian: sync to debina/ubuntu for transitionals

Carlos De Maine null at kde.org
Thu Jan 9 08:48:14 GMT 2025


Git commit 0304580633c35b243728e489e183c61d504541f7 by Carlos De Maine.
Committed on 09/01/2025 at 08:48.
Pushed by carlosdem into branch 'Neon/delme'.

sync to debina/ubuntu for transitionals

D  +0    -1    debian/.gitattributes
D  +0    -1    debian/breeze-icon-theme-rcc.install
D  +0    -1    debian/compat
M  +17   -26   debian/control
D  +0    -20   debian/patches/Ignore-the-svg-files-in-.pc.patch
M  +9    -12   debian/rules
D  +0    -27   debian/symlink_duplicates.sh

https://invent.kde.org/neon/kde/breeze-icons/-/commit/0304580633c35b243728e489e183c61d504541f7

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/breeze-icon-theme-rcc.install b/debian/breeze-icon-theme-rcc.install
deleted file mode 100644
index 6370642..0000000
--- a/debian/breeze-icon-theme-rcc.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/icons/*/*.rcc
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index b62a020..11928e3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,36 +1,27 @@
 Source: breeze-icons
-Section: kde
+Section: oldlibs
 Priority: optional
-Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake (>= 3.0~),
-               debhelper (>= 11~),
-               extra-cmake-modules (>= 5.51.0~),
-               fdupes,
-               libxml2-utils,
-               pkg-kde-tools,
-               qtbase5-dev (>= 5.8.0~),
-               python3-lxml
-Standards-Version: 4.1.4
-Homepage: https://projects.kde.org/projects/kde/frameworks/breeze-icons
-Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/breeze-icons
-Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/breeze-icons.git
+Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Uploaders: Aurélien COUDERC <coucouf at debian.org>,
+           Norbert Preining <norbert at preining.info>,
+Build-Depends: debhelper-compat (= 13),
+Standards-Version: 4.6.1
+Homepage: https://invent.kde.org/frameworks/breeze-icons
+Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/breeze-icons
+Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/breeze-icons
+Rules-Requires-Root: no
 
 Package: breeze-icon-theme
 Architecture: all
 Multi-Arch: foreign
-Depends: hicolor-icon-theme, ${misc:Depends}
-Description: Default Plasma icon theme
- This is the default icon theme for the KDE Plasma 5 desktop.
- .
- This package is part of the Breeze theme module.
+Depends: kf6-breeze-icon-theme, ${misc:Depends},
+Description: Default Plasma icon theme - transitional dummy package
+ Empty transitional dummy package to upgrade to the KF6 version.
 
 Package: breeze-icon-theme-rcc
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
-Description: RCC resources for the breeze icon theme
- Breeze is the default icon theme for the KDE Plasma 5 desktop. This package
- contains the icons in RCC format.
- .
- This package is part of the Breeze theme module.
+Depends: kf6-breeze-icon-theme-rcc, ${misc:Depends},
+Description: RCC resources for the breeze icon theme - transitional dummy package
+ Empty transitional dummy package to upgrade to the KF6 version.
diff --git a/debian/patches/Ignore-the-svg-files-in-.pc.patch b/debian/patches/Ignore-the-svg-files-in-.pc.patch
deleted file mode 100644
index dc7e37a..0000000
--- a/debian/patches/Ignore-the-svg-files-in-.pc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Maximiliano Curia <maxy at gnuservers.com.ar>
-Date: Fri, 26 Jan 2018 13:54:30 -0300
-Subject: Ignore the svg files in .pc
-
----
- validate_svg.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: breeze-icons/validate_svg.sh
-===================================================================
---- breeze-icons.orig/validate_svg.sh
-+++ breeze-icons/validate_svg.sh
-@@ -1,6 +1,6 @@
- #!/bin/sh
- 
--find "${1:-.}" -type f -name '*.svg' -exec xmllint --noout {} + 2> xmlerrors
-+find "${1:-.}" -path ./.pc -prune -or -type f -name '*.svg' -exec xmllint --noout {} + 2> xmlerrors
- if [ -s xmlerrors ]; then
-     cat xmlerrors
-     rm xmlerrors
diff --git a/debian/rules b/debian/rules
index 1a91ae6..7446b5f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,16 @@
 #!/usr/bin/make -f
 
-export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
-
 %:
-	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
+	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DBINARY_ICONS_RESOURCE=ON
-	mkdir -p obj-x86_64-linux-gnu/icons/res
+	:
 
-override_dh_auto_install:
-	dh_auto_install --destdir=debian/breeze-icon-theme
+override_dh_auto_build:
+	:
 
-override_dh_install:
-	dh_install --sourcedir=debian/breeze-icon-theme
-	rm debian/breeze-icon-theme/usr/share/icons/*/*.rcc
-	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
+override_dh_auto_test:
+	:
+
+override_dh_auto_install:
+	:
\ No newline at end of file
diff --git a/debian/symlink_duplicates.sh b/debian/symlink_duplicates.sh
deleted file mode 100644
index 06cc272..0000000
--- a/debian/symlink_duplicates.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/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"


More information about the Neon-commits mailing list