[debian-edu-commits] debian-edu/italc.git (#95) - master (branch) updated: debian/1_2.0.0-2-14-g416ecd3

[Mike Gabriel]

The branch, master has been updated
       via  416ecd3a92b75ad2374ee044441e131be2763bb5 (commit)
      from  6ea3f2f2ec960ec87f2e00841991eaa0f649f7ae (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 416ecd3a92b75ad2374ee044441e131be2763bb5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Aug 11 01:55:22 2013 +0200

    fix passing-through of the BUILD_TYPE macro

-----------------------------------------------------------------------

Summary of changes:
 debian/patches/006_inject-buildtype-from-outside.patch |    8 ++++++--
 debian/rules                                           |    3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/patches/006_inject-buildtype-from-outside.patch b/debian/patches/006_inject-buildtype-from-outside.patch
index 56455a0..088169e 100644
--- a/debian/patches/006_inject-buildtype-from-outside.patch
+++ b/debian/patches/006_inject-buildtype-from-outside.patch
@@ -1,6 +1,6 @@
 --- a/imc/src/MainWindow.cpp
 +++ b/imc/src/MainWindow.cpp
-@@ -534,14 +534,9 @@
+@@ -534,14 +534,13 @@
  
  #endif
  
@@ -9,10 +9,14 @@
 -#elif defined( ITALC_HOST_X86_64 )
 -	const QString buildType = "x86_64";
 -#endif
++// see http://www.guyrutenberg.com/2008/12/20/expanding-macros-into-string-constants-in-c/ for what the below two lines do...
++#define STR_EXPAND(tok) #tok
++#define STR(tok) STR_EXPAND(tok)
++
  	obj.setValue( "OS", os, "General" );
  	obj.setValue( "MachineInfo", machineInfo, "General" );
 -	obj.setValue( "BuildType", buildType, "General" );
-+	obj.setValue( "BuildType", BUILD_TYPE, "General" );
++	obj.setValue( "BuildType", STR(BUILD_TYPE), "General" );
  	obj.setValue( "Version", ITALC_VERSION, "General" );
  
  
diff --git a/debian/rules b/debian/rules
index d04dce6..1a23590 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 DEB_DH_INSTALL_SOURCEDIR = debian/tmp
 CPPFLAGS += -I/usr/include/X11
 CFLAGS += -fPIC
-CXXFLAGS += -fPIC -DBUILD_TYPE=\"`dpkg-architecture -qDEB_BUILD_GNU_CPU`\"
+GNU_CPU_TYPE:=$(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+CXXFLAGS += -fPIC -D'BUILD_TYPE=$(GNU_CPU_TYPE)'
 DEB_CONFIGURE_EXTRA_FLAGS = --with-linux LDFLAGS=-L/usr/lib/X11
 DEB_DH_MAKESHLIBS_ARGS += -V
 


hooks/post-receive
-- 
italc.git (Debian package italc)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "italc.git" (Debian package italc).