[corsix-th] 02/03: backport include_campaigns.patch merged upstream

[Phil Morrell]

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

emorrp1-guest pushed a commit to branch master
in repository corsix-th.

commit fcf86673a052d6803c6e1671691cbb1f7d4f2de3
Author: Phil Morrell <debian at emorrp1.name>
Date:   Wed Jun 22 00:16:59 2016 +0100

    backport include_campaigns.patch merged upstream
---
 debian/patches/include_campaigns.patch | 23 +++++++++++++++++++++++
 debian/patches/series                  |  1 +
 2 files changed, 24 insertions(+)

diff --git a/debian/patches/include_campaigns.patch b/debian/patches/include_campaigns.patch
new file mode 100644
index 0000000..d89fd8f
--- /dev/null
+++ b/debian/patches/include_campaigns.patch
@@ -0,0 +1,23 @@
+Subject: [PATCH] Include Campaigns directory in CMake build
+Author: "Phil Morrell" <public at emorrp1.name>
+Bug: https://github.com/CorsixTH/CorsixTH/issues/1098
+Origin: upstream, commit:6653d41a
+Last-Update: 2016-06-22
+
+---
+ CorsixTH/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CorsixTH/CMakeLists.txt b/CorsixTH/CMakeLists.txt
+index 565fd9a..ef52250 100644
+--- a/CorsixTH/CMakeLists.txt
++++ b/CorsixTH/CMakeLists.txt
+@@ -209,7 +209,7 @@ IF(APPLE)
+     ")
+ ELSE()
+   install(TARGETS CorsixTH RUNTIME DESTINATION CorsixTH)
+-  install(DIRECTORY Lua Levels DESTINATION CorsixTH PATTERN "*.svn" EXCLUDE)
++  install(DIRECTORY Campaigns Lua Levels DESTINATION CorsixTH PATTERN "*.svn" EXCLUDE)
+   install(DIRECTORY Bitmap DESTINATION CorsixTH
+         FILES_MATCHING REGEX ".*\\.(tab|pal|dat|png)$"
+         PATTERN "*.svn" EXCLUDE)
diff --git a/debian/patches/series b/debian/patches/series
index e0a6f1e..dcf22f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 default_config.patch
+include_campaigns.patch

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