This is an automated email from the git hooks/post-receive script. locutusofborg-guest pushed a commit to branch master in repository hedgewars.
commit 54910f6c5155a46d47ebc3951771beebe046879b Author: Gianfranco Costamagna <[email protected]> Date: Wed Sep 3 09:24:34 2014 +0200 Fix cmake 3.0 build, upload to unstable --- debian/changelog | 10 ++++++++++ .../b2d1b0d292c71b5a4266c9359280fa32a35ac56d.patch | 23 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 34 insertions(+) diff --git a/debian/changelog b/debian/changelog index bc97060..821fe61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +hedgewars (0.9.20.5-9) unstable; urgency=medium + + * Upload to unstable. + + [ Felix Geyer ] + * Backport upstream commit b2d1b0d292c7 to fix + cmake 3.0 build (Closes: #758449) + + -- Gianfranco Costamagna <[email protected]> Wed, 03 Sep 2014 09:21:38 +0200 + hedgewars (0.9.20.5-8) experimental; urgency=medium * Try again to enable parallel builds. diff --git a/debian/patches/b2d1b0d292c71b5a4266c9359280fa32a35ac56d.patch b/debian/patches/b2d1b0d292c71b5a4266c9359280fa32a35ac56d.patch new file mode 100644 index 0000000..60e7669 --- /dev/null +++ b/debian/patches/b2d1b0d292c71b5a4266c9359280fa32a35ac56d.patch @@ -0,0 +1,23 @@ +From b2d1b0d292c71b5a4266c9359280fa32a35ac56d Mon Sep 17 00:00:00 2001 +From: sheepluva <[email protected]> +Date: Wed, 13 Aug 2014 15:16:33 +0200 +Subject: [PATCH] this should fix the cmake 3.0 issue. thanks to Spacey for + reporting + +--- + tools/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt +index b55f09c..3da80ab 100644 +--- a/tools/CMakeLists.txt ++++ b/tools/CMakeLists.txt +@@ -57,7 +57,7 @@ if(APPLE) + + #create the .dmg for deployment + #first make sure .app exists, then remove any old .dmg with same name, finally run the script +- add_custom_target(dmg COMMAND if [ ! -a Hedgewars.app ]; then make install\; fi; ++ add_custom_target(dmg COMMAND "if [ ! -a Hedgewars.app ]; then make install\; fi;" + COMMAND rm -f ${CMAKE_BINARY_DIR}/Hedgewars-${HEDGEWARS_VERSION}.dmg + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/create-dmg.sh + --volname "Hedgewars ${HEDGEWARS_VERSION}" diff --git a/debian/patches/series b/debian/patches/series index 9784523..638eeaf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ using_system_physfs.patch using_system_fonts.patch noversionupdate.patch 0001-Fixed-desktop-file-By-adding-an-xpm-icon.patch +b2d1b0d292c71b5a4266c9359280fa32a35ac56d.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/hedgewars.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
