[debian-edu-commits] debian-edu/italc.git (#93) - master (branch) updated: debian/1_2.0.0-2-12-g729af5b

[Mike Gabriel]

The branch, master has been updated
       via  729af5b5311b47e3d89f1bf4198c46860cf82bd7 (commit)
      from  e41ef566ad1593adec0897e48dc3ffc763ac8f97 (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 729af5b5311b47e3d89f1bf4198c46860cf82bd7
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Aug 11 00:35:15 2013 +0200

    Add patch: 006_inject-buildtype-from-outside.patch. Inject the build type (actually the BUILD_CPU) from /debian/rules. Avoid the detection code from upstream as it only covers x86 and x86_64. (Closes: #718745).

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

Summary of changes:
 debian/changelog                                   |    3 +++
 .../006_inject-buildtype-from-outside.patch        |   27 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 debian/rules                                       |    2 +-
 4 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/006_inject-buildtype-from-outside.patch

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index d251547..8e8bf4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,9 @@ italc (1:2.0.0-3) UNRELEASED; urgency=low
   * Update patches.
   * Provide file italc-client.desktop. (Closes: #666428).
   * Provide file italc-master.desktop. (Closes: #666429).
+  * Add patch: 006_inject-buildtype-from-outside.patch. Inject the build
+    type (actually the BUILD_CPU) from /debian/rules. Avoid the detection
+    code from upstream as it only covers x86 and x86_64. (Closes: #718745).
 
  -- Mike Gabriel <sunweaver at debian.org>  Mon, 13 May 2013 10:17:38 +0200
 
diff --git a/debian/patches/006_inject-buildtype-from-outside.patch b/debian/patches/006_inject-buildtype-from-outside.patch
new file mode 100644
index 0000000..47a3f24
--- /dev/null
+++ b/debian/patches/006_inject-buildtype-from-outside.patch
@@ -0,0 +1,27 @@
+--- a/imc/src/MainWindow.cpp
++++ b/imc/src/MainWindow.cpp
+@@ -534,11 +534,7 @@
+ 
+ #endif
+ 
+-#ifdef ITALC_HOST_X86
+-	const QString buildType = "x86";
+-#elif defined( ITALC_HOST_X86_64 )
+-	const QString buildType = "x86_64";
+-#endif
++	const QString buildType = BUILD_TYPE;
+ 	obj.setValue( "OS", os, "General" );
+ 	obj.setValue( "MachineInfo", machineInfo, "General" );
+ 	obj.setValue( "BuildType", buildType, "General" );
+--- a/italcconfig.h.in
++++ b/italcconfig.h.in
+@@ -2,9 +2,6 @@
+ #cmakedefine ITALC_BUILD_WIN32 1
+ #cmakedefine ITALC_BUILD_APPLE 1
+ 
+-#cmakedefine ITALC_HOST_X86 1
+-#cmakedefine ITALC_HOST_X86_64 1
+-
+ #cmakedefine ITALC_HAVE_ARPA_INET_H 1
+ #cmakedefine ITALC_HAVE_FCNTL_H 1
+ #cmakedefine ITALC_HAVE_LIMITS_H 1
diff --git a/debian/patches/series b/debian/patches/series
index f87f4c9..8cf2acb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@
 003_rename-plugin-dir.patch
 004_x2go-nx-noxdamage.patch
 005_gcc47-ftbfs.patch
+006_inject-buildtype-from-outside.patch
 011_qt-signals.patch
 021_man-page-patch-in.patch
 031_fix-spelling-errors.patch
diff --git a/debian/rules b/debian/rules
index 0cf6c4f..d04dce6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 DEB_DH_INSTALL_SOURCEDIR = debian/tmp
 CPPFLAGS += -I/usr/include/X11
 CFLAGS += -fPIC
-CXXFLAGS += -fPIC
+CXXFLAGS += -fPIC -DBUILD_TYPE=\"`dpkg-architecture -qDEB_BUILD_GNU_CPU`\"
 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).