[neon/qt6/qt6-httpserver/Neon/stable] debian: rebase

Carlos De Maine null at kde.org
Sat Dec 9 03:34:11 GMT 2023


Git commit a929ffed669aeb88361e32500f6141f5c96a6ec7 by Carlos De Maine.
Committed on 09/12/2023 at 04:34.
Pushed by carlosdem into branch 'Neon/stable'.

rebase


(cherry picked from commit 3fe2dd66ab0b9fe454cd9360a5d9c2616fbf987f)

D  +0    -1    debian/.gitattributes
D  +0    -1    debian/.gitignore
M  +3    -3    debian/control
M  +1    -0    debian/qt6-httpserver-dev.install
M  +0    -1    debian/qt6-httpserver-doc.install
A  +1    -0    debian/qt6-httpserver.lintian-overrides

https://invent.kde.org/neon/qt6/qt6-httpserver/-/commit/a929ffed669aeb88361e32500f6141f5c96a6ec7

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/.gitignore b/debian/.gitignore
deleted file mode 100644
index 027271b..0000000
--- a/debian/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-files
diff --git a/debian/control b/debian/control
index 1add205..3bcdddf 100644
--- a/debian/control
+++ b/debian/control
@@ -62,18 +62,18 @@ Description: Qt 6 HTTP Server documentation
 
 Package: libqt6httpserver6
 Architecture: all
-Depends: qt6-httpserver
+Depends: qt6-httpserver, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qt6-httpserver-doc-html
 Architecture: all
-Depends: qt6-httpserver-doc
+Depends: qt6-httpserver-doc, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qt6-httpserver-examples
 Architecture: all
-Depends: qt6-httpserver-dev
+Depends: qt6-httpserver-dev, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
diff --git a/debian/qt6-httpserver-dev.install b/debian/qt6-httpserver-dev.install
index a118065..a92fd9f 100644
--- a/debian/qt6-httpserver-dev.install
+++ b/debian/qt6-httpserver-dev.install
@@ -4,6 +4,7 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6HttpServer/
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6HttpServer.prl
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6HttpServer.so
 usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/examples/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/
diff --git a/debian/qt6-httpserver-doc.install b/debian/qt6-httpserver-doc.install
index 473760a..8536ff4 100644
--- a/debian/qt6-httpserver-doc.install
+++ b/debian/qt6-httpserver-doc.install
@@ -1,2 +1 @@
-#usr/lib/${DEB_HOST_MULTIARCH}/qt6/examples/
 usr/share/qt6/doc/
diff --git a/debian/qt6-httpserver.lintian-overrides b/debian/qt6-httpserver.lintian-overrides
new file mode 100644
index 0000000..6f9da20
--- /dev/null
+++ b/debian/qt6-httpserver.lintian-overrides
@@ -0,0 +1 @@
+qt6-httpserver: package-name-doesnt-match-sonames libQt6HttpServer6


More information about the Neon-commits mailing list