[pkg-fgfs-crew] [flightgear-data] 01/01: Merge branch 'experimental' into 'master'.

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

commit 51a3774c632876a75170212e217d05986239ab88
Merge: d8603af 8c204e3
Author: Markus Wanner <markus at bluegap.ch>
Date:   Mon May 25 12:28:34 2015 +0200

    Merge branch 'experimental' into 'master'.
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

 debian/changelog                                   |  57 +++++-
 debian/control                                     |  61 ++-----
 debian/copyright                                   |  38 +++-
 debian/flightgear-data-base.links                  |   5 +
 debian/flightgear-data-base.postinst               |  18 --
 debian/flightgear-data-base.prerm                  |  13 --
 debian/get-orig-source                             |  17 ++
 debian/links                                       |   1 -
 debian/missing-sources/sprintf.js-1.0.2/.gitignore |   1 +
 debian/missing-sources/sprintf.js-1.0.2/LICENSE    |  24 +++
 debian/missing-sources/sprintf.js-1.0.2/README.md  |  82 +++++++++
 debian/missing-sources/sprintf.js-1.0.2/bower.json |  14 ++
 .../sprintf.js-1.0.2/demo/angular.html             |  20 +++
 .../sprintf.js-1.0.2/dist/angular-sprintf.min.map  |   1 +
 .../sprintf.js-1.0.2/dist/sprintf.min.map          |   1 +
 .../missing-sources/sprintf.js-1.0.2/gruntfile.js  |  36 ++++
 .../missing-sources/sprintf.js-1.0.2/package.json  |  22 +++
 .../sprintf.js-1.0.2/src/angular-sprintf.js        |  18 ++
 .../sprintf.js-1.0.2/src/sprintf.js                | 195 +++++++++++++++++++++
 .../missing-sources/sprintf.js-1.0.2/test/test.js  |  72 ++++++++
 debian/patches/60da20.patch                        |  21 ---
 debian/patches/766251.patch                        |  15 --
 debian/patches/f14fix.diff                         | 164 +++++++++++++++++
 debian/patches/restrict-nasal-paths.diff           |  18 ++
 debian/patches/series                              |   6 +-
 debian/patches/translation-update-pt.diff          |  26 ---
 debian/patches/use-system-jslibs.diff              |  84 +++++++++
 debian/rules                                       |  17 +-
 debian/watch                                       |   5 +-
 29 files changed, 882 insertions(+), 170 deletions(-)

diff --cc debian/changelog
index 008a1e7,eb1bc51..9164d5a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,47 +1,53 @@@
- flightgear-data (3.0.0-3) unstable; urgency=high
++flightgear-data (3.4.0+dfsg-1) UNRELEASED; urgency=medium
 +
-   * Add patch 60da20.patch removing FG_SCENERY from the list of
-     allowed directories to disallow nasal scripts from reading any
-     file as the user. Closes: #780716.
++  * Upload to unstable.
++
++ -- Markus Wanner <markus at bluegap.ch>  Mon, 25 May 2015 12:26:03 +0200
++
+ flightgear-data (3.4.0+dfsg-0~exp2) experimental; urgency=medium
+ 
+   [ Rebecca N. Palmer ]
+   * Add f14fix.diff from upstream.
+   * Remove FG_SCENERY/* and /tmp/*.xml from allowed Nasal paths.
+     Closes: #780716.
+ 
+  -- Markus Wanner <markus at bluegap.ch>  Mon, 13 Apr 2015 11:40:10 +0200
  
-  -- Markus Wanner <markus at bluegap.ch>  Wed, 18 Mar 2015 10:43:34 +0100
+ flightgear-data (3.4.0+dfsg-0~exp1) experimental; urgency=medium
+ 
+   [ Florent Rougon ]
+   * New upstream release 3.2 (Closes: #766251).
+   * Remove 766251.patch which is not necessary anymore.
+   * Adjust dependencies on flightgear.
+   * Drop the obsolete dummy packages fgfs-*.
+   * debian/rules: replace "find ... -exec {} \;" with
+     "find ... -execdir '{}' +" for more efficiency when calling chmod on
+     many files.
+   * Drop the obsolete debian/links file (link from
+     /usr/share/doc/fgfs-base/Docs to /usr/share/games/FlightGear/Docs).
+ 
+   [ Markus Wanner ]
+   * New upstream almost-release 3.4, tagged 3.4.0~rc99 to avoid confusion
+     with the eventual real 3.4.0 (Closes: #776913, #760698, #760077,
+     #760083).
+   * Drop patch translation-update-pt.diff, it got applied upstream.
+   * Drop references to Textures.high from d/rules. These directories
+     no longer exist. Add the new webgui.
+   * Update debian/copyright and debian/watch.
+   * Repack upstream's tarball: remove jquery, flot and leaflet from
+     webgui's 3rdparty. Also strip the unneeded copies of tzdata and the
+     liberation font.
+   * Add the necessary JavaScript dependencies, instead. Add patch
+     use-system-jslibs.diff to deal with the version-less jquery file
+     name of libjs-jquery.
+   * Add missing-sources for the sprintf js library.
+   * Bump S-V: no changes needed.
+   * Update the watch file.
+   * Use dh_link rather than the former dance in postinst/prerm. Drop
+     these two for flightgear-data-base.
+   * Drop another unnecessary LICENSE file.
+ 
+  -- Markus Wanner <markus at bluegap.ch>  Wed, 18 Feb 2015 22:59:19 +0100
  
  flightgear-data (3.0.0-2) unstable; urgency=medium
  

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