[neon/kf6/kf6-breeze-icons/Neon/delme] debian: port to kf6

Carlos De Maine null at kde.org
Mon Mar 20 22:05:13 GMT 2023


Git commit de320b9ca3fccdc13f4a287e65ce3521c0e9dfac by Carlos De Maine.
Committed on 20/03/2023 at 22:05.
Pushed by carlosdem into branch 'Neon/delme'.

port to kf6

M  +1    -1    debian/breeze-icon-theme-rcc.install
M  +2    -478  debian/changelog
D  +0    -1    debian/compat
M  +9    -9    debian/control
M  +7    -4    debian/rules

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

diff --git a/debian/breeze-icon-theme-rcc.install b/debian/breeze-icon-theme-rcc.install
index 6370642..a615936 100644
--- a/debian/breeze-icon-theme-rcc.install
+++ b/debian/breeze-icon-theme-rcc.install
@@ -1 +1 @@
-usr/share/icons/*/*.rcc
+usr/kf6/share/icons/*/*.rcc
diff --git a/debian/changelog b/debian/changelog
index 39285f3..619950e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,481 +1,5 @@
-breeze-icons (4:5.92.0-0neon) focal; urgency=medium
+kf6-breeze-icons (0.0-0neon) UNRELEASED; urgency=medium
 
   * New release
 
- -- Neon CI <neon at kde.org>  Tue, 15 Mar 2022 13:19:03 +0000
-
-breeze-icons (4:5.91.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Tue, 11 Jan 2022 15:08:09 +0000
-
-breeze-icons (4:5.89.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Sat, 11 Dec 2021 10:25:12 +0000
-
-breeze-icons (4:5.88.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Mon, 15 Nov 2021 21:52:14 +0000
-
-breeze-icons (4:5.87.0-0neon) focal; urgency=medium
-
-  [ Jonathan Riddell ]
-  * new release
-
-  [ Neon CI ]
-  * New release
-
- -- Neon CI <neon at kde.org>  Sat, 02 Oct 2021 21:47:05 +0000
-
-breeze-icons (4:5.85.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Sun, 15 Aug 2021 10:07:52 +0000
-
-breeze-icons (4:5.84.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Mon, 12 Jul 2021 12:17:03 +0000
-
-breeze-icons (4:5.83.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 11 Jun 2021 21:23:04 +0000
-
-breeze-icons (4:5.82.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Tue, 11 May 2021 10:14:13 +0000
-
-breeze-icons (4:5.81.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Sun, 11 Apr 2021 18:06:30 +0000
-
-breeze-icons (4:5.80.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Sun, 14 Mar 2021 14:09:44 +0000
-
-breeze-icons (4:5.79.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 11 Feb 2021 13:56:12 +0000
-
-breeze-icons (4:5.78.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Sat, 09 Jan 2021 12:09:16 +0000
-
-breeze-icons (4:5.77.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Sat, 12 Dec 2020 14:01:34 +0000
-
-breeze-icons (4:5.76.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 19 Nov 2020 11:29:04 +0000
-
-breeze-icons (4:5.75.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 09 Oct 2020 13:39:13 +0000
-
-breeze-icons (4:5.74.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 10 Sep 2020 13:21:50 +0000
-
-breeze-icons (4:5.73.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Mon, 17 Aug 2020 19:12:14 +0000
-
-breeze-icons (4:5.72.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Sat, 11 Jul 2020 15:10:45 +0000
-
-breeze-icons (4:5.71.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 12 Jun 2020 18:46:50 +0000
-
-breeze-icons (4:5.70.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 08 May 2020 15:38:41 +0000
-
-breeze-icons (4:5.69.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Sat, 11 Apr 2020 18:17:25 +0000
-
-breeze-icons (4:5.68.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 13 Mar 2020 13:17:56 +0000
-
-breeze-icons (4:5.67.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 07 Feb 2020 21:02:45 +0000
-
-breeze-icons (4:5.66.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 10 Jan 2020 13:19:49 +0000
-
-breeze-icons (4:5.65.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 13 Dec 2019 17:35:43 +0000
-
-breeze-icons (4:5.64.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 08 Nov 2019 13:54:33 +0000
-
-breeze-icons (4:5.63.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 11 Oct 2019 21:13:01 +0000
-
-breeze-icons (4:5.62.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Mon, 16 Sep 2019 11:11:56 +0000
-
-breeze-icons (4:5.61.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Sun, 11 Aug 2019 18:49:16 +0000
-
-breeze-icons (4:5.60.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Sat, 13 Jul 2019 15:40:28 +0000
-
-breeze-icons (4:5.59.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 07 Jun 2019 18:06:37 +0000
-
-breeze-icons (4:5.58.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 10 May 2019 13:12:19 +0000
-
-breeze-icons (4:5.57.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 12 Apr 2019 08:39:33 +0000
-
-breeze-icons (4:5.56.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Sat, 09 Mar 2019 15:55:10 +0000
-
-breeze-icons (4:5.55.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Sun, 10 Feb 2019 22:29:36 +0000
-
-breeze-icons (4:5.54.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 11 Jan 2019 15:42:37 +0000
-
-breeze-icons (4:5.53.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 12 Dec 2018 10:30:38 +0000
-
-breeze-icons (4:5.52.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Sat, 10 Nov 2018 16:14:56 +0000
-
-breeze-icons (4:5.51.0-1) unstable; urgency=medium
-
-  * New upstream release (5.50.0).
-  * Update build-deps and deps with the info from cmake
-  * Drop upstream applied patch
-  * New upstream release (5.51.0).
-  * Update build-deps and deps with the info from cmake
-  * ScalableTest, add "scalable" firewall icons
-  * Rediff patches
-  * Release to unstable
-
- -- Maximiliano Curia <maxy at debian.org>  Wed, 07 Nov 2018 17:16:18 +0100
-
-breeze-icons (4:5.49.0-1) unstable; urgency=medium
-
-  [ Maximiliano Curia ]
-  * New revision
-  * New upstream release (5.48.0).
-  * Update build-deps and deps with the info from cmake
-  * Update copyright information
-  * New upstream release (5.49.0).
-  * Update build-deps and deps with the info from cmake
-  * Release to unstable
-
-  [ Helmut Grohne ]
-  * Mark all packages Multi-Arch: foreign (Closes: 902211)
-
- -- Maximiliano Curia <maxy at debian.org>  Fri, 17 Aug 2018 16:17:58 +0200
-
-breeze-icons (4:5.47.0-1) unstable; urgency=medium
-
-  * New upstream release (5.47.0).
-  * Update build-deps and deps with the info from cmake
-  * Release to unstable
-
- -- Maximiliano Curia <maxy at debian.org>  Fri, 15 Jun 2018 12:07:51 +0200
-
-breeze-icons (4:5.46.0-1) unstable; urgency=medium
-
-  * New upstream release (5.46.0).
-  * Update build-deps and deps with the info from cmake
-  * Bump Standards-Version to 4.1.4.
-  * Use https for the debian/copyright
-  * Add patch: ScalableTest-add-scalable-plasma-browser-integration.patch
-  * Release to unstable
-
- -- Maximiliano Curia <maxy at debian.org>  Thu, 17 May 2018 22:14:17 +0200
-
-breeze-icons (4:5.45.0-1) unstable; urgency=medium
-
-  * New upstream release (5.45.0).
-  * Update build-deps and deps with the info from cmake
-  * Release to unstable
-
- -- Maximiliano Curia <maxy at debian.org>  Sat, 05 May 2018 08:09:53 +0200
-
-breeze-icons (4:5.44.0-1) sid; urgency=medium
-
-  * New upstream release (5.44.0).
-  * Update build-deps and deps with the info from cmake
-  * Release to sid
-
- -- Maximiliano Curia <maxy at debian.org>  Wed, 21 Mar 2018 14:40:14 +0100
-
-breeze-icons (4:5.43.0-1) experimental; urgency=medium
-
-  * Use the salsa canonical urls
-  * New upstream release (5.43.0).
-  * Update build-deps and deps with the info from cmake
-  * Drop upstream applied patches
-  * Release to experimental
-
- -- Maximiliano Curia <maxy at debian.org>  Mon, 26 Feb 2018 11:42:56 +0100
-
-breeze-icons (4:5.42.0-2) sid; urgency=medium
-
-  * New revision
-  * Release to sid
-
- -- Maximiliano Curia <maxy at debian.org>  Sat, 10 Feb 2018 11:28:24 +0100
-
-breeze-icons (4:5.42.0-1) experimental; urgency=medium
-
-  * New upstream release (5.42.0).
-  * Add link options as-needed
-  * Bump debhelper build-dep and compat to 11.
-  * Build without build_stamp
-  * remove duplicate
-  * Ignore the svg files in .pc
-  * Update build-deps and deps with the info from cmake
-  * Bump Standards-Version to 4.1.3.
-  * Release to experimental
-
- -- Maximiliano Curia <maxy at debian.org>  Fri, 02 Feb 2018 12:04:26 +0100
-
-breeze-icons (4:5.41.0-1) experimental; urgency=medium
-
-  * New upstream release (5.38.0).
-  * Update build-deps and deps with the info from cmake
-  * New upstream release (5.41.0).
-  * Bump Standards-Version to 4.1.2.
-  * Update build-deps and deps with the info from cmake
-  * Release to experimental
-
- -- Maximiliano Curia <maxy at debian.org>  Fri, 15 Dec 2017 10:41:57 -0300
-
-breeze-icons (4:5.37.0-2) sid; urgency=medium
-
-  * New revision
-  * Bump Standards-Version to 4.1.0.
-  * Update upstream metadata
-  * Release to sid
-
- -- Maximiliano Curia <maxy at debian.org>  Sun, 03 Sep 2017 09:57:25 +0200
-
-breeze-icons (4:5.37.0-1) experimental; urgency=medium
-
-  * New upstream release (5.37.0).
-  * Update build-deps and deps with the info from cmake
-  * Bump Standards-Version to 4.0.1.
-  * wrap-and-sort
-  * Release to experimental
-
- -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Aug 2017 10:41:49 +0200
-
-breeze-icons (4:5.36.0-1) experimental; urgency=medium
-
-  [ Pino Toscano ]
-  * Enable the RCC icon resources:
-    - pass -DBINARY_ICONS_RESOURCE=ON to cmake to explicitly enable them
-    - add a new breeze-icon-theme-rcc binary for *.rcc files
-  * Bump Standards-Version to 4.0.0, no changes required.
-
-  [ Maximiliano Curia ]
-  * New upstream release (5.35.0).
-  * Update build-deps and deps with the info from cmake
-  * watch: Use https uris
-  * New upstream release (5.36.0).
-  * Update build-deps and deps with the info from cmake
-
-  [ Raymond Wooninck ]
-  * Add signing key
-  * also include signing-key
-
- -- Maximiliano Curia <maxy at debian.org>  Sun, 09 Jul 2017 23:40:57 +0200
-
-breeze-icons (4:5.28.0-1) unstable; urgency=medium
-
-  [ Automatic packaging ]
-  * Update build-deps and deps with the info from cmake
-  * Refresh patches
-
-  [ Maximiliano Curia ]
-  * New upstream release (5.28)
-
- -- Maximiliano Curia <maxy at debian.org>  Fri, 18 Nov 2016 15:56:53 +0100
-
-breeze-icons (4:5.27.0-1) unstable; urgency=medium
-
-  [ Automatic packaging ]
-  * Update build-deps and deps with the info from cmake
-
-  [ Maximiliano Curia ]
-  * New upstream release (5.27)
-  * Add upstream patch: remove-duplicates.patch
-
- -- Maximiliano Curia <maxy at debian.org>  Sat, 15 Oct 2016 16:47:24 +0200
-
-breeze-icons (4:5.26.0-1) unstable; urgency=medium
-
-  [ Automatic packaging ]
-  * Update build-deps and deps with the info from cmake
-
-  [ Maximiliano Curia ]
-  * Update build dependencies
-
- -- Maximiliano Curia <maxy at debian.org>  Thu, 29 Sep 2016 11:54:50 +0200
-
-breeze-icons (4:5.25.0-2) unstable; urgency=medium
-
-  * Team upload.
-  * De-duplicate common files:
-    - copy the symlink_duplicates.sh script from oxygen-icon5, and use it
-      in rules
-    - add the fdupes build dependency
-  * Add the hicolor-icon-theme dependency, as base of the icon themes.
-  * Do not use the ${shlibs:Depends} substvar.
-
- -- Pino Toscano <pino at debian.org>  Sat, 27 Aug 2016 16:34:19 +0200
-
-breeze-icons (4:5.25.0-1) unstable; urgency=medium
-
-  [ Automatic packaging ]
-  * Update build-deps and deps with the info from cmake
-
- -- Maximiliano Curia <maxy at debian.org>  Thu, 18 Aug 2016 17:20:33 +0200
-
-breeze-icons (4:5.23.0-1) unstable; urgency=medium
-
-  [ Automatic packaging ]
-  * Update build-deps and deps with the info from cmake
-
- -- Maximiliano Curia <maxy at debian.org>  Sat, 18 Jun 2016 08:02:32 +0200
-
-breeze-icons (4:5.22.0-2) unstable; urgency=medium
-
-  * Make the icon theme arch:all
-
- -- Maximiliano Curia <maxy at debian.org>  Sat, 28 May 2016 16:42:38 +0200
-
-breeze-icons (4:5.22.0-1) unstable; urgency=medium
-
-  [ Automatic packaging ]
-  * Update build-deps and deps with the info from cmake
-
- -- Maximiliano Curia <maxy at debian.org>  Thu, 19 May 2016 00:17:46 +0200
-
-breeze-icons (4:5.21.0-1) experimental; urgency=medium
-
-  [ Automatic packaging ]
-  * Update build-deps and deps with the info from cmake
-  * Bump Standards-Version to 3.9.8
-
- -- Maximiliano Curia <maxy at debian.org>  Thu, 05 May 2016 15:07:24 +0200
-
-breeze-icons (4:5.19.0-1) experimental; urgency=medium
-
-  * New upstream release (5.19.0).
-
- -- Maximiliano Curia <maxy at debian.org>  Sat, 13 Feb 2016 15:16:42 +0100
-
-breeze-icons (4:5.18.0-1) experimental; urgency=medium
-
-  [ Jonathan Riddell ]
-  * Initial package, split upstream from breeze
-  * Keep epoch so the binary package can still install
-  * Remove oxygen-icon-theme depend, now inherits hicolor
-
-  [ Maximiliano Curia ]
-  * New upstream release (5.17)
-  * New upstream release (5.18.0).
-
- -- Maximiliano Curia <maxy at debian.org>  Wed, 27 Jan 2016 13:34:43 +0100
+ -- Jonathan Esk-Riddell <jr at jriddell.org>  Mon, 12 Dec 2022 13:04:30 +0000
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 7450293..0b30dbb 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,14 @@
-Source: breeze-icons
+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 (>= 3.0~),
-               debhelper (>= 11~),
-               extra-cmake-modules (>= 5.51.0~),
+Build-Depends: cmake,
+               debhelper-compat (= 13),
                fdupes,
+               kf6-extra-cmake-modules,
                libxml2-utils,
-               pkg-kde-tools,
+               pkg-kde-tools-neon,
                qt6-core-dev,
                python3-lxml
 Standards-Version: 4.1.4
@@ -16,21 +16,21 @@ 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
 
-Package: breeze-icon-theme
+Package: kf6-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 is the default icon theme for the KDE Plasma 6 desktop.
  .
  This package is part of the Breeze theme module.
 
-Package: breeze-icon-theme-rcc
+Package: kf6-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
+ Breeze is the default icon theme for the KDE Plasma 6 desktop. This package
  contains the icons in RCC format.
  .
  This package is part of the Breeze theme module.
diff --git a/debian/rules b/debian/rules
index 1a91ae6..43af6be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,12 @@
 #!/usr/bin/make -f
-
-export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
+# -*- makefile -*-
 
 %:
-	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
+	dh $@ --with kf6 --buildsystem kf6
+
+override_dh_shlibdeps:
+	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/
+
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DBINARY_ICONS_RESOURCE=ON
@@ -16,4 +19,4 @@ 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
+	bash $(CURDIR)/debian/symlink_duplicates.sh $(CURDIR)/debian/breeze-icon-theme $(CURDIR)/debian/breeze-icon-theme/usr/kf6/share/icons


More information about the Neon-commits mailing list