[neon/extras/kraft/Neon/release] debian: tweak .tag file to avoid an extra patch

[Pino Toscano]

Git commit 7d4eda1ebebbfd8f0723c939529fe35f9f7825fe by Pino Toscano.
Committed on 17/09/2023 at 04:49.
Pushed by jriddell into branch 'Neon/release'.

tweak .tag file to avoid an extra patch

M  +0    -2    debian/changelog
D  +0    -18   debian/patches/cmake-fix-empty-replace.diff
M  +0    -1    debian/patches/series
M  +1    -1    debian/rules

https://invent.kde.org/neon/extras/kraft/-/commit/7d4eda1ebebbfd8f0723c939529fe35f9f7825fe

diff --git a/debian/changelog b/debian/changelog
index 49f248c..a0883e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,6 @@ kraft (1.1-0r1) UNRELEASED; urgency=medium
   * Pass -DAKONADI_LEGACY_BUILD=ON to cmake to build with Akonadi older than
     23.04 (i.e. what currently available in Debian unstable).
   * Fix source build without git or a .git directory around:
-    - properly handle empty inputs for string(REPLACE); patch
-      cmake-fix-empty-replace.diff
     - do not try to get git branch information if there is no .git directory;
       patch cmake-fix-without-git.diff
     - create a ".tag" file for the cmake run, since apparently the build system
diff --git a/debian/patches/cmake-fix-empty-replace.diff b/debian/patches/cmake-fix-empty-replace.diff
deleted file mode 100644
index 2b4bac9..0000000
--- a/debian/patches/cmake-fix-empty-replace.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Pino Toscano <pino at debian.org>
-Description: Fix cmake string(REPLACE) in case of e.g. empty input string
- Properly quote the input string to replace, so the input parameter is properly
- handled as single parameter in case of e.g. empty value or space inside it.
-Last-Update: 2023-09-17
-Forwarded: no
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -26,7 +26,7 @@ get_git_head_revision(GIT_REFSPEC GIT_SH
- # via git-archive.
- if ("${GIT_SHA1}" STREQUAL "GITDIR-NOTFOUND")
-     file(READ ${CMAKE_SOURCE_DIR}/.tag sha1_candidate)
--    string(REPLACE "\n" "" sha1_candidate ${sha1_candidate})
-+    string(REPLACE "\n" "" sha1_candidate "${sha1_candidate}")
-     if (NOT ${sha1_candidate} STREQUAL "$Format:%H$")
-         message("${sha1_candidate}")
-         set (GIT_SHA1 "${sha1_candidate}")
diff --git a/debian/patches/series b/debian/patches/series
index b61db1d..94d0e5f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 tests-skip-t_defaultprovider.diff
-cmake-fix-empty-replace.diff
 cmake-fix-without-git.diff
diff --git a/debian/rules b/debian/rules
index a621c3f..a77371d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@
 override_dh_auto_configure:
 	# workaround lack of ".tag: top-level file assumed by the build system
 	# in case no .git directory is present
-	touch .tag
+	echo 'unavailable' > .tag
 	dh_auto_configure -Skf5 -- -DAKONADI_LEGACY_BUILD=ON
 	rm .tag