[neon/qt/qbs/Neon/release] debian: Drop doc_Install_man_pages_with_cmake.diff, applied upstream.

Dmitry Shachnev null at kde.org
Wed Dec 14 07:28:03 GMT 2022


Git commit 9f6735cd281a0d3b5788c8621069e1fe4abe8217 by Dmitry Shachnev.
Committed on 27/11/2022 at 09:22.
Pushed by carlosdem into branch 'Neon/release'.

Drop doc_Install_man_pages_with_cmake.diff, applied upstream.

M  +1    -0    debian/changelog
D  +0    -32   debian/patches/doc_Install_man_pages_with_cmake.diff
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/qt/qbs/commit/9f6735cd281a0d3b5788c8621069e1fe4abe8217

diff --git a/debian/changelog b/debian/changelog
index 97ac6ab..5c4515f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ qbs (1.24.0+dfsg-1) UNRELEASED; urgency=medium
   * Repack the tarball to exclude uncertainly licensed tests.
   * Override some false-positive source-is-missing Lintian errors.
   * Refresh debian/patches/skip_test_concurrent.diff.
+  * Drop doc_Install_man_pages_with_cmake.diff, applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 21 Aug 2022 09:27:13 +0300
 
diff --git a/debian/patches/doc_Install_man_pages_with_cmake.diff b/debian/patches/doc_Install_man_pages_with_cmake.diff
deleted file mode 100644
index 913abb1..0000000
--- a/debian/patches/doc_Install_man_pages_with_cmake.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-From 077ce0bce4265b69278c10f8956ae8fad145b0db Mon Sep 17 00:00:00 2001
-From: Marius Gripsgard <marius at ubports.com>
-Date: Thu, 30 Dec 2021 03:01:58 +0100
-Subject: [PATCH] doc: Install man pages with cmake
-
-Change-Id: Ibce74cf1b524c8c08b38dfc76549b4723ea705b3
----
- doc/CMakeLists.txt     | 2 ++
- doc/man/CMakeLists.txt | 1 +
- 2 files changed, 3 insertions(+)
- create mode 100644 doc/man/CMakeLists.txt
-
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index 5b8ac7636..04ff12470 100644
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -26,3 +26,5 @@ add_qbs_documentation(
-         ${_DOC_IMAGES_SOURCES}
-         ${_DOC_TARGETS_SOURCES}
-     )
-+
-+add_subdirectory(man)
-diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt
-new file mode 100644
-index 000000000..7e8247ed4
---- /dev/null
-+++ b/doc/man/CMakeLists.txt
-@@ -0,0 +1 @@
-+install(FILES qbs.1 DESTINATION ${QBS_RESOURCES_INSTALL_DIR}/man/man1)
--- 
-2.34.1
-
diff --git a/debian/patches/series b/debian/patches/series
index 5439542..05f46c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,4 @@ skip_test_concurrent.diff
 test_sanitizers_only_on_amd64.diff
 no_nosys_specs.diff
 disable_bad_assembly.diff
-doc_Install_man_pages_with_cmake.diff
 asan_atomic.diff



More information about the Neon-commits mailing list