[neon/kde/libkscreen/Neon/unstable] debian: lint it green
Carlos De Maine
null at kde.org
Tue Dec 12 04:22:08 GMT 2023
Git commit d4e209e417e3dc5bcf059fc3b50f32378f3f4f29 by Carlos De Maine.
Committed on 12/12/2023 at 05:22.
Pushed by carlosdem into branch 'Neon/unstable'.
lint it green
M +58 -35 debian/control
M +0 -45 debian/copyright
D +0 -20 debian/libkf6screen-dev.acc.in
M +1 -1 debian/libkf6screen-doc.install
M +3 -2 debian/rules
https://invent.kde.org/neon/kde/libkscreen/-/commit/d4e209e417e3dc5bcf059fc3b50f32378f3f4f29
diff --git a/debian/control b/debian/control
index fbf3866..f42afbc 100644
--- a/debian/control
+++ b/debian/control
@@ -33,16 +33,11 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/libkscreen.git
Package: libkf6screen-bin
Architecture: any
Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: kscreen (<< 4:5.14),
- libkf5screen5,
- libkf5screen6,
- libkf5screen7,
- libkf5screen8,
- libpowerdevilcore2 (<< 4:5.14),
- plasma-workspace (<< 4:5.7),
- powerdevil (<< 4:5.12)
-Replaces: libkf5screen5, libkf5screen6, libkf5screen7, libkf5screen8
+Depends: qt6-base,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Breaks: libkf5screen-bin (<< ${source:Version}~ciBuild)
+Replaces: libkf5screen-bin (<< ${source:Version}~ciBuild)
Description: library for screen management - helpers
The KDE multiple monitor support is trying be as smart as possible
adapting the behavior of it to each use case making the configuration
@@ -53,7 +48,8 @@ Description: library for screen management - helpers
Package: libkf6screen-dev
Section: libdevel
Architecture: any
-Depends: libkf6screen8 (= ${binary:Version}),
+Depends: libkf6screen-bin (= ${binary:Version}),
+ libkf6screen8 (= ${binary:Version}),
libkf6screendpms8 (= ${binary:Version}),
qt6-base-dev,
${misc:Depends}
@@ -66,25 +62,14 @@ Description: library for screen management - development files
.
This package contains the files necessary for development.
-Package: libkf5screen-dev
-Section: oldlibs
-Architecture: any
-Depends: libkf6screen-dev (>= ${source:Version}~ciBuild)
-Description: Dummy transitional package.
- .
- This package can be safely removed.
-
Package: libkf6screen8
Architecture: any
Multi-Arch: same
-Breaks: kscreen (<< 4:5.14),
- libkf5screen7 (<< ${source:Version}~ciBuild),
- libkf5screen8 (<< ${source:Version}~ciBuild),
- libpowerdevilcore2 (<< 4:5.14),
- plasma-workspace (<< 4:5.7),
- powerdevil (<< 4:5.12)
-Conflicts: libkf5screen8 (<< ${source:Version}~ciBuild),
-Depends: libkf6screen-bin, ${misc:Depends}, ${shlibs:Depends}
+Depends: libkf6screen-bin,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Breaks: libkf5screen8 (<< ${source:Version}~ciBuild),
+Replaces: libkf5screen8 (<< ${source:Version}~ciBuild),
Description: library for screen management - shared library
The KDE multiple monitor support is trying be as smart as possible
adapting the behavior of it to each use case making the configuration
@@ -95,12 +80,11 @@ Description: library for screen management - shared library
Package: libkf6screendpms8
Architecture: any
Multi-Arch: same
-Breaks: kscreen (<< 4:5.14),
- libkf5screendpms8 (<< ${source:Version}~ciBuild),
- libpowerdevilcore2 (<< 4:5.14),
- plasma-workspace (<< 4:5.7),
- powerdevil (<< 4:5.12)
-Depends: libkf6screen-bin, ${misc:Depends}, ${shlibs:Depends}
+Depends: libkf6screen-bin,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Breaks: libkf5screendpms8 (<< ${source:Version}~ciBuild),
+Replaces: libkf5screendpms8 (<< ${source:Version}~ciBuild),
Description: dpms library for screen management - shared library
The KDE multiple monitor support is trying be as smart as possible
adapting the behavior of it to each use case making the configuration
@@ -110,12 +94,51 @@ Description: dpms library for screen management - shared library
Package: libkf6screen-doc
Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends}
Section: doc
+Multi-Arch: foreign
+Depends: libkf6screen-dev, ${misc:Depends}
+Breaks: libkf5screend-doc (<< ${source:Version}~ciBuild),
+Replaces: libkf5screen-doc (<< ${source:Version}~ciBuild),
Description: library for screen management - shared library
The KDE multiple monitor support is trying be as smart as possible
adapting the behavior of it to each use case making the configuration
of monitors as simple as plugging them to your computer.
.
This package contains the qch documentation files.
+
+## transitionals below
+
+Package: libkf5screen-bin
+Section: oldlibs
+Architecture: any
+Depends: libkf6screen-bin (>= ${source:Version}~ciBuild), ${misc:Depends}
+Description: Dummy transitional package.
+ This package can be safely removed.
+
+Package: libkf5screen-dev
+Section: oldlibs
+Architecture: any
+Depends: libkf6screen-dev (>= ${source:Version}~ciBuild), ${misc:Depends}
+Description: Dummy transitional package.
+ This package can be safely removed.
+
+Package: libkf5screen8
+Section: oldlibs
+Architecture: any
+Depends: libkf6screen8 (>= ${source:Version}~ciBuild), ${misc:Depends}
+Description: Dummy transitional package.
+ This package can be safely removed.
+
+Package: libkf5screendpms8
+Section: oldlibs
+Architecture: any
+Depends: libkf6screen8 (>= ${source:Version}~ciBuild), ${misc:Depends}
+Description: Dummy transitional package.
+ This package can be safely removed.
+
+Package: libkf5screen-doc
+Section: oldlibs
+Architecture: any
+Depends: libkf6screen-doc (>= ${source:Version}~ciBuild), ${misc:Depends}
+Description: Dummy transitional package.
+ This package can be safely removed.
diff --git a/debian/copyright b/debian/copyright
index 162a1fe..edf6226 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,51 +9,6 @@ Copyright: 2012-2014, Alejandro Fiestas Olivares <afiestas at kde.org>
2012-2014, Sebastian Kügler <sebas at kde.org>
License: LGPL-2.1+
-Files: COPYING
- COPYING.LIB
- backends/xrandr1.1/wrapper.h
- tests/testplugandplay.cpp
-Copyright: 1989-1991, Free Software Foundation, Inc
- 2012-2013, Martin Gräßlin <mgraesslin at kde.org>
- 2014, Sebastian Kügler <sebas at kde.org>
-License: GPL-2+
- This program 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 program 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, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- .
- 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: backends/xrandr1.1/fixx11h.h
-Copyright: 2003, Lubos Lunak <l.lunak at kde.org>
-License: Expat
- 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 above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
- .
- 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.1+
diff --git a/debian/libkf6screen-dev.acc.in b/debian/libkf6screen-dev.acc.in
deleted file mode 100644
index cdbef2b..0000000
--- a/debian/libkf6screen-dev.acc.in
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<descriptor>
-
-<version>
- 5.1.1
-</version>
-
-<headers>
- /usr/include/KF5/KScreen/
-</headers>
-
-<libs>
- /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF5Screen.so
-</libs>
-
-<gcc_options>
- -fPIC
-</gcc_options>
-
-</descriptor>
diff --git a/debian/libkf6screen-doc.install b/debian/libkf6screen-doc.install
index 8b13789..5829e83 100644
--- a/debian/libkf6screen-doc.install
+++ b/debian/libkf6screen-doc.install
@@ -1 +1 @@
-
+usr/lib/qt6/doc/
diff --git a/debian/rules b/debian/rules
index 47c772a..195ecf5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,5 +5,6 @@
%:
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 -- \
+ -DBUILD_QCH=ON
\ No newline at end of file
More information about the Neon-commits
mailing list