[hedgewars] 01/01: Fixing the font issues, new release, experimental target

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to branch master
in repository hedgewars.

commit 85c2ef92d027dd4cb81a23e9a3429a3e33484b80
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Jan 24 14:23:22 2014 +0100

    Fixing the font issues, new release, experimental target
---
 debian/changelog                     | 11 +++++++---
 debian/patches/noversionupdate.patch | 41 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 debian/rules                         |  4 +++-
 4 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 850d1e8..530d082 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-hedgewars (0.9.20.5-4) UNRELEASED; urgency=low
+hedgewars (0.9.20.5-4) experimental; urgency=low
 
   * debian/rules
-    - added NOVERSIONINFOUPDATE, this will be added on the
-      next major release, avoiding to change share/version_info.txt
+    - added NOVERSIONINFOUPDATE, avoiding to change
+      share/version_info.txt
+    - Added a script for checking the ttf-fonts version, in order
+      to find the original file, not the symlink (needed for
+      backports to systems with ttf-dejavu-core << 2.33+svn2514-2~ 
+      the first version with the font location changed
+      and symlink created)
   * debian/control
     - Switched back to ttf-dejavu-core since it is easier to backport,
       fonts-dejavu-core is only available in testing
diff --git a/debian/patches/noversionupdate.patch b/debian/patches/noversionupdate.patch
new file mode 100644
index 0000000..84332b6
--- /dev/null
+++ b/debian/patches/noversionupdate.patch
@@ -0,0 +1,41 @@
+# HG changeset patch
+# User sheepluva
+# Date 1390210859 -3600
+#      Mon Jan 20 10:40:59 2014 +0100
+# Node ID ec966363adbeeb83a3ec56ad221f8a39126a7902
+# Parent  7d21f52f04528049f483827b413ff9b76236f2c8
+new cmake option NOVERSIONINFOUPDATE -- to be used if source is in a git/repo that is NOT the hedgewars repo
+
+diff -r 7d21f52f0452 -r ec966363adbe CMakeLists.txt
+--- a/CMakeLists.txt	Mon Jan 20 10:16:29 2014 +0100
++++ b/CMakeLists.txt	Mon Jan 20 10:40:59 2014 +0100
+@@ -38,6 +38,8 @@
+     set(DATA_INSTALL_DIR "share/hedgewars" CACHE STRING "Resource folder path")
+ endif()
+ 
++option(NOVERSIONINFOUPDATE "Disable update of version_info.txt. To be used if source is in a git/repo that is NOT the hedgewars repo" OFF)
++
+ #system paths for finding required fonts (see share/hedgewars/Data/fonts)
+ #subdirectories will NOT be searched.
+ #all fonts that can't be found will be bundled with hedgewars
+diff -r 7d21f52f0452 -r ec966363adbe cmake_modules/revinfo.cmake
+--- a/cmake_modules/revinfo.cmake	Mon Jan 20 10:16:29 2014 +0100
++++ b/cmake_modules/revinfo.cmake	Mon Jan 20 10:40:59 2014 +0100
+@@ -1,7 +1,7 @@
+ #detect Mercurial revision and init rev/hash information
+ find_program(HGCOMMAND hg)
+ find_program(GITCOMMAND git)
+-if(EXISTS ${CMAKE_SOURCE_DIR}/.hg AND HGCOMMAND)
++if(EXISTS ${CMAKE_SOURCE_DIR}/.hg AND HGCOMMAND AND NOT NOVERSIONINFOUPDATE)
+     execute_process(COMMAND ${HGCOMMAND} identify -in
+                     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+                     OUTPUT_VARIABLE internal_version
+@@ -21,7 +21,7 @@
+ 
+     #write down hash and rev for easy picking should hg be missing
+     file(WRITE "${CMAKE_SOURCE_DIR}/share/version_info.txt" "Hedgewars versioning information, do not modify\nrev ${HEDGEWARS_REVISION}\nhash ${HEDGEWARS_HASH}\n")
+-elseif(EXISTS ${CMAKE_SOURCE_DIR}/.git AND GITCOMMAND)
++elseif(EXISTS ${CMAKE_SOURCE_DIR}/.git AND GITCOMMAND AND NOT NOVERSIONINFOUPDATE)
+     execute_process(COMMAND ${GITCOMMAND} rev-parse --short HEAD
+                     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+                     OUTPUT_VARIABLE HEDGEWARS_HASH
diff --git a/debian/patches/series b/debian/patches/series
index 42a5938..a0be553 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 using_system_physfs.patch
 using_system_fonts.patch
+noversionupdate.patch
diff --git a/debian/rules b/debian/rules
index 150b093..3f519b3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 %:
 	dh $@
 
+DEJAVU_DIRECTORY := $(shell dirname `readlink -f /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf`)
+
 override_dh_auto_configure:
 	for icon in `find debian/hicolor-icons -type f`; do \
 		dirname=`dirname $$icon`; \
@@ -14,7 +16,7 @@ override_dh_auto_configure:
 	dh_auto_configure -- 	-DCMAKE_INSTALL_PREFIX=/usr/lib/hedgewars \
 				-DDATA_INSTALL_DIR=/usr/share/games/hedgewars \
 				-DCMAKE_BUILD_TYPE=RELEASE -DPHYSFS_SYSTEM=ON \
-				-DFONTS_DIRS='/usr/share/fonts/truetype/wqy;/usr/share/fonts/truetype/ttf-dejavu/' \
+				-DFONTS_DIRS='/usr/share/fonts/truetype/wqy;$(DEJAVU_DIRECTORY)' \
 				-DNOVERSIONINFOUPDATE=1
 
 override_dh_clean:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/hedgewars.git