[neon/kf6/kf6-breeze-icons/Neon/release_jammy] debian: Revert "meh"

Thu May 23 00:50:23 BST 2024

Git commit 85ba7cb624e7b7eb7fe26eafa6525bea6bf784e3 by Jonathan Riddell.
Committed on 22/05/2024 at 23:40.
Pushed by jriddell into branch 'Neon/release_jammy'.

Revert "meh"

This reverts commit 7cf041627aa5fd33ef2094fdb66599b4f39d648e.

A  +1    -0    debian/.gitattributes
M  +1    -1    debian/changelog
M  +6    -11   debian/control
M  +2    -2    debian/kf6-breeze-icon-theme-dev.install
M  +1    -1    debian/kf6-breeze-icon-theme-rcc.install
M  +1    -1    debian/kf6-breeze-icon-theme.install
M  +2    -11   debian/rules
M  +47   -25   debian/upstream/signing-key.asc

https://invent.kde.org/neon/kf6/kf6-breeze-icons/-/commit/85ba7cb624e7b7eb7fe26eafa6525bea6bf784e3

diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index b403ea0..8659f32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kf6-breeze-icons (6.2.80~20240522really6.1.0-0neon) jammy; urgency=medium
+kf6-breeze-icons (6.2.80~20240522-0neon) jammy; urgency=medium
 
   * New release
 
diff --git a/debian/control b/debian/control
index f957eb2..3aeb1d4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
 Source: kf6-breeze-icons
 Section: kde
 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,
                debhelper-compat (= 13),
@@ -9,12 +10,11 @@ Build-Depends: cmake,
                libxml2-utils,
                pkg-kde-tools-neon,
                python3-lxml,
-               qt6-base-dev
+               qt6-base-dev,
 Standards-Version: 4.6.2
 Homepage: https://projects.kde.org/projects/kde/frameworks/breeze-icons
-Vcs-Git: https://invent.kde.org/neon/kf6/kf6-breeze-icons.git
-Vcs-Browser: https://invent.kde.org/neon/kf6/kf6-breeze-icons
-Maintainer: Neon CI <neon at kde.org>
+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
 
 Package: kf6-breeze-icon-theme
 Architecture: any
@@ -45,12 +45,7 @@ Package: kf6-breeze-icon-theme-dev
 Architecture: any
 Section: kde
 X-Neon-MergedPackage: true
-Depends: hicolor-icon-theme,
-         kf6-breeze-icon-theme (= ${binary:Version}),
-         kf6-breeze-icon-theme-rcc,
-         qt6-base-dev,
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: kf6-breeze-icon-theme (= ${binary:Version}), kf6-breeze-icon-theme-rcc, qt6-base-dev, hicolor-icon-theme, ${misc:Depends}, ${shlibs:Depends}
 Description: Default Plasma icon theme -development files
  This is the default icon theme for the KDE Plasma 6 desktop.
  .
@@ -58,7 +53,7 @@ Description: Default Plasma icon theme -development files
 
 Package: breeze-icon-theme
 Architecture: all
-Depends: hicolor-icon-theme, kf6-breeze-icon-theme, ${misc:Depends}
+Depends: kf6-breeze-icon-theme, hicolor-icon-theme, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
diff --git a/debian/kf6-breeze-icon-theme-dev.install b/debian/kf6-breeze-icon-theme-dev.install
index 59bfe89..a1739be 100644
--- a/debian/kf6-breeze-icon-theme-dev.install
+++ b/debian/kf6-breeze-icon-theme-dev.install
@@ -1,3 +1,3 @@
-usr/include/KF6/BreezeIcons
+usr/include/KF6/BreezeIcons/
 usr/lib/*/cmake/
-usr/lib/*/libKF6BreezeIcons.so
+usr/lib/*/libKF6BreezeIcons.so
\ No newline at end of file
diff --git a/debian/kf6-breeze-icon-theme-rcc.install b/debian/kf6-breeze-icon-theme-rcc.install
index 6370642..ef702ab 100644
--- a/debian/kf6-breeze-icon-theme-rcc.install
+++ b/debian/kf6-breeze-icon-theme-rcc.install
@@ -1 +1 @@
-usr/share/icons/*/*.rcc
+#usr/share/icons/*/*.rcc
diff --git a/debian/kf6-breeze-icon-theme.install b/debian/kf6-breeze-icon-theme.install
index 2b92e81..871ef6a 100644
--- a/debian/kf6-breeze-icon-theme.install
+++ b/debian/kf6-breeze-icon-theme.install
@@ -1,4 +1,4 @@
 usr/share/icons/breeze/
 usr/share/icons/breeze-dark/
-usr/lib/*/libKF6BreezeIcons.so.6.*.0
 usr/lib/*/libKF6BreezeIcons.so.6
