[neon/kde/libksysguard/Neon/unstable] debian: mega massive defaffing

Carlos De Maine null at kde.org
Sat Nov 25 06:26:13 GMT 2023


Git commit 760e15b2a498fba3af580c2f83b0b8e087ef9411 by Carlos De Maine.
Committed on 25/11/2023 at 07:26.
Pushed by carlosdem into branch 'Neon/unstable'.

mega massive defaffing

D  +0    -1    debian/.gitattributes
M  +151  -156  debian/control
M  +0    -40   debian/copyright
D  +0    -4    debian/libkf5sysguard-bin.install
D  +0    -24   debian/libkf5sysguard-dev.acc.in
R  +0    -0    debian/libksysguard-dev.install [from: debian/libkf5sysguard-dev.install - 100% similarity]
R  +4    -0    debian/libksysguard.install [from: debian/libkf5sysguard-data.install - 057% similarity]
R  +0    -0    debian/libksysguard.maintscript [from: debian/libkf5sysguard-data.maintscript - 100% similarity]
R  +0    -0    debian/libksysguard.postinst.in [from: debian/libkf5sysguard-bin.postinst.in - 100% similarity]
A  +1    -0    debian/libksysguard.qml-ignore

https://invent.kde.org/neon/kde/libksysguard/-/commit/760e15b2a498fba3af580c2f83b0b8e087ef9411

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/control b/debian/control
index c997fd2..5f5dad0 100644
--- a/debian/control
+++ b/debian/control
@@ -41,14 +41,32 @@ Homepage: https://projects.kde.org/projects/kde/workspace/libksysguard
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/plasma/libksysguard.git
 Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/libksysguard.git
 
-Package: libkf5sysguard-dev
+Package: libksysguard
+Section: kde
+Architecture: any
+Depends: kf6-kirigami2, 
+         kf6-kitemmodels, 
+         kf6-kquickcharts, 
+         ${misc:Depends}, 
+         ${shlibs:Depends}
+Replaces: ksysguardd, 
+          ksysguard-data, 
+          libkf5sysguard, 
+          libkf5sysguard5-data, 
+          libkf5sysguard5-bin, 
+Description: library for monitoring your system - shared library
+ libksysguard is a collection of libraries and qml6 modules 
+ to monitor various elements of your system.
+ .
+ This package contains the shared library, executables and data files
+
+Package: libksysguard-dev
 Section: libdevel
 Architecture: any
-Multi-Arch: no
 Depends: kf6-kconfig-dev,
          kf6-ki18n-dev,
          kf6-kiconthemes-dev,
-         libkf5sysguard-bin (= ${binary:Version}),
+         libksysguard (= ${binary:Version}),
          libksgrd10 (= ${binary:Version}),
          libksignalplotter10 (= ${binary:Version}),
          libksysguardsensorfaces2 (= ${binary:Version}),
@@ -58,232 +76,120 @@ Depends: kf6-kconfig-dev,
          libprocesscore10 (= ${binary:Version}),
          libprocessui10 (= ${binary:Version}),
          qt6-base-dev,
-         ${misc:Depends}
-Conflicts: kde-workspace-dev
-Description: library for monitoring your system - development files
- KSysGuard is a program to monitor various elements of your system, or any
- other remote system with the KSysGuard daemon (ksysgardd) installed.
- .
- This package contains the files necessary for development.
-
-Package: libkf5sysguard-bin
-Architecture: any
-Multi-Arch: no
-Depends: libkf5sysguard-data (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Replaces: ksysguard (<< 4:5.21.80), libkf5sysguard5 (<< 4:5.4.2)
-Description: library for monitoring your system - shared library
- KSysGuard is a program to monitor various elements of your system, or any
- other remote system with the KSysGuard daemon (ksysgardd) installed.
- .
- This package contains the shared library
-
-Package: libkf5sysguard-data
-Architecture: any
-Multi-Arch: same
-Depends: libkf5sysguard-bin (>= ${source:Version}), ${misc:Depends}
-Description: library for monitoring your system - shared library
- KSysGuard is a program to monitor various elements of your system, or any
- other remote system with the KSysGuard daemon (ksysgardd) installed.
+Replaces: libkf5sysguard-dev
+Description: library for monitoring your system - development files
+ libksysguard is a collection of libraries and qml6 modules 
+ to monitor various elements of your system.
  .
- This package contains the data files
-
-Package: libkf5sysguard5
-Architecture: all
-Depends: libkf5sysguard-bin (>= ${source:Version}), ${misc:Depends}
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: libksgrd9
-Architecture: all
-Depends: libksgrd10 (>= ${source:Version}), ${misc:Depends}
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
+ This package contains the files necessary for development.
 
 Package: libksgrd10
 Architecture: any
 Multi-Arch: same
-Depends: libkf5sysguard-data (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: libksysguard (= ${source:Version}), ${misc:Depends}, ${shibs:Depends}
 Replaces: libksgrd7, libksgrd8, libksgrd9
 Description: library for monitoring your system - shared library
- KSysGuard is a program to monitor various elements of your system, or any
- other remote system with the KSysGuard daemon (ksysgardd) installed.
+ libksysguard is a collection of libraries and qml6 modules 
+ to monitor various elements of your system.
  .
- This package contains the shared library
-
-Package: libkf5sysguard5-data
-Architecture: all
-Depends: libkf5sysguard-bin (>= ${source:Version}), ${misc:Depends}
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: libksignalplotter9
-Architecture: all
-Depends: libksignalplotter10 (>= ${source:Version}), ${misc:Depends}
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
+ This package contains the ksgrd shared library
 
 Package: libksignalplotter10
 Architecture: any
 Multi-Arch: same
-Depends: libkf5sysguard-bin (= ${binary:Version}),
-         libkf5sysguard-data (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: libksysguard (= ${source:Version}), ${misc:Depends}, ${shibs:Depends}
 Replaces: libksignalplotter7, libksignalplotter8, libksignalplotter9
 Description: library for monitoring your system - shared library
- KSysGuard is a program to monitor various elements of your system, or any
- other remote system with the KSysGuard daemon (ksysgardd) installed.
+ libksysguard is a collection of libraries and qml6 modules 
+ to monitor various elements of your system.
  .
- This package contains the shared library
-
-Package: libksysguardformatter1
-Architecture: all
-Depends: libksysguardformatter2 (>= ${source:Version}), ${misc:Depends}
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
+ This package contains the signalplotter shared library
 
 Package: libksysguardformatter2
 Architecture: any
 Multi-Arch: same
-Depends: libkf5sysguard-data (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: libksysguard (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
 Replaces:  libksysguardformatter1
 Description: library for monitoring your system - formatter shared library
- KSysGuard is a program to monitor various elements of your system, or any
- other remote system with the KSysGuard daemon (ksysgardd) installed.
+ libksysguard is a collection of libraries and qml6 modules 
+ to monitor various elements of your system.
  .
  This package contains the formatter shared library
 
-Package: libksysguardsensors1
-Architecture: all
-Depends: libksysguardsensors2 (>= ${source:Version}), ${misc:Depends}
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
 Package: libksysguardsensors2
 Architecture: any
 Multi-Arch: same
-Depends: libkf5sysguard-data (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: libksysguard (= ${source:Version}), ${misc:Depends}, ${shibs:Depends}
 Replaces: libksysguardsensors1
 Description: library for monitoring your system - sensors shared library
- KSysGuard is a program to monitor various elements of your system, or any
- other remote system with the KSysGuard daemon (ksysgardd) installed.
+ libksysguard is a collection of libraries and qml6 modules 
+ to monitor various elements of your system.
  .
  This package contains the sensors shared library
 
-Package: libksysguardsensorfaces1
-Architecture: all
-Depends: libksysguardsensorfaces2 (>= ${source:Version}), ${misc:Depends}
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
 Package: libksysguardsensorfaces2
 Architecture: any
 Multi-Arch: same
-Depends: libkf5sysguard-data (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: libksysguard (= ${source:Version}), ${misc:Depends}, ${shibs:Depends}
 Replaces: libksysguardsensorfaces1 
 Description: library for monitoring your system - sensor faces shared library
- KSysGuard is a program to monitor various elements of your system, or any
- other remote system with the KSysGuard daemon (ksysgardd) installed.
+ libksysguard is a collection of libraries and qml6 modules 
+ to monitor various elements of your system.
  .
  This package contains the sensor faces shared library
 
 Package: libksysguardsystemstats2
 Architecture: any
 Multi-Arch: same
-Depends: libkf5sysguard-data (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: libksysguard (= ${source:Version}), ${misc:Depends}, ${shibs:Depends}
 Replaces: libksysguardsystemstats1
 Description: library for monitoring your system - sensor faces shared library
- KSysGuard is a program to monitor various elements of your system, or any
- other remote system with the KSysGuard daemon (ksysgardd) installed.
+ libksysguard is a collection of libraries and qml6 modules 
+ to monitor various elements of your system.
  .
  This package contains the system stats shared library
 
 Package: liblsofui10
 Architecture: any
 Multi-Arch: same
-Depends: libkf5sysguard-data (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: libksysguard (= ${source:Version}), ${misc:Depends}, ${shibs:Depends}
 Replaces: liblsofui7, liblsofui8, liblsofui9
 Description: library for monitoring your system - shared library
- KSysGuard is a program to monitor various elements of your system, or any
- other remote system with the KSysGuard daemon (ksysgardd) installed.
+ libksysguard is a collection of libraries and qml6 modules 
+ to monitor various elements of your system.
  .
- This package contains the shared library
-
-Package: libprocessui9
-Architecture: all
-Depends: libprocessui10 (>= ${source:Version}), ${misc:Depends}
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: libprocesscore9
-Architecture: all
-Depends: libprocesscore10 (>= ${source:Version}), ${misc:Depends}
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
+ This package contains the lsofui shared library
 
 Package: libprocesscore10
 Architecture: any
 Multi-Arch: same
-Depends: libkf5sysguard-data (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: libksysguard (= ${source:Version}), ${misc:Depends}, ${shibs:Depends}
 Replaces: libprocesscore7, libprocesscore8, libprocesscore9
 Description: library for monitoring your system - shared library
- KSysGuard is a program to monitor various elements of your system, or any
- other remote system with the KSysGuard daemon (ksysgardd) installed.
+ libksysguard is a collection of libraries and qml6 modules 
+ to monitor various elements of your system.
  .
- This package contains the shared library
+ This package contains the processcore shared library
 
 Package: libprocessui10
 Architecture: any
 Multi-Arch: same
-Depends: libkf5sysguard-data (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: libksysguard (= ${source:Version}), ${misc:Depends}, ${shibs:Depends}
 Replaces: libprocessui7, libprocessui8, libprocessui9
 Description: library for monitoring your system - shared library
- KSysGuard is a program to monitor various elements of your system, or any
- other remote system with the KSysGuard daemon (ksysgardd) installed.
+ libksysguard is a collection of libraries and qml6 modules 
+ to monitor various elements of your system.
  .
- This package contains the shared library
-
-Package: ksysguard
-Architecture: all
-Depends: libkf5sysguard-bin (>= ${source:Version}), ${misc:Depends}
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: ksysguard-data
-Architecture: all
-Depends: libkf5sysguard-bin (>= ${source:Version}), ${misc:Depends}
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: ksysguardd
-Architecture: all
-Depends: libkf5sysguard-bin (>= ${source:Version}), ${misc:Depends}
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
+ This package contains the processui shared library
 
 Package: qml6-module-org-kde-ksysguard
 Architecture: any
 Multi-arch: same
 Depends: kf6-kirigami2,
          kf6-kdeclarative,
+         libksysguard6,
          qml6-module-org-kde-quickcharts,
          qml6-module-org-kde-kitemmodels,
          qml6-module-qtquick-layouts,
@@ -292,6 +198,95 @@ Depends: kf6-kirigami2,
          ${shlibs:Depends}
 Replaces: qml-module-org-kde-ksysguard
 Description: KSysGuard QtDeclarative QML Support
- Contains a plugin for QtDeclarative that provides
- support for using KSysGuard components written
- in QML.
+ Contains a plugin for QtDeclarative that provides support 
+ for using libksysguard components written in QML.
+
+Package: ksysguard-data
+Architecture: all
+Depends: libksysguard, ${misc:Depends}
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: ksysguardd
+Architecture: all
+Depends: libksysguard, ${misc:Depends}
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: libkf5sysguard-bin
+Architecture: all
+Depends: libksysguard, ${misc:Depends}
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: libkf5sysguard-data
+Architecture: all
+Depends: libksysguard, ${misc:Depends}
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: libkf5sysguard-dev
+Architecture: all
+Depends: libksysguard-dev, ${misc:Depends}
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: libksgrd9
+Architecture: all
+Depends: libksgrd10, ${misc:Depends}
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: libksignalplotter9
+Architecture: all
+Depends: libksignalplotter10, ${misc:Depends}
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: libksysguardformatter1
+Architecture: all
+Depends: libksysguardformatter2, ${misc:Depends}
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: libksysguardsensorfaces1
+Architecture: all
+Depends: libksysguardsensorfaces2, ${misc:Depends}
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: libksysguardsensors1
+Architecture: all
+Depends: libksysguardsensors2, ${misc:Depends}
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: libksysguardsystemstats1
+Architecture: all
+Depends: libksysguardsystemstats2, ${misc:Depends}
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: liblsofui9
+Architecture: all
+Depends: liblsofui10, ${misc:Depends}
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: libprocesscore9
+Architecture: all
+Depends: libprocesscore10, ${misc:Depends}
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: libprocessui9
+Architecture: all
+Depends: libprocessui10, ${misc:Depends}
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: qml-module-org-kde-ksysguard
+Architecture: all
+Depends: qml6-module-org-kde-ksysguard, ${misc:Depends}
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
\ No newline at end of file
diff --git a/debian/copyright b/debian/copyright
index 84cf743..d1fb899 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -65,46 +65,6 @@ License: LGPL-2.1+3+KDEeV
  the complete text of the GNU Lesser General Public License version 3 can be
  found in `/usr/share/common-licenses/LGPL-3'.
 
-Files: COPYING
-       processcore/atop_p.h
-Copyright: 1989-1991, Free Software Foundation, Inc
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General Public License
- version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-Files: scripts/smaps/sorttable.js
-Copyright: 2007, Stuart Langridge
-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
-
 Files: debian/*
 Copyright: 2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
 License: LGPL-2+
diff --git a/debian/libkf5sysguard-bin.install b/debian/libkf5sysguard-bin.install
deleted file mode 100644
index d66715d..0000000
--- a/debian/libkf5sysguard-bin.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/*/libexec/ksysguard/ksgrd_network_helper
-usr/lib/*/qt6/plugins/ksysguard/process/ksysguard_plugin_network.so
-usr/lib/*/qt6/plugins/ksysguard/process/ksysguard_plugin_nvidia.so
-usr/lib/*/libexec/kf6/kauth/ksysguardprocesslist_helper
diff --git a/debian/libkf5sysguard-dev.acc.in b/debian/libkf5sysguard-dev.acc.in
deleted file mode 100644
index 2a3244c..0000000
--- a/debian/libkf5sysguard-dev.acc.in
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<descriptor>
-
-<version>
-    5.2.0
-</version>
-
-<headers>
-    /usr/include/ksysguard/
-</headers>
-
-<libs>
-    /usr/lib/@@DEB_HOST_MULTIARCH@@/libksgrd.so
-    /usr/lib/@@DEB_HOST_MULTIARCH@@/libksignalplotter.so
-    /usr/lib/@@DEB_HOST_MULTIARCH@@/liblsofui.so
-    /usr/lib/@@DEB_HOST_MULTIARCH@@/libprocesscore.so
-    /usr/lib/@@DEB_HOST_MULTIARCH@@/libprocessui.so
-</libs>
-
-<gcc_options>
-    -fPIC
-</gcc_options>
-
-</descriptor>
diff --git a/debian/libkf5sysguard-dev.install b/debian/libksysguard-dev.install
similarity index 100%
rename from debian/libkf5sysguard-dev.install
rename to debian/libksysguard-dev.install
diff --git a/debian/libkf5sysguard-data.install b/debian/libksysguard.install
similarity index 57%
rename from debian/libkf5sysguard-data.install
rename to debian/libksysguard.install
index f9707e6..2940f53 100644
--- a/debian/libkf5sysguard-data.install
+++ b/debian/libksysguard.install
@@ -1,3 +1,7 @@
+usr/lib/*/libexec/ksysguard/ksgrd_network_helper
+usr/lib/*/qt6/plugins/ksysguard/process/ksysguard_plugin_network.so
+usr/lib/*/qt6/plugins/ksysguard/process/ksysguard_plugin_nvidia.so
+usr/lib/*/libexec/kf6/kauth/ksysguardprocesslist_helper
 usr/share/dbus-1/system-services/org.kde.ksysguard.processlisthelper.service
 usr/share/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf
 usr/share/knsrcfiles/
diff --git a/debian/libkf5sysguard-data.maintscript b/debian/libksysguard.maintscript
similarity index 100%
rename from debian/libkf5sysguard-data.maintscript
rename to debian/libksysguard.maintscript
diff --git a/debian/libkf5sysguard-bin.postinst.in b/debian/libksysguard.postinst.in
similarity index 100%
rename from debian/libkf5sysguard-bin.postinst.in
rename to debian/libksysguard.postinst.in
diff --git a/debian/libksysguard.qml-ignore b/debian/libksysguard.qml-ignore
new file mode 100644
index 0000000..d5f4811
--- /dev/null
+++ b/debian/libksysguard.qml-ignore
@@ -0,0 +1 @@
+org.kde.ksysguard*
\ No newline at end of file


More information about the Neon-commits mailing list