[neon/extras/calligra/Neon/unstable] debian: Applied upstream. Remove ki18n patch.

Scarlett Moore null at kde.org
Thu Oct 6 17:31:51 BST 2022


Git commit f125f031935be03d3f289af3798e898eb574d9f1 by Scarlett Moore.
Committed on 06/10/2022 at 16:31.
Pushed by scarlettmoore into branch 'Neon/unstable'.

Applied upstream. Remove ki18n patch.

M  +6    -0    debian/changelog
D  +0    -13   debian/patches/install_po.patch
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/extras/calligra/commit/f125f031935be03d3f289af3798e898eb574d9f1

diff --git a/debian/changelog b/debian/changelog
index a0d7304..792d28c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+calligra (1:3.2.1+dfsg-5neon3) jammy; urgency=medium
+
+  * Applied upstream. Remove ki18n patch. 
+
+ -- Scarlett Moore <sgmoore at debian.org>  Thu, 06 Oct 2022 09:30:46 -0700
+
 calligra (1:3.2.1+dfsg-5neon2) jammy; urgency=medium
 
   * Attempt to add patch to add ki18n install po in cmake. 
diff --git a/debian/patches/install_po.patch b/debian/patches/install_po.patch
deleted file mode 100644
index 10b84d4..0000000
--- a/debian/patches/install_po.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 622fef591b6..7dad6ecdb41 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1097,3 +1097,9 @@ endif()
- if (BUILD_TESTING)
-     add_subdirectory(tests)
- endif(BUILD_TESTING)
-+
-+ki18n_install(po)
-+if(KF5DocTools_FOUND)
-+    kdoctools_install(po)
-+endif()
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4922494..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-install_po.patch


More information about the Neon-commits mailing list