+usr/lib/*/libKF6BreezeIcons.so.6.*
diff --git a/debian/rules b/debian/rules
index 600f57e..e605ba2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,14 +6,5 @@ export DH_VERBOSE = 1
 %:
 	dh $@ --with kf6 --buildsystem kf6 --no-parallel
 
-override_dh_auto_configure:
-	dh_auto_configure -- -DBINARY_ICONS_RESOURCE=ON -DWITH_ICON_GENERATION=ON -DICONS_LIBRARY=ON
-
-override_dh_auto_install:
-	dh_auto_install --destdir=debian/tmp/
-
-override_dh_install:
-	dh_install --sourcedir=debian/kf6-breeze-icon-theme
-	rm debian/kf6-breeze-icon-theme/usr/share/icons/*/*.rcc
-#	find $(CURDIR)/debian/kf6-breeze-icon-theme -type d -print0 |xargs -0 rmdir --ignore-fail-on-non-empty
-#	bash $(CURDIR)/debian/symlink_duplicates.sh $(CURDIR)/debian/kf6-breeze-icon-theme $(CURDIR)/debian/kf6-breeze-icon-theme/usr/share/icons
+override_dh_link:
+	true
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index 43ecac8..7e6fa0b 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -24,29 +24,51 @@ bFnnckVsj6xBGuPIgrlGk2V9RTqiReJTsU/RdypVzO6rshEyLWS0TCzygHrZk3IS
 4pORUt6itUlJSCdvZRDa3AhPUkQt3Iso0S8oZWzP+zlXMvYFvF1pgtzi9cPqbgJJ
 4uQJ858uqw0jwjFM3CYyrVrLWNY2kPIPVbeTH6Bh6nQp4Q0KXnDubcUbbpd2xMHl
 tHEI6gma9ATha+u/OMjYgXpkAP8UECcF1CD+wIC4c4pbSFnOmhRai92MjbMkb905
-kYzU/1S3qZ9nuQINBGFVmzkBEACU19R68g6TnrnpUCywwCTVZJkY2JVpSlQGYXjd
-gC61Kt0vjMCA7sdckSqfE0qTIjxHmDB78F2cpSfDmKEgd8GYdxMuUqTWS7UWRD3R
-bvDUBRLG/KMig+6HGe+NzxOv+vwCcnvM3LAZP/k/UMbVAOYQFARvm136UOaTnq1B
-vsnDAMoO+US72OWVXzTWcgbJLoLq0HKfCrA0fDKnnh0HPGQ+58qPfoWuatZwg+O6
-0oIE2d5qLrSxAPuUJjaWD1ylNlSbunQNbgHmM1eKK36RUNOc1fDGPWQ1E0+eZuZY
-5HfnHFDliZ5rsJsKrqOFhANcRu7BpOWGVSBqms+NjkCUOGwU7ir9jgIBDxdju38u
-ri3BCDSYPrDrsuFPSLIab/BuaEcbzLsgAAooMbMHFy2WBqw1WtJatGhg+naoJjha
-xbecaOgU140ObnqQdRd2PpLmIRAze5oFvj9TL6NEvkkhWoOW3MUHbV/sgilvN4pu
-L+J+ligowbwhny+yfk0XtXZk9nU0/en9UYUFvyQgxi9l+KE6wyl1N74RHvELtPOp
-60lOMCB/CAF+q5D3XI4g9LNv3kyCBp40Fq5XiVcMOMamNxq7vc8+2IaSzRiySeQ6
-9hddhKf7Rm7x4ZjW3bVxFu0DAQi4CSAsz3A+/g0z4GDrZDqZyNy0VxcXTE9ZZrih
-NvoTvQARAQABiQI2BBgBCgAgFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmFVmzkC
-GwwACgkQ11dEg7tXsY0EZRAAh9MbJCBdbVa5h2m3AAbYG+BMZsOeSESQCuy0bM7z
-7WShfSafeGE/KhJuAKZtBHopLA1VCF74h3vNwwDxAG+8qbzGxuuzV+Tx18vyiY3d
-Wlf30L1ypq6fO53fuZSgPB0gzjCoDcJeSDg7FdTcqMzjumys3ThvOBTHB1gwzQWu
-eZ8CSxKvd34J7CQ7bUpxjDvgZpI3gbdW37F11KUgLF+HtD1bO9SzTs9rdpGpFesS
-joF2pl2C0plzlB40xgb+CW4GL7T253x1xKejCeas2E4ImmD2ONuOqp7Q31x456cQ
-r/WqJe7A4lIDRVza2/Nd0qGBCEILmMlIMD+YpZdQv+WO/d6Gv65wt4O+ufjudKcI
-sIryz7bVC28zOiAwmVmnDhOkAakAkIJVTMa9xyFVtquBfj9z9mg6W7LLw96tAVXT
-6yKkQRHkQ2/36uBgsrl2z+k+mFWm4IS2RGgDfTtrq4nl/LGwyb9T0MDuFZ8FUPUN
-PK28Z1iYWb0tTda5Qc5aCraZcFr0aR4PYToBvt5mvrV+TGvfdVzva/JjcRwtFnwo
-RUqSlBSJqC4WqZmkB73i16MljvT0+4v2upmud4JKw2KTowhZjbGLlBgrAMxuDYNv
-953PoIbKKuD9uwdPkCrkuL1XQsBDWsHgW9DQ4q0bObr0ZBxJWUzLj/5Ew1iFLz5O
-oS4=
-=yOFv
+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
+=8K+3
 -----END PGP PUBLIC KEY BLOCK-----
