[tango] 02/03: fix the FTBFS on sparc64 (Closes: #729163) thanks Aurelien Jarno for the patch

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository tango.

commit b3cf89286320aaebaa388be45d2f8fab6748c71b
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Wed Nov 13 16:37:07 2013 +0100

    fix the FTBFS on sparc64 (Closes: #729163) thanks Aurelien Jarno for the patch
---
 .../patches/0001-debian-fix_database_scripts.patch |    4 +--
 debian/patches/0002-debian-my.cnf.in.patch         |    4 +--
 debian/patches/0004-fix-upstream-p812_1.diff.patch |    2 +-
 ...5-forwarded-upstrean-fix-FTBFS-on-sparc64.patch |   35 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 5 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/debian/patches/0001-debian-fix_database_scripts.patch b/debian/patches/0001-debian-fix_database_scripts.patch
index a3b1973..76e4a90 100644
--- a/debian/patches/0001-debian-fix_database_scripts.patch
+++ b/debian/patches/0001-debian-fix_database_scripts.patch
@@ -1,9 +1,9 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?=
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
  <picca at synchrotron-soleil.fr>
 Date: Tue, 22 Mar 2011 15:25:38 +0100
 Subject: debian/fix_database_scripts
 MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
 update the database creation script to deal with the debian path
diff --git a/debian/patches/0002-debian-my.cnf.in.patch b/debian/patches/0002-debian-my.cnf.in.patch
index 2392d37..29d6424 100644
--- a/debian/patches/0002-debian-my.cnf.in.patch
+++ b/debian/patches/0002-debian-my.cnf.in.patch
@@ -1,8 +1,8 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
 Date: Sat, 15 Sep 2012 08:25:42 +0200
 Subject: debian/my.cnf.in
 MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
 set the right parameters for the mysql configuration file
diff --git a/debian/patches/0004-fix-upstream-p812_1.diff.patch b/debian/patches/0004-fix-upstream-p812_1.diff.patch
index fe3c2a3..a87dae1 100644
--- a/debian/patches/0004-fix-upstream-p812_1.diff.patch
+++ b/debian/patches/0004-fix-upstream-p812_1.diff.patch
@@ -1,4 +1,4 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
 Date: Tue, 3 Sep 2013 20:10:47 +0200
 Subject: fix upstream p812_1.diff
 
diff --git a/debian/patches/0005-forwarded-upstrean-fix-FTBFS-on-sparc64.patch b/debian/patches/0005-forwarded-upstrean-fix-FTBFS-on-sparc64.patch
new file mode 100644
index 0000000..4ac95b8
--- /dev/null
+++ b/debian/patches/0005-forwarded-upstrean-fix-FTBFS-on-sparc64.patch
@@ -0,0 +1,35 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Wed, 13 Nov 2013 16:25:25 +0100
+Subject: forwarded upstrean fix FTBFS on sparc64
+
+---
+ cppserver/database/Makefile.am | 2 +-
+ cppserver/database/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cppserver/database/Makefile.am b/cppserver/database/Makefile.am
+index 9cf6324..f5e33eb 100644
+--- a/cppserver/database/Makefile.am
++++ b/cppserver/database/Makefile.am
+@@ -6,7 +6,7 @@ INCLUDES = $(ORB_INCLUDE_PREFIX)  $(LIBZMQ_CFLAGS) \
+       	$(MYSQLCLIENT_CFLAGS) \
+       	$(ZLIB_CPPFLAGS)
+ 
+-AM_CXXFLAGS= -Wall -D_FORTIFY_SOURCE=2 -O1 -fpie
++AM_CXXFLAGS= -Wall -D_FORTIFY_SOURCE=2 -O1 -fPIE
+ 
+ LDADD = -L$(top_builddir)/lib/cpp/server -ltango -L$(top_builddir)/lib/cpp/log4tango/src \
+ 		-llog4tango $(MYSQLCLIENT_LDFLAGS) \
+diff --git a/cppserver/database/Makefile.in b/cppserver/database/Makefile.in
+index b1dc264..54c7597 100644
+--- a/cppserver/database/Makefile.in
++++ b/cppserver/database/Makefile.in
+@@ -327,7 +327,7 @@ INCLUDES = $(ORB_INCLUDE_PREFIX)  $(LIBZMQ_CFLAGS) \
+       	$(MYSQLCLIENT_CFLAGS) \
+       	$(ZLIB_CPPFLAGS)
+ 
+-AM_CXXFLAGS = -Wall -D_FORTIFY_SOURCE=2 -O1 -fpie
++AM_CXXFLAGS = -Wall -D_FORTIFY_SOURCE=2 -O1 -fPIE
+ LDADD = -L$(top_builddir)/lib/cpp/server -ltango -L$(top_builddir)/lib/cpp/log4tango/src \
+ 		-llog4tango $(MYSQLCLIENT_LDFLAGS) \
+          $(MYSQLCLIENT_LIBS) $(ZLIB_LDFLAGS) $(ZLIB_LIBS)  $(LIBZMQ_LIBS)
diff --git a/debian/patches/series b/debian/patches/series
index 4ce1f75..2a62624 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-debian-my.cnf.in.patch
 0003-debian-notify_daemon.patch
 0004-fix-upstream-p812_1.diff.patch
+0005-forwarded-upstrean-fix-FTBFS-on-sparc64.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tango.git