[neon/neon-packaging/breeze5/Neon/unstable] debian: modernise, add conflicts to breeze6 to not-installed
Carlos De Maine
null at kde.org
Sat May 27 22:41:56 BST 2023
Git commit 2a0c020c2f6c380ebc8c6338408848b575dd75d5 by Carlos De Maine.
Committed on 27/05/2023 at 21:41.
Pushed by carlosdem into branch 'Neon/unstable'.
modernise, add conflicts to breeze6 to not-installed
D +0 -1 debian/breeze5-cursor-theme.dirs
D +0 -7 debian/breeze5-cursor-theme.install
D +0 -30 debian/breeze5-cursor-theme.postinst
D +0 -15 debian/breeze5-cursor-theme.prerm
M +0 -2 debian/breeze5-dev.install
M +4 -5 debian/breeze5.install
D +0 -1 debian/breeze5.lintian-overrides
D +0 -1 debian/compat
M +31 -56 debian/control
D +0 -9 debian/kde-style-breeze5.install
D +0 -3 debian/kwin-style-breeze5.install
A +2 -0 debian/not-installed
D +0 -20 debian/wrapperthemes.sh
https://invent.kde.org/neon/neon-packaging/breeze5/-/commit/2a0c020c2f6c380ebc8c6338408848b575dd75d5
diff --git a/debian/breeze5-cursor-theme.dirs b/debian/breeze5-cursor-theme.dirs
deleted file mode 100644
index 9dd20b6..0000000
--- a/debian/breeze5-cursor-theme.dirs
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/icons/default
diff --git a/debian/breeze5-cursor-theme.install b/debian/breeze5-cursor-theme.install
deleted file mode 100644
index 07f5629..0000000
--- a/debian/breeze5-cursor-theme.install
+++ /dev/null
@@ -1,7 +0,0 @@
-# Do NOT remove these files, they are required by the postinst maintscript
-# These are generated by the wrapperthemes.sh call in debian/rules, please
-# fix that instead if this breaks.
-etc/X11/cursors/Breeze_Snow.theme
-etc/X11/cursors/breeze_cursors.theme
-usr/share/icons/Breeze_Snow/
-usr/share/icons/breeze_cursors/
diff --git a/debian/breeze5-cursor-theme.postinst b/debian/breeze5-cursor-theme.postinst
deleted file mode 100644
index b52cf34..0000000
--- a/debian/breeze5-cursor-theme.postinst
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-set -e
-
-TARGET=/usr/share/icons/default/index.theme
-ICONDIR=/etc/X11/cursors
-
-# breeze_cursors with 102 (DMZ+2) priority
-update-alternatives --install $TARGET x-cursor-theme \
- $ICONDIR/breeze_cursors.theme 102
-
-# Breeze_Snow with 41 (Oxygen+1) priority
-update-alternatives --install $TARGET x-cursor-theme \
- $ICONDIR/Breeze_Snow.theme 41
-
-case "$1" in
- configure)
- # On upgrade from a version that was badly managing the
- # x-cursor-theme, remove the old ones from the alternatives.
- version="$2"
- if [ -n "$version" ] && \
- dpkg --compare-versions "$version" lt "4:5.4.1-2~"; then
- update-alternatives --remove x-cursor-theme \
- /usr/share/icons/Breeze_Snow/index.theme || true
- update-alternatives --remove x-cursor-theme \
- /usr/share/icons/breeze_cursors/index.theme || true
- fi
- ;;
-esac
-
-#DEBHELPER#
diff --git a/debian/breeze5-cursor-theme.prerm b/debian/breeze5-cursor-theme.prerm
deleted file mode 100644
index 5686105..0000000
--- a/debian/breeze5-cursor-theme.prerm
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /bin/sh
-set -e
-
-ICONDIR=/etc/X11/cursors
-
-case "$1" in
- remove|deconfigure|failed-upgrade)
- update-alternatives --remove x-cursor-theme \
- $ICONDIR/breeze_cursors.theme
- update-alternatives --remove x-cursor-theme \
- $ICONDIR/Breeze_Snow.theme
- ;;
-esac
-
-#DEBHELPER#
diff --git a/debian/breeze5-dev.install b/debian/breeze5-dev.install
index ecc51c6..e69de29 100644
--- a/debian/breeze5-dev.install
+++ b/debian/breeze5-dev.install
@@ -1,2 +0,0 @@
-usr/lib/*/cmake/Breeze/BreezeConfig.cmake
-usr/lib/*/cmake/Breeze/BreezeConfigVersion.cmake
diff --git a/debian/breeze5.install b/debian/breeze5.install
index 95c7339..9520462 100644
--- a/debian/breeze5.install
+++ b/debian/breeze5.install
@@ -1,6 +1,5 @@
usr/bin/breeze-settings5
-usr/lib/*/kconf_update_bin
-usr/share/icons/hicolor/*/apps/breeze-settings.*
-usr/share/icons/hicolor/scalable/apps/breeze-settings.svgz
-usr/share/kconf_update
-usr/share/wallpapers/Next
+usr/lib/*/libbreezecommon5.so.5.
+usr/lib/*/libbreezecommon5.so.5.*
+usr/lib/*/qt5/plugins/styles/breeze.so
+usr/lib/*/qt5/plugins/plasma/kcms/systemsettings_qwidgets/breezestyleconfig.so
\ No newline at end of file
diff --git a/debian/breeze5.lintian-overrides b/debian/breeze5.lintian-overrides
deleted file mode 100644
index da943c6..0000000
--- a/debian/breeze5.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-breeze: binary-without-manpage usr/bin/breeze-settings5
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 11910bc..2456707 100644
--- a/debian/control
+++ b/debian/control
@@ -3,99 +3,74 @@ 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 (>= 2.8.12),
- debhelper (>= 11~),
- extra-cmake-modules (>= 5.30.0~),
+Build-Depends: cmake,
+ debhelper-compat (= 13),
+ extra-cmake-modules,
kirigami2-dev,
libfftw3-dev,
- libkf5config-dev (>= 5.2.0),
- libkf5configwidgets-dev (>= 5.2.0),
- libkf5coreaddons-dev (>= 5.2.0),
+ libkf5config-dev,
+ libkf5configwidgets-dev,
+ libkf5coreaddons-dev,
libkf5guiaddons-dev,
- libkf5i18n-dev (>= 5.2.0),
- libkf5iconthemes-dev (>= 5.2.2),
- libkf5kcmutils-dev (>= 5.2.0),
+ libkf5i18n-dev,
+ libkf5iconthemes-dev,
+ libkf5kcmutils-dev,
libkf5package-dev,
libkf5plasma-dev,
- libkf5service-dev (>= 5.2.0),
- libkf5style-dev (>= 5.2.0),
+ libkf5service-dev,
+ libkf5style-dev,
libkf5wayland-dev,
- libkf5windowsystem-dev (>= 5.2.0),
- libqt5x11extras5-dev (>= 5.4),
+ libkf5windowsystem-dev,
+ libqt5x11extras5-dev,
libx11-dev,
pkg-config,
- pkg-kde-tools (>= 0.15.15ubuntu1~),
- qtbase5-dev (>= 5.4),
+ pkg-kde-tools,
+ qtbase5-dev,
qtdeclarative5-dev
-Standards-Version: 4.1.4
+Standards-Version: 4.6.2
Homepage: https://projects.kde.org/projects/kde/workspace/breeze
Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/breeze
Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/breeze.git
Package: breeze5
Architecture: any
-Depends: breeze5-cursor-theme (= ${source:Version}),
- breeze-icon-theme,
- kde-style-breeze5 (= ${binary:Version}),
- kwin-style-breeze5 (= ${binary:Version}),
- ${misc:Depends},
+Depends: ${misc:Depends},
${shlibs:Depends}
-Suggests: orion-gtk-theme
-Breaks: kde-style-breeze (<< 4:5.2.2+git20150325),
- plasma-desktop (<< 4:5.14),
- plasma-integration (<< 5.14),
- plasma-look-and-feel-org-kde-breezedark-desktop (<< 4:5.15.0)
-Replaces: kde-style-breeze (<< 4:5.2.2+git20150325),
- plasma-look-and-feel-org-kde-breezedark-desktop (<< 4:5.15.0)
Description: Default Plasma theme (meta-package).
This is the default theme for the KDE Plasma desktop.
.
This package includes wallpapers, icons, cursors, KWin style and Qt
widget style for the Plasma 5 desktop.
- .
- This package is part of the KDE base workspace module.
-
-Package: breeze5-cursor-theme
-Architecture: all
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Default Plasma cursor theme.
- This is the default cursor theme for the KDE Plasma 5 desktop.
- .
- This package is part of the Breeze theme module.
Package: breeze5-dev
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: breeze5, ${misc:Depends}, ${shlibs:Depends}
Description: Default Plasma theme (development files).
This is the default theme for the KDE Plasma desktop.
.
This package includes development files.
- .
- This package is part of the KDE base workspace module.
+
+Package: breeze5-cursor-theme
+Architecture: all
+Depends: breeze5, ${misc:Depends}, ${shlibs:Depends}
+Description: Default Plasma cursor theme.
+Transitional dummy package.
+
Package: kde-style-breeze5
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libbreezecommon5-5 (<< 4:5.15.0)
-Replaces: libbreezecommon5-5 (<< 4:5.15.0)
+Depends: breeze5, ${misc:Depends}, ${shlibs:Depends}
Description: Widget style for Qt and KDE Software
- This is the default widget style for KDE's Plasma desktop.
- .
- This package is part of the Breeze theme module.
+ Transitional dummy package.
Package: kwin-style-breeze5
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: breeze5, ${misc:Depends}, ${shlibs:Depends}
Description: KWin Breeze Style
- This is the Breeze window manager style for the KDE Plasma 5 desktop.
- .
- This package is part of the Breeze theme module.
+ Transitional dummy package.
Package: kde-style-breeze-qt4
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: breeze5, ${misc:Depends}, ${shlibs:Depends}
Description: Widget style for Qt 4 and KDE Software - transitional
- This is the default widget style for KDE's Plasma desktop. This
- build has the plugin for with Qt 4.
- .
- Transitional dummy package which can be removed.
+ Transitional dummy package.
diff --git a/debian/kde-style-breeze5.install b/debian/kde-style-breeze5.install
deleted file mode 100644
index 59f756d..0000000
--- a/debian/kde-style-breeze5.install
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/lib/*/libbreezecommon5.so.5
-usr/lib/*/libbreezecommon5.so.5.*
-usr/lib/*/qt5/plugins/plasma/kcms/systemsettings_qwidgets/breezestyleconfig.so
-usr/lib/*/qt5/plugins/styles/breeze.so
-usr/share/QtCurve
-usr/share/applications/breezestyleconfig.desktop
-usr/share/color-schemes
-usr/share/kstyle
-usr/share/locale/*/*/breeze_style_config.mo
diff --git a/debian/kwin-style-breeze5.install b/debian/kwin-style-breeze5.install
deleted file mode 100644
index 28af4ce..0000000
--- a/debian/kwin-style-breeze5.install
+++ /dev/null
@@ -1,3 +0,0 @@
-#usr/lib/*/qt5/plugins/styles/breeze.so
-usr/share/locale/*/*/breeze_kwin_deco.mo
-usr/share/locale/*/LC_MESSAGES/breeze_kwin_deco.mo
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 0000000..80d3385
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,2 @@
+usr/share/
+/usr/lib/*/kconf_update_bin/
\ No newline at end of file
diff --git a/debian/wrapperthemes.sh b/debian/wrapperthemes.sh
deleted file mode 100755
index 4f3e983..0000000
--- a/debian/wrapperthemes.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-set -e
-
-ICONDIR=/usr/share/icons
-WRAPPERDIR=/etc/X11/cursors
-: ${CURDIR:=`pwd`}
-
-tmp="$(mktemp)"
-
-while [ $# -gt 0 ]; do
- theme=$1
- shift
-
- mkdir -p ${CURDIR}/debian/tmp${WRAPPERDIR}
- cd ${CURDIR}/debian/tmp${ICONDIR}
- grep -a -v Inherits ${CURDIR}/debian/tmp${ICONDIR}/${theme}/index.theme > "$tmp"
- echo "Inherits=${theme}" >> "$tmp"
- install -m 644 "$tmp" ${CURDIR}/debian/tmp${WRAPPERDIR}/${theme}.theme
- rm "$tmp"
-done
More information about the Neon-commits
mailing list