[neon/kde/kwin/Neon/unstable] debian: merge common and data, lints
Carlos De Maine
null at kde.org
Thu Nov 9 00:44:33 GMT 2023
Git commit 86bfdef0c951fc3fddd4fec793d050142565c715 by Carlos De Maine.
Committed on 09/11/2023 at 01:44.
Pushed by carlosdem into branch 'Neon/unstable'.
merge common and data, lints
M +33 -55 debian/control
M +0 -198 debian/copyright
M +10 -0 debian/kwin-common.install
M +10 -0 debian/kwin-common.lintian-overrides
D +0 -10 debian/kwin-data.install
M +1 -0 debian/kwin-wayland.lintian-overrides
M +1 -0 debian/kwin-x11.lintian-overrides
D +0 -0 debian/patches/series
https://invent.kde.org/neon/kde/kwin/-/commit/86bfdef0c951fc3fddd4fec793d050142565c715
diff --git a/debian/control b/debian/control
index 56687ce..23cbab0 100644
--- a/debian/control
+++ b/debian/control
@@ -99,14 +99,24 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kwin.git
Package: kwin-common
Architecture: any
Depends: hwdata,
+ kf6-kdeclarative,
kf6-kglobalaccel,
+ kf6-kirigami2,
kwin-data (= ${source:Version}),
+ plasma-framework6,
+ qml6-module-org-kde-kitemmodels,
+ qml6-module-org-kde-quickcharts,
+ qml6-module-org-kde-kquickcontrolsaddons,
qml6-module-qtmultimedia,
+ qml6-module-qtquick-controls,
+ qml6-module-qtquick-layouts,
+ qml6-module-qtquick-virtualkeyboard,
+ qml6-module-qtquick-window,
+ qml6-module-qtquick,
${misc:Depends},
${shlibs:Depends}
Recommends: plasma-desktop,
- qt6-virtualkeyboard-plugin
-Suggests: kwin-addons
+ python3,
Description: KDE window manager, common files
KWin (pronounced as one syllable "kwin") is the window
manager for the KDE Plasma Desktop. It gives you complete
@@ -118,32 +128,6 @@ Description: KDE window manager, common files
.
This package is part of the KDE base workspace module.
-Package: kwin-data
-Architecture: all
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: kf6-kdeclarative,
- kf6-kirigami2,
- plasma-framework6,
- python3,
- qml6-module-org-kde-kquickcontrolsaddons,
- qml6-module-qtmultimedia,
- qml6-module-qtquick-controls,
- qml6-module-qtquick-layouts,
- qml6-module-qtquick-virtualkeyboard,
- qml6-module-qtquick-window,
- qml6-module-qtquick,
-Breaks: kwin-common (<< ${source:Version}~ciBuild)
-Replaces: kwin-common (<< ${source:Version}~ciBuild)
-Description: KDE window manager data files
- KWin (pronounced as one syllable "kwin") is the window
- manager for the KDE Plasma Desktop. It gives you complete
- control over your windows, making sure they're not in the way
- but aid you in your task. It paints the window decoration,
- the bar on top of every window with (configurable) buttons
- like close, maximize and minimize. It also handles placing
- of windows and switching between them.
- .
- This package contains the data files
Package: kwin-dev
Section: libdevel
@@ -158,8 +142,6 @@ Depends: kf6-kconfig-dev,
qt6-base-dev,
${misc:Depends},
${shlibs:Depends}
-Breaks: kde-workspace-dev
-Replaces: kde-workspace-dev
Description: KDE window manager - devel files
KWin (pronounced as one syllable "kwin") is the window
manager for the KDE Plasma Desktop. It gives you complete
@@ -173,7 +155,8 @@ Description: KDE window manager - devel files
Package: kwin-wayland
Architecture: any
-Depends: kwin-common (= ${binary:Version}),
+Depends: kwayland6,
+ kwin-common (= ${binary:Version}),
libcap2-bin [linux-any],
libwayland-server0,
xwayland,
@@ -213,61 +196,56 @@ Description: KDE window manager, X11 version
.
This package is part of the KDE base workspace module.
-Package: libkwineffects14
-Section: libs
-Architecture: any
+Package: kwin-data
+Architecture: all
Depends: ${misc:Depends}, ${shlibs:Depends}
+Provides: kwin-common
+Description: transitional package
+ This is a dummy package which can be removed.
+
+Package: libkwineffects14
+Architecture: all
+Depends: ${misc:Depends}
Description: transitional package
This is a dummy package which can be removed.
Package: libkwinglutils14
-Section: libs
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Architecture: all
+Depends: ${misc:Depends}
Description: transitional package
This is a dummy package which can be removed.
Package: kwin-wayland-backend-fbdev
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Architecture: all
+Depends: ${misc:Depends}
Provides: kwin-wayland-backend
-Priority: extra
-Section: oldlibs
Description: transitional package
This is a dummy package which can be removed.
Package: kwin-wayland-backend-x11
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Architecture: all
+Depends: ${misc:Depends}
Provides: kwin-wayland-backend
-Priority: extra
-Section: oldlibs
Description: transitional package
This is a dummy package which can be removed.
Package: kwin-wayland-backend-virtual
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Architecture: all
+Depends: ${misc:Depends}
Provides: kwin-wayland-backend
-Priority: extra
-Section: oldlibs
Description: transitional package
This is a dummy package which can be removed.
Package: kwin-wayland-backend-wayland
-Architecture: any
+Architecture: all
Depends: ${misc:Depends}
Provides: kwin-wayland-backend
-Priority: extra
-Section: oldlibs
Description: transitional package
This is a dummy package which can be removed.
Package: kwin-wayland-backend-drm
-Architecture: any
+Architecture: all
Depends: ${misc:Depends}
Provides: kwin-wayland-backend
-Priority: extra
-Section: oldlibs
Description: transitional package
This is a dummy package which can be removed.
diff --git a/debian/copyright b/debian/copyright
index baed2b1..e40c851 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -74,204 +74,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: autotests/onscreennotificationtest.cpp
- autotests/onscreennotificationtest.h
- kcmkwin/kwindecoration/declarative-plugin/buttonsmodel.cpp
- kcmkwin/kwindecoration/declarative-plugin/buttonsmodel.h
- kcmkwin/kwindecoration/declarative-plugin/plugin.cpp
- kcmkwin/kwindecoration/declarative-plugin/plugin.h
- kcmkwin/kwindecoration/declarative-plugin/previewbridge.cpp
- kcmkwin/kwindecoration/declarative-plugin/previewbridge.h
- kcmkwin/kwindecoration/declarative-plugin/previewbutton.cpp
- kcmkwin/kwindecoration/declarative-plugin/previewbutton.h
- kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp
- kcmkwin/kwindecoration/declarative-plugin/previewclient.h
- kcmkwin/kwindecoration/declarative-plugin/previewitem.cpp
- kcmkwin/kwindecoration/declarative-plugin/previewitem.h
- kcmkwin/kwindecoration/declarative-plugin/previewsettings.cpp
- kcmkwin/kwindecoration/declarative-plugin/previewsettings.h
- kcmkwin/kwindecoration/decorationmodel.cpp
- kcmkwin/kwindecoration/decorationmodel.h
- kcmkwin/kwindecoration/kcm.cpp
- kcmkwin/kwindecoration/kcm.h
- kcmkwin/kwindecoration/qml/*
- onscreennotification.cpp
- onscreennotification.h
- osd.cpp
- osd.h
- popup_input_filter.cpp
- popup_input_filter.h
- qml/onscreennotification/plasma/main.qml
- qml/outline/*
- scripts/enforcedeco/*
- tests/libinputtest.cpp
- tests/normalhintsbasesizetest.cpp
- tests/pointergesturestest.cpp
- tests/pointergesturestest.qml
- tests/screenedgeshowtest.cpp
- tests/unmapdestroytest.qml
- tests/waylandclienttest.cpp
- tests/waylandclienttest.h
- tests/x11shadowreader.cpp
-Copyright: 2014-2017, Martin Graesslin <mgraesslin at kde.org>
-License: GPL-2+3+KDEeV
-
-Files: effects/dialogparent/package/metadata.desktop
- effects/eyeonscreen/package/metadata.desktop
- effects/fade/package/metadata.desktop
- effects/fadedesktop/package/metadata.desktop
- effects/frozenapp/package/metadata.desktop
- effects/login/package/metadata.desktop
- effects/logout/package/metadata.desktop
- effects/maximize/package/metadata.desktop
- effects/morphingpopups/package/metadata.desktop
- effects/scalein/package/metadata.desktop
- effects/translucency/package/metadata.desktop
- effects/windowaperture/package/metadata.desktop
- effects/wobblywindows/wobblywindows.cpp
- effects/wobblywindows/wobblywindows.h
- plugins/kdecorations/aurorae/themes/plastik/package/metadata.desktop
- po/bg/kcmkwindecoration.po
- po/bg/kcmkwinrules.po
- po/bg/kcmkwm.po
- po/bg/kwin.po
- po/bg/kwin_clients.po
- scripts/desktopchangeosd/metadata.desktop
- scripts/enforcedeco/metadata.desktop
- scripts/minimizeall/metadata.desktop
- scripts/synchronizeskipswitcher/metadata.desktop
- scripts/videowall/metadata.desktop
-Copyright: 2008, Cédric Borgese <cedric.borgese at gmail.com>
-License: GPL
-
-License: GPL
- This file is licensed under the GPL.
- --
- On Debian systems, the complete text of the GNU General Public License
- can be found in `/usr/share/common-licenses/GPL'.
-
-Files: cmake/*
-Copyright: 2014, Alex Merry <alex.merry at kde.org>
- 2014, Fredrik Höglund <fredrik at kde.org>
- 2006-2007, Laurent Montel <montel at kde.org>
- 2014-2016, Martin Gräßlin <mgraesslin at kde.org>
- 2010, Rafael Fernández López <ereslibre at kde.org>
- 2016, Takahiro Hashimoto <kenya888 at gmail.com>
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
- 1. Redistributions of source code must retain the copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Files: kcmkwin/kwinscreenedges/screenpreviewwidget.cpp
- kcmkwin/kwinscreenedges/screenpreviewwidget.h
- packageplugins/aurorae/aurorae.cpp
- packageplugins/aurorae/aurorae.h
- packageplugins/decoration/decoration.cpp
- packageplugins/decoration/decoration.h
- packageplugins/scripts/scripts.cpp
- packageplugins/scripts/scripts.h
- packageplugins/windowswitcher/windowswitcher.cpp
- packageplugins/windowswitcher/windowswitcher.h
-Copyright: 2017, Demitrius Belai <demitriusbelai at gmail.com>
- 2017, Marco Martin <mart at kde.org>
- 2009, Marco Martin <notmart at gmail.com>
-License: LGPL-2+
-
-Files: kcmkwin/kwincompositing/test/modeltest.cpp
- kcmkwin/kwincompositing/test/modeltest.h
-Copyright: 2013, Digia Plc and/or its subsidiary(-ies)
-License: GPL-3_or_LGPL-2.1-QTexception-1.1
- * $QT_BEGIN_LICENSE:LGPL$
- * Commercial License Usage
- * Licensees holding valid commercial Qt licenses may use this file in
- * accordance with the commercial license agreement provided with the
- * Software or, alternatively, in accordance with the terms contained in
- * a written agreement between you and Digia. For licensing terms and
- * conditions see http://qt.digia.com/licensing. For further information
- * use the contact form at http://qt.digia.com/contact-us.
- *
- * GNU Lesser General Public License Usage
- * Alternatively, this file may be used under the terms of the GNU Lesser
- * General Public License version 2.1 as published by the Free Software
- * Foundation and appearing in the file LICENSE.LGPL included in the
- * packaging of this file. Please review the following information to
- * ensure the GNU Lesser General Public License version 2.1 requirements
- * will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
- *
- * In addition, as a special exception, Digia gives you certain additional
- * rights. These rights are described in the Digia Qt LGPL Exception
- * version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
- *
- * GNU General Public License Usage
- * Alternatively, this file may be used under the terms of the GNU
- * General Public License version 3.0 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file. Please review the following information to
- * ensure the GNU General Public License version 3.0 requirements will be
- * met: http://www.gnu.org/copyleft/gpl.html.
- *
- *
- * $QT_END_LICENSE$
- --
- On Debian systems, the complete text of the GNU General Public License
- version 3 can be found in `/usr/share/common-licenses/GPL-3', likewise, the
- complete text of the GNU Lesser General Public License version 2.1 can be
- found in `/usr/share/common-licenses/LGPL-2.1'.
-
-Files: plugins/platforms/hwcomposer/egl_hwcomposer_backend.cpp
- plugins/platforms/hwcomposer/egl_hwcomposer_backend.h
- plugins/platforms/hwcomposer/hwcomposer_backend.cpp
- plugins/platforms/hwcomposer/hwcomposer_backend.h
- plugins/platforms/hwcomposer/logging.cpp
- plugins/platforms/hwcomposer/logging.h
- plugins/platforms/hwcomposer/screens_hwcomposer.cpp
- plugins/platforms/hwcomposer/screens_hwcomposer.h
-Copyright: 2015, Martin Gräßlin <mgraesslin at kde.org>
-License: GPL-3+
-
-Files: killer/killer.cpp
-Copyright: 2003, Lubos Lunak <l.lunak at kde.org>
-License: Expat
-
-Files: scripting/timer.cpp
-Copyright: 2007, Richard J. Moore <rich at kde.org>
-License: LGPL-2
-
-Files: doc/en/windowspecific/index.docbook
-Copyright: see the UserBase https://userbase.kde.org/index.php?title=KWin_Rules&action=history
- Lauri.Watts
-License: GFDL-1.2+
-
-License: GFDL-1.2+
- Permission is granted to copy, distribute and/or modify this document
- under the terms of the GNU Free Documentation License, Version 1.2
- or any later version published by the Free Software Foundation;
- with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
- A copy of the license is included in the section entitled "GNU
- Free Documentation License".
- --
- The complete text of the GNU Free Documentation License version 1.2
- can be found in `/usr/share/common-licenses/GFDL-1.2'.
-
Files: debian/*
Copyright: 2014, Scarlett Clark <scarlett at scarlettgatelyclark.com>
License: GPL-2+
diff --git a/debian/kwin-common.install b/debian/kwin-common.install
index 98791de..010c144 100644
--- a/debian/kwin-common.install
+++ b/debian/kwin-common.install
@@ -22,4 +22,14 @@ usr/lib/*/qt6/plugins/plasma/kcms/systemsettings_qwidgets/kcm_kwintabbox.so
usr/lib/*/qt6/plugins/plasma/kcms/systemsettings_qwidgets/kcm_kwintouchscreen.so
usr/lib/*/qt6/plugins/plasma/kcms/systemsettings_qwidgets/kwincompositing.so
usr/lib/systemd/user/
+usr/share/applications/
+usr/share/config.kcfg/
+usr/share/kconf_update/
+usr/share/doc/*/*/kcontrol/
+usr/share/icons/*/*/apps/kwin.*
+usr/share/knotifications6/kwin.notifyrc
+usr/share/knsrcfiles/
+usr/share/krunner/dbusplugins/kwin-runner-windows.desktop
+usr/share/kwin/
+usr/share/locale/*/*/*.mo
usr/share/qlogging-categories6/org_kde_kwin.categories
diff --git a/debian/kwin-common.lintian-overrides b/debian/kwin-common.lintian-overrides
index 509b170..63a827f 100644
--- a/debian/kwin-common.lintian-overrides
+++ b/debian/kwin-common.lintian-overrides
@@ -1 +1,11 @@
+kwin-common: desktop-command-not-in-package usr/share/applications/kcm_kwin_scripts.desktop systemsettings
+kwin-common: desktop-command-not-in-package usr/share/applications/kcm_kwin_virtualdesktops.desktop systemsettings
+kwin-common: desktop-command-not-in-package usr/share/applications/kcm_kwindecoration.desktop systemsettings
+kwin-common: desktop-command-not-in-package usr/share/applications/kcm_kwinoptions.desktop systemsettings
+kwin-common: desktop-command-not-in-package usr/share/applications/kcm_kwinrules.desktop systemsettings
+kwin-common: desktop-command-not-in-package usr/share/applications/kcm_kwintabbox.desktop systemsettings
+kwin-common: desktop-command-not-in-package usr/share/applications/kcm_kwinxwayland.desktop systemsettings
+kwin-common: desktop-command-not-in-package usr/share/applications/kcm_virtualkeyboard.desktop systemsettings
+kwin-common: desktop-command-not-in-package usr/share/applications/kwincompositing.desktop systemsettings
+kwin-common: lacks-unversioned-link-to-shared-library usr/lib/*/libkcmkwincommon.so.5.27.80 usr/lib/*/libkcmkwincommon.so
kwin-common: package-name-doesnt-match-sonames libkcmkwincommon6 libkwin6
\ No newline at end of file
diff --git a/debian/kwin-data.install b/debian/kwin-data.install
deleted file mode 100644
index 6ecec9c..0000000
--- a/debian/kwin-data.install
+++ /dev/null
@@ -1,10 +0,0 @@
-usr/share/applications/
-usr/share/config.kcfg/
-usr/share/kconf_update/
-usr/share/doc/*/*/kcontrol/
-usr/share/icons/*/*/apps/kwin.*
-usr/share/knotifications6/kwin.notifyrc
-usr/share/knsrcfiles/
-usr/share/krunner/dbusplugins/kwin-runner-windows.desktop
-usr/share/kwin/
-usr/share/locale/*/*/*.mo
diff --git a/debian/kwin-wayland.lintian-overrides b/debian/kwin-wayland.lintian-overrides
index e14bd26..411c7f7 100644
--- a/debian/kwin-wayland.lintian-overrides
+++ b/debian/kwin-wayland.lintian-overrides
@@ -1 +1,2 @@
kwin-wayland: binary-without-manpage usr/bin/kwin_wayland
+kwin-wayland: no-manual-page usr/bin/kwin_wayland_wrapper
\ No newline at end of file
diff --git a/debian/kwin-x11.lintian-overrides b/debian/kwin-x11.lintian-overrides
index 22da5d8..ac9f597 100644
--- a/debian/kwin-x11.lintian-overrides
+++ b/debian/kwin-x11.lintian-overrides
@@ -1 +1,2 @@
kwin-x11: binary-without-manpage usr/bin/kwin_x11
+kwin-x11: no-manual-page usr/bin/kwin
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e69de29..0000000
More information about the Neon-commits
mailing list