[pkg-fgfs-crew] [simgear] 01/01: * Accept libopenscenegraph-3.2.0~rc1, again, as per discussion with OSG maintainers. * Use no-strict-aliasing for big-endian architectures, as recommended by Rebecca Palmer. Closes: #722115

[Markus Wanner]

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

markus_wanner-guest pushed a commit to branch master
in repository simgear.

commit 58d28f399a436fa81506b19e2099a8c421cbf26c
Author: Markus Wanner <markus at bluegap.ch>
Date:   Fri Sep 20 20:12:46 2013 +0200

    * Accept libopenscenegraph-3.2.0~rc1, again, as per discussion with OSG
      maintainers.
    * Use no-strict-aliasing for big-endian architectures, as recommended by
      Rebecca Palmer. Closes: #722115
---
 debian/changelog |    4 ++++
 debian/control   |    3 ---
 debian/rules     |    7 +++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f3be203..ca42934 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 simgear (2.10.0-5) UNRELEASED; urgency=low
 
   * Drop a superfluous ${shlibs:Depends}.
+  * Accept libopenscenegraph-3.2.0~rc1, again, as per discussion with OSG
+    maintainers.
+  * Use no-strict-aliasing for big-endian architectures, as recommended by
+    Rebecca Palmer. Closes: #722115
 
  --
 
diff --git a/debian/control b/debian/control
index b873a81..ed55074 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Build-Depends: debhelper (>= 8.1.3), libx11-dev, libxext-dev, libxi-dev,
  freeglut3-dev | libglut3-dev,
  libjpeg8-dev | libjpeg62-dev | libjpeg-dev,
  libopenscenegraph-dev (>> 3.0.0)
-Build-Conflicts: libopenscenegraph-dev (= 3.2.0~rc1-1)
 Standards-Version: 3.9.4
 Homepage: http://www.simgear.org/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/simgear.git
@@ -24,7 +23,6 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: simgear0
-Breaks: libopenscenegraph-dev (= 3.2.0~rc1-1)
 Description: Simulator Construction Gear -- core library
  SimGear is a collection of libraries useful for constructing
  simulation and visualization applications such as FlightGear
@@ -53,7 +51,6 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends: libsimgearcore2.10.0 (= ${binary:Version}),
  ${shlibs:Depends}, ${misc:Depends}
 Conflicts: simgear0
-Breaks: libopenscenegraph-dev (= 3.2.0~rc1-1)
 Description: Simulator Construction Gear -- scene library
  SimGear is a collection of libraries useful for constructing
  simulation and visualization applications such as FlightGear
diff --git a/debian/rules b/debian/rules
index 2f2050b..376645e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,15 @@
 
 #http://wiki.debian.org/Hardening#Notes_for_packages_using_CMake
 CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+ifneq (,$(findstring $(DEB_HOST_ARCH), \
+       amd64 i386 mipsel ia64 armel armhf arm64))
 CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
 CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
+else
+#required on big-endian architectures, see bug #722115
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) -fno-strict-aliasing
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS) -fno-strict-aliasing
+endif
 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
 CMAKE_FLAGS = \

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