[wesnoth] 01/01: give up on trying to backport the necessary changes to fix gettext tooling for wesnoth-sota; should be fixed in next release

[Vincent Cheng]

This is an automated email from the git hooks/post-receive script.

vcheng pushed a commit to branch devel
in repository wesnoth.

commit f2290ea318c8abbd866a78b85a9026c91d198850
Author: Vincent Cheng <vcheng at debian.org>
Date:   Sun Apr 16 23:47:55 2017 -0700

    give up on trying to backport the necessary changes to fix gettext tooling for wesnoth-sota; should be fixed in next release
---
 debian/changelog                                   |  2 --
 .../04update-po-cmakelists-for-wesnoth-sota        | 22 ----------------------
 debian/patches/series                              |  1 -
 debian/wesnoth-1.13-sota.install                   |  3 ++-
 debian/wesnoth-BRANCH-sota.install.in              |  3 ++-
 5 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7302ab8..edf17ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,6 @@ wesnoth-1.13 (1:1.13.7-2) experimental; urgency=medium
 
   * Add new package wesnoth-1.13-sota for the newly added mainline campaign,
     "Secrets of the Ancients". (Closes: #860420)
-  * Add debian/patches/04update-po-cmakelists-for-wesnoth-sota; cherry-picked
-    from upstream git to include translations for wesnoth-1.13-sota.
 
  -- Vincent Cheng <vcheng at debian.org>  Sun, 16 Apr 2017 22:11:44 -0700
 
diff --git a/debian/patches/04update-po-cmakelists-for-wesnoth-sota b/debian/patches/04update-po-cmakelists-for-wesnoth-sota
deleted file mode 100644
index 945166a..0000000
--- a/debian/patches/04update-po-cmakelists-for-wesnoth-sota
+++ /dev/null
@@ -1,22 +0,0 @@
-From f12bf3345f10ff124ed68c074de528f5b09d6183 Mon Sep 17 00:00:00 2001
-From: Nils Kneuper <crazy-ivanovic at gmx.net>
-Date: Thu, 23 Mar 2017 08:41:01 +0100
-Subject: [PATCH] add wesnoth-sota to CMake list (allow compilation +
- pot-update)
-
----
- po/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
-index 890f222..c59d0a2 100644
---- a/po/CMakeLists.txt
-+++ b/po/CMakeLists.txt
-@@ -20,6 +20,7 @@ set(NORMAL_DOMAINS
- 	wesnoth-multiplayer
- 	wesnoth-nr
- 	wesnoth-sof
-+	wesnoth-sota
- 	wesnoth-sotbe
- 	wesnoth-tb
- 	wesnoth-test
diff --git a/debian/patches/series b/debian/patches/series
index e9fcd59..57b6465 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 02wesnoth-nolog-desktop-file
 03wesnothd-name
-04update-po-cmakelists-for-wesnoth-sota
diff --git a/debian/wesnoth-1.13-sota.install b/debian/wesnoth-1.13-sota.install
index 2b9324a..58b7299 100644
--- a/debian/wesnoth-1.13-sota.install
+++ b/debian/wesnoth-1.13-sota.install
@@ -1,2 +1,3 @@
 debian/tmp/usr/share/games/wesnoth/1.13/data/campaigns/Secrets_of_the_Ancients
-debian/tmp/usr/share/games/wesnoth/1.13/locale/*/LC_MESSAGES/wesnoth-sota.mo
+# TODO: broken in 1.13.7 but should be fixed in git, uncomment after next release
+#debian/tmp/usr/share/games/wesnoth/1.13/locale/*/LC_MESSAGES/wesnoth-sota.mo
diff --git a/debian/wesnoth-BRANCH-sota.install.in b/debian/wesnoth-BRANCH-sota.install.in
index 879667d..690957a 100644
--- a/debian/wesnoth-BRANCH-sota.install.in
+++ b/debian/wesnoth-BRANCH-sota.install.in
@@ -1,2 +1,3 @@
 debian/tmp/usr/share/games/wesnoth/BRANCH/data/campaigns/Secrets_of_the_Ancients
-debian/tmp/usr/share/games/wesnoth/BRANCH/locale/*/LC_MESSAGES/wesnoth-sota.mo
+# TODO: broken in 1.13.7 but should be fixed in git, uncomment after next release
+#debian/tmp/usr/share/games/wesnoth/BRANCH/locale/*/LC_MESSAGES/wesnoth-sota.mo

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/wesnoth.git