[pkg-fgfs-crew] [flightgear] 01/02: * Accept libopenscenegraph-3.2.0~rc1, again, as per discussion with OSG maintainers. Recompile against that version. Closes: #722193. * Add uncommitted changelog entry for uploaded 2.10.0-3.

[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 flightgear.

commit 9587283999315aea61ff493e8731c1b81b568c2f
Author: Markus Wanner <markus at bluegap.ch>
Date:   Fri Sep 20 20:17:32 2013 +0200

    * Accept libopenscenegraph-3.2.0~rc1, again, as per discussion with OSG
      maintainers. Recompile against that version. Closes: #722193.
    * Add uncommitted changelog entry for uploaded 2.10.0-3.
---
 debian/changelog |   16 +++++++++++++++-
 debian/control   |    2 --
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 03e5d1b..8957d10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+flightgear (2.10.0-4) UNRELEASED; urgency=low
+
+  * Accept libopenscenegraph-3.2.0~rc1, again, as per discussion with OSG
+    maintainers. Recompile against that version. Closes: #722193.
+
+ --
+
+flightgear (2.10.0-3) unstable; urgency=low
+
+  * Mark libopenscenegraph-3.2.0~rc1 as breaking simgear: it uses a
+    library major version different from the final 3.2.0 series.
+    Closes: #722193.
+
+ -- Markus Wanner <markus at bluegap.ch>  Fri, 13 Sep 2013 20:56:14 +0200
+
 flightgear (2.10.0-3) UNRELEASED; urgency=low
 
   * Mark libopenscenegraph-3.2.0~rc1 as breaking simgear: it uses a
@@ -436,6 +451,5 @@ flightgear (0.7.6-1) unstable; urgency=low
  -- Ove Kaaven <ovek at arcticnet.no>  Tue, 13 Feb 2001 16:05:02 +0100
 
 Local variables:
-mode: debian-changelog
 add-log-mailing-address "ovek at arcticnet.no"
 End:
diff --git a/debian/control b/debian/control
index fa3a07d..9c40f6c 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Build-Depends: debhelper (>= 9.20120417), libx11-dev, libxext-dev,
  libopenscenegraph-dev (>> 3.0.0),
  libsimgear-dev (>= 2.10.0~),
  libsqlite3-dev
-Build-Conflicts: libopenscenegraph-dev (= 3.2.0~rc1-1)
 Standards-Version: 3.9.4
 Homepage: http://www.flightgear.org/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/flightgear.git
@@ -26,7 +25,6 @@ Package: flightgear
 Architecture: any
 Depends: flightgear-data-all (>= 2.10.0~), ${shlibs:Depends},
  ${misc:Depends}
-Breaks: libopenscenegraph-dev (= 3.2.0~rc1-1)
 Description: Flight Gear Flight Simulator
  FlightGear Flight Simulator (often shortened to FlightGear or FGFS)
  is a sophisticated free, completely open-source flight simulator

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