tags 678783 + patch tags 678783 + pending thanks Dear maintainer,
I've prepared an NMU for flightgear (versioned as 2.4.0-1.2) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. I took the liberty to choose 5 (instead of 10) because last upload was an NMU and last maintainer's upload dates back to September 2011. Regards. -- Mehdi Dogguy
diff -u flightgear-2.4.0/config.sub flightgear-2.4.0/config.sub --- flightgear-2.4.0/config.sub +++ flightgear-2.4.0/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2012-04-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -225,6 +225,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -1537,6 +1543,9 @@ c4x-* | tic4x-*) os=-coff ;; + hexagon-*) + os=-elf + ;; tic54x-*) os=-coff ;; diff -u flightgear-2.4.0/debian/changelog flightgear-2.4.0/debian/changelog --- flightgear-2.4.0/debian/changelog +++ flightgear-2.4.0/debian/changelog @@ -1,3 +1,11 @@ +flightgear (2.4.0-1.2) unstable; urgency=high + + * Non-maintainer upload. + * Fix FTBFS with svn 1.7 by adding missing include statement. (Closes: #678783). + * Set urgency=high to fix the RC bug. + + -- Mehdi Dogguy <me...@debian.org> Wed, 27 Jun 2012 17:39:22 +0200 + flightgear (2.4.0-1.1) unstable; urgency=low * Non-maintainer upload. diff -u flightgear-2.4.0/utils/TerraSync/terrasync.cxx flightgear-2.4.0/utils/TerraSync/terrasync.cxx --- flightgear-2.4.0/utils/TerraSync/terrasync.cxx +++ flightgear-2.4.0/utils/TerraSync/terrasync.cxx @@ -64,6 +64,7 @@ # include <svn_client.h> # include <svn_cmdline.h> # include <svn_pools.h> +# include <svn_version.h> # else # undef HAVE_SVN_CLIENT_H # endif
