[pkg-fgfs-crew] [flightgear-data] 01/01: Lots of changes for 2016.1.0 and 2016.2.1, by Rebecca N. Palmer and myself.
Markus Wanner
markus_wanner-guest at moszumanska.debian.org
Tue May 31 20:27:22 UTC 2016
This is an automated email from the git hooks/post-receive script.
markus_wanner-guest pushed a commit to branch experimental
in repository flightgear-data.
commit 08b555d14c375561de358409300720955649a47b
Author: Markus Wanner <markus at bluegap.ch>
Date: Tue May 31 22:26:30 2016 +0200
Lots of changes for 2016.1.0 and 2016.2.1, by Rebecca N. Palmer and myself.
---
debian/changelog | 24 +++
debian/control | 41 ++---
debian/copyright | 9 +-
debian/flightgear-data-base.links | 7 +-
debian/get-orig-source | 19 +-
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/f14fix.diff | 164 -----------------
debian/patches/restrict-nasal-paths.diff | 18 --
debian/patches/series | 3 -
debian/patches/use-system-jslibs.diff | 84 ---------
debian/rules | 60 +------
debian/watch | 6 +-
23 files changed, 63 insertions(+), 858 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7861b8e..f727c68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+flightgear-data (1:2016.2.1+dfsg-2) UNRELEASED; urgency=medium
+
+ [ Rebecca N. Palmer ]
+ * New upstream release: 2016.1.1.
+ * Drop patches applied upstream.
+ * Remove some more embedded minified JavaScript; replace with
+ Depends+links where possible, builds from the real source
+ (in debian/missing-sources) otherwise. Closes: #787592.
+ * Drop -aircrafts package, as it would be nearly empty.
+ * Install all files not listed elsewhere into -base.
+ * Fix script permissions.
+ * Use https in Vcs-*.
+ * Drop unnecessary license copies.
+
+ [ Markus Wanner ]
+ * New upstream release; 2016.2.1.
+ * Remove Phi from this source package, bundle separately, allows
+ getting rid of the JavaScript dependencies and all missing-sources
+ * Update watch file to track the sourceforge site.
+ * Update get-orig-source to use mkorigtgz.
+ * Bump S-V: no changes required.
+
+ -- Markus Wanner <markus at bluegap.ch> Mon, 30 May 2016 15:28:33 +0200
+
flightgear-data (3.4.0+dfsg-1) unstable; urgency=medium
* Upload to unstable.
diff --git a/debian/control b/debian/control
index 8e7d25d..75b6be3 100644
--- a/debian/control
+++ b/debian/control
@@ -5,24 +5,19 @@ Maintainer: Debian FlightGear Crew <pkg-fgfs-crew at lists.alioth.debian.org>
Uploaders: Ove Kaaven <ovek at arcticnet.no>,
Markus Wanner <markus at bluegap.ch>
Build-Depends: debhelper (>= 7)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
Homepage: http://www.flightgear.org/
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/flightgear-data.git
-Vcs-Git: git://anonscm.debian.org/collab-maint/flightgear-data.git
+Vcs-Browser: https://anonscm.debian.org/git/collab-maint/flightgear-data.git
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/flightgear-data.git
Package: flightgear-data-base
Architecture: all
-Depends: tzdata,
- fonts-liberation,
- libjs-jquery,
- libjs-jquery-flot,
- libjs-leaflet,
- ${misc:Depends}
+Depends: tzdata, fonts-liberation, ${misc:Depends}
Replaces: fgfs-base (<< 2.10.0), fgfs-scenery-base (<< 2.10.0),
- fgfs-aircraft-base (<< 2.10.0~)
-Breaks: flightgear (<< 3.4.0~),
+ fgfs-aircraft-base (<< 2.10.0~), flightgear-data-aircrafts (<< 2016.1.0~)
+Breaks: flightgear (<< 2016.1.0~),
fgfs-base (<< 2.10.0~), fgfs-scenery-base (<< 2.10.0~),
- fgfs-aircraft-base (<< 2.10.0~)
+ fgfs-aircraft-base (<< 2.10.0~), flightgear-data-aircrafts (<< 2016.1.0~)
Description: FlightGear Flight Simulator -- base files
FlightGear is a free and highly sophisticated flight simulator.
.
@@ -36,29 +31,18 @@ Description: FlightGear Flight Simulator -- base files
Package: flightgear-data-ai
Architecture: all
Depends: ${misc:Depends}
-Breaks: flightgear (<< 3.4.0~), fgfs-base (<< 2.10.0~)
+Breaks: flightgear (<< 2016.1.0~), fgfs-base (<< 2.10.0~)
Description: FlightGear Flight Simulator -- standard AI data
FlightGear is a free and highly sophisticated flight simulator.
.
This package contains AI data, including AI aircrafts, flight plans,
traffic data and scenarios.
-Package: flightgear-data-aircrafts
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: fgfs-base (<< 2.0.0), fgfs-aircraft-base (<< 2.10.0~)
-Breaks: flightgear (<< 3.4.0~), fgfs-aircraft-base (<< 2.10.0~)
-Description: FlightGear Flight Simulator -- standard aircraft
- FlightGear is a free and highly sophisticated flight simulator.
- .
- This package contains more aircrafts that come with the standard
- FlightGear distribution.
-
Package: flightgear-data-models
Architecture: all
Depends: ${misc:Depends}
Replaces: fgfs-base (<< 2.0.0), fgfs-models-base (<< 2.10.0)
-Breaks: flightgear (<< 3.4.0~), fgfs-models-base (<< 2.10.0~)
+Breaks: flightgear (<< 2016.1.0~), fgfs-models-base (<< 2.10.0~)
Description: FlightGear Flight Simulator -- standard models
FlightGear is a free and highly sophisticated flight simulator.
.
@@ -68,10 +52,9 @@ Description: FlightGear Flight Simulator -- standard models
Package: flightgear-data-all
Architecture: all
Depends:
- flightgear-data-base (>= 3.4.0~),
- flightgear-data-ai (>= 3.4.0~),
- flightgear-data-aircrafts (>= 3.4.0~),
- flightgear-data-models (>= 3.4.0~),
+ flightgear-data-base (>= 2016.2.1~),
+ flightgear-data-ai (>= 2016.2.1~),
+ flightgear-data-models (>= 2016.2.1~),
${misc:Depends}
Description: FlightGear Flight Simulator - virtual package
FlightGear is a free and highly sophisticated flight simulator.
diff --git a/debian/copyright b/debian/copyright
index 18ac4b0..01b35fd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,16 +2,15 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: flightgear-data
Upstream-Contact: Curtis L. Olson <curt at flightgear.org>
Source: http://www.flightgear.org
+Files-Excluded:
+ Fonts/LiberationFonts
+ Phi
+ Timezone
Files: *
Copyright: 1999-2012 Curtis L. Olson <curt at flightgear.org>
and the the FlightGear team (see the Thanks file).
License: GPL-2+
-Files-Excluded: webgui/3rdparty/flot
- webgui/3rdparty/jquery
- webgui/3rdparty/leaflet-0.7.3
- Fonts/LiberationFonts
- Timezone
Files: Aircraft/Cub/*
Copyright: 1999-2012 Curtis L. Olson <curt at flightgear.org>
diff --git a/debian/flightgear-data-base.links b/debian/flightgear-data-base.links
index 36f3333..771ff73 100644
--- a/debian/flightgear-data-base.links
+++ b/debian/flightgear-data-base.links
@@ -1,5 +1,2 @@
-usr/share/zoneinfo usr/share/games/flightgear/Timezone
-usr/share/fonts/truetype/liberation usr/share/games/flightgear/Fonts/LiberationFonts
-usr/share/javascript/jquery usr/share/games/flightgear/webgui/3rdparty/jquery
-usr/share/javascript/jquery-flot usr/share/games/flightgear/webgui/3rdparty/flot
-usr/share/javascript/leaflet usr/share/games/flightgear/webgui/3rdparty/leaflet-0.7.3
+usr/share/zoneinfo usr/share/games/flightgear/Timezone
+usr/share/fonts/truetype/liberation usr/share/games/flightgear/Fonts/LiberationFonts
diff --git a/debian/get-orig-source b/debian/get-orig-source
index e6fb633..ea97884 100755
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -3,15 +3,14 @@
# Repack tarball to strip duplicate stuff.
PACKAGE=`dpkg-parsechangelog | sed -n 's/^Source: //p'`
-VERSION=`dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//'`
+VERSION=`dpkg-parsechangelog | sed -ne 's/^Version: [0-9]\+:\(.*\)+dfsg-.*/\1/p'`
-uscan --verbose --force-download --no-symlink
+# uscan --verbose --force-download --no-symlink
-bunzip2 -c ../FlightGear-data-${VERSION}.tar.bz2 \
- | tar --delete --wildcards -vf - \
- fgdata/webgui/3rdparty/flot \
- fgdata/webgui/3rdparty/jquery \
- fgdata/webgui/3rdparty/leaflet-0.7.3 \
- fgdata/Fonts/LiberationFonts \
- fgdata/Timezone \
- | bzip2 -c > ../${PACKAGE}_${VERSION}+dfsg.orig.tar.bz2
+mk-origtargz --package $PACKAGE \
+ --version $VERSION \
+ --repack-suffix +dfsg \
+ --compression bzip2 \
+ --directory .. \
+ --copyright-file debian/copyright \
+ ../FlightGear-$VERSION-data.tar.bz2
diff --git a/debian/missing-sources/sprintf.js-1.0.2/.gitignore b/debian/missing-sources/sprintf.js-1.0.2/.gitignore
deleted file mode 100644
index 096746c..0000000
--- a/debian/missing-sources/sprintf.js-1.0.2/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/node_modules/
\ No newline at end of file
diff --git a/debian/missing-sources/sprintf.js-1.0.2/LICENSE b/debian/missing-sources/sprintf.js-1.0.2/LICENSE
deleted file mode 100644
index 5c74c82..0000000
--- a/debian/missing-sources/sprintf.js-1.0.2/LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright (c) 2007-2013, Alexandru Marasteanu <hello [at) alexei (dot] ro>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-* Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-* Neither the name of this software nor the names of its contributors may be
- used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/missing-sources/sprintf.js-1.0.2/README.md b/debian/missing-sources/sprintf.js-1.0.2/README.md
deleted file mode 100644
index d4c7203..0000000
--- a/debian/missing-sources/sprintf.js-1.0.2/README.md
+++ /dev/null
@@ -1,82 +0,0 @@
-# sprintf.js
-**sprintf.js** is a complete open source JavaScript sprintf implementation for the *browser* and *node.js*.
-
-Its prototype is simple:
-
- string sprintf(string format , [mixed arg1 [, mixed arg2 [ ,...]]])
-
-The placeholders in the format string are marked by `%` and are followed by one or more of these elements, in this order:
-
-* An optional number followed by a `$` sign that selects which argument index to use for the value. If not specified, arguments will be placed in the same order as the placeholders in the input string.
-* An optional `+` sign that forces to preceed the result with a plus or minus sign on numeric values. By default, only the `-` sign is used on negative numbers.
-* An optional padding specifier that says what character to use for padding (if specified). Possible values are `0` or any other character precedeed by a `'` (single quote). The default is to pad with *spaces*.
-* An optional `-` sign, that causes sprintf to left-align the result of this placeholder. The default is to right-align the result.
-* An optional number, that says how many characters the result should have. If the value to be returned is shorter than this number, the result will be padded.
-* An optional precision modifier, consisting of a `.` (dot) followed by a number, that says how many digits should be displayed for floating point numbers. When used on a string, it causes the result to be truncated.
-* A type specifier that can be any of:
- * `%` — yields a literal `%` character
- * `b` — yields an integer as a binary number
- * `c` — yields an integer as the character with that ASCII value
- * `d` or `i` — yields an integer as a signed decimal number
- * `e` — yields a float using scientific notation
- * `u` — yields an integer as an unsigned decimal number
- * `f` — yields a float as is
- * `o` — yields an integer as an octal number
- * `s` — yields a string as is
- * `x` — yields an integer as a hexadecimal number (lower-case)
- * `X` — yields an integer as a hexadecimal number (upper-case)
-
-## JavaScript `vsprintf`
-`vsprintf` is the same as `sprintf` except that it accepts an array of arguments, rather than a variable number of arguments:
-
- vsprintf("The first 4 letters of the english alphabet are: %s, %s, %s and %s", ["a", "b", "c", "d"])
-
-## Argument swapping
-You can also swap the arguments. That is, the order of the placeholders doesn't have to match the order of the arguments. You can do that by simply indicating in the format string which arguments the placeholders refer to:
-
- sprintf("%2$s %3$s a %1$s", "cracker", "Polly", "wants")
-And, of course, you can repeat the placeholders without having to increase the number of arguments.
-
-## Named arguments
-Format strings may contain replacement fields rather than positional placeholders. Instead of referring to a certain argument, you can now refer to a certain key within an object. Replacement fields are surrounded by rounded parentheses - `(` and `)` - and begin with a keyword that refers to a key:
-
- var user = {
- name: "Dolly"
- }
- sprintf("Hello %(name)s", user) // Hello Dolly
-Keywords in replacement fields can be optionally followed by any number of keywords or indexes:
-
- var users = [
- {name: "Dolly"},
- {name: "Molly"},
- {name: "Polly"}
- ]
- sprintf("Hello %(users[0].name)s, %(users[1].name)s and %(users[2].name)s", {users: users}) // Hello Dolly, Molly and Polly
-Note: mixing positional and named placeholders is not (yet) supported
-
-## Computed values
-You can pass in a function as a dynamic value and it will be invoked (with no arguments) in order to compute the value on-the-fly.
-
- sprintf("Current timestamp: %d", Date.now) // Current timestamp: 1398005382890
- sprintf("Current date and time: %s", function() { return new Date().toString() })
-
-# AngularJS
-You can now use `sprintf` and `vsprintf` (also aliased as `fmt` and `vfmt` respectively) in your AngularJS projects. See `demo/`.
-
-# Installation
-
-## Via Bower
-
- bower install sprintf
-
-## Or as a node.js module
-
- npm install sprintf-js
-
-### Usage
-
- var sprintf = require("sprintf-js").sprintf,
- vsprintf = require("sprintf-js").vsprintf
-
- sprintf("%2$s %3$s a %1$s", "cracker", "Polly", "wants")
- vsprintf("The first 4 letters of the english alphabet are: %s, %s, %s and %s", ["a", "b", "c", "d"])
diff --git a/debian/missing-sources/sprintf.js-1.0.2/bower.json b/debian/missing-sources/sprintf.js-1.0.2/bower.json
deleted file mode 100644
index ecdf6d5..0000000
--- a/debian/missing-sources/sprintf.js-1.0.2/bower.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "name": "sprintf",
- "description": "JavaScript sprintf implementation",
- "version": "1.0.2",
- "main": "src/sprintf.js",
- "license": "BSD-3-Clause-Clear",
- "keywords": ["sprintf", "string", "formatting"],
- "authors": ["Alexandru Marasteanu <hello at alexei.ro> (http://alexei.ro/)"],
- "homepage": "https://github.com/alexei/sprintf.js",
- "repository": {
- "type": "git",
- "url": "git://github.com/alexei/sprintf.js.git"
- }
-}
diff --git a/debian/missing-sources/sprintf.js-1.0.2/demo/angular.html b/debian/missing-sources/sprintf.js-1.0.2/demo/angular.html
deleted file mode 100644
index 3559efd..0000000
--- a/debian/missing-sources/sprintf.js-1.0.2/demo/angular.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!doctype html>
-<html ng-app="app">
-<head>
- <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.0-rc.3/angular.min.js"></script>
- <script src="../src/sprintf.js"></script>
- <script src="../src/angular-sprintf.js"></script>
-</head>
-<body>
- <pre>{{ "%+010d"|sprintf:-123 }}</pre>
- <pre>{{ "%+010d"|vsprintf:[-123] }}</pre>
- <pre>{{ "%+010d"|fmt:-123 }}</pre>
- <pre>{{ "%+010d"|vfmt:[-123] }}</pre>
- <pre>{{ "I've got %2$d apples and %1$d oranges."|fmt:4:2 }}</pre>
- <pre>{{ "I've got %(apples)d apples and %(oranges)d oranges."|fmt:{apples: 2, oranges: 4} }}</pre>
-
- <script>
- angular.module("app", ["sprintf"])
- </script>
-</body>
-</html>
diff --git a/debian/missing-sources/sprintf.js-1.0.2/dist/angular-sprintf.min.map b/debian/missing-sources/sprintf.js-1.0.2/dist/angular-sprintf.min.map
deleted file mode 100644
index 055964c..0000000
--- a/debian/missing-sources/sprintf.js-1.0.2/dist/angular-sprintf.min.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"angular-sprintf.min.js","sources":["../src/angular-sprintf.js"],"names":["angular","module","filter","sprintf","apply","arguments","$filter","format","argv","vsprintf"],"mappings":";;AAAAA,QACIC,OAAO,cACPC,OAAO,UAAW,WACd,MAAO,YACH,MAAOC,SAAQC,MAAM,KAAMC,cAGnCH,OAAO,OAAQ,UAAW,SAASI,GAC/B,MAAOA,GAAQ,cAEnBJ,OAAO,WAAY,WACf,MAAO,UAASK,EAAQC,GACpB,MAAOC,UAASF,EAAQC,MAGhCN,OAAO,QAAS,UAAW,SAASI,GAChC,MAAOA,GAAQ"}
\ No newline at end of file
diff --git a/debian/missing-sources/sprintf.js-1.0.2/dist/sprintf.min.map b/debian/missing-sources/sprintf.js-1.0.2/dist/sprintf.min.map
deleted file mode 100644
index 33fe163..0000000
--- a/debian/missing-sources/sprintf.js-1.0.2/dist/sprintf.min.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"sprintf.min.js","sources":["../src/sprintf.js"],"names":["window","sprintf","key","arguments","cache","hasOwnProperty","parse","format","call","get_type","variable","Object","prototype","toString","slice","toLowerCase","str_repeat","input","multiplier","Array","join","re","not_string","number","text","modulo","placeholder","key_access","index_access","sign","parse_tree","argv","arg","i","k","match","pad","pad_character","pad_length","cursor","tree_length","length","n [...]
\ No newline at end of file
diff --git a/debian/missing-sources/sprintf.js-1.0.2/gruntfile.js b/debian/missing-sources/sprintf.js-1.0.2/gruntfile.js
deleted file mode 100644
index 246e1c3..0000000
--- a/debian/missing-sources/sprintf.js-1.0.2/gruntfile.js
+++ /dev/null
@@ -1,36 +0,0 @@
-module.exports = function(grunt) {
- grunt.initConfig({
- pkg: grunt.file.readJSON("package.json"),
-
- uglify: {
- options: {
- banner: "/*! <%= pkg.name %> | <%= pkg.author %> | <%= pkg.license %> */\n",
- sourceMap: true
- },
- build: {
- files: [
- {
- src: "src/sprintf.js",
- dest: "dist/sprintf.min.js"
- },
- {
- src: "src/angular-sprintf.js",
- dest: "dist/angular-sprintf.min.js"
- }
- ]
- }
- },
-
- watch: {
- js: {
- files: "src/*.js",
- tasks: ["uglify"]
- }
- }
- })
-
- grunt.loadNpmTasks("grunt-contrib-uglify")
- grunt.loadNpmTasks("grunt-contrib-watch")
-
- grunt.registerTask("default", ["uglify", "watch"])
-}
diff --git a/debian/missing-sources/sprintf.js-1.0.2/package.json b/debian/missing-sources/sprintf.js-1.0.2/package.json
deleted file mode 100644
index ebf4a21..0000000
--- a/debian/missing-sources/sprintf.js-1.0.2/package.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "name": "sprintf-js",
- "version": "1.0.2",
- "description": "JavaScript sprintf implementation",
- "author": "Alexandru Marasteanu <hello at alexei.ro> (http://alexei.ro/)",
- "main": "src/sprintf.js",
- "scripts": {
- "test": "mocha test/test.js"
- },
- "repository": {
- "type": "git",
- "url": "https://github.com/alexei/sprintf.js.git"
- },
- "license": "BSD-3-Clause",
- "readmeFilename": "README.md",
- "devDependencies": {
- "mocha": "*",
- "grunt": "*",
- "grunt-contrib-watch": "*",
- "grunt-contrib-uglify": "*"
- }
-}
diff --git a/debian/missing-sources/sprintf.js-1.0.2/src/angular-sprintf.js b/debian/missing-sources/sprintf.js-1.0.2/src/angular-sprintf.js
deleted file mode 100644
index 9c69123..0000000
--- a/debian/missing-sources/sprintf.js-1.0.2/src/angular-sprintf.js
+++ /dev/null
@@ -1,18 +0,0 @@
-angular.
- module("sprintf", []).
- filter("sprintf", function() {
- return function() {
- return sprintf.apply(null, arguments)
- }
- }).
- filter("fmt", ["$filter", function($filter) {
- return $filter("sprintf")
- }]).
- filter("vsprintf", function() {
- return function(format, argv) {
- return vsprintf(format, argv)
- }
- }).
- filter("vfmt", ["$filter", function($filter) {
- return $filter("vsprintf")
- }])
diff --git a/debian/missing-sources/sprintf.js-1.0.2/src/sprintf.js b/debian/missing-sources/sprintf.js-1.0.2/src/sprintf.js
deleted file mode 100644
index 0ccb64c..0000000
--- a/debian/missing-sources/sprintf.js-1.0.2/src/sprintf.js
+++ /dev/null
@@ -1,195 +0,0 @@
-(function(window) {
- var re = {
- not_string: /[^s]/,
- number: /[dief]/,
- text: /^[^\x25]+/,
- modulo: /^\x25{2}/,
- placeholder: /^\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-fiosuxX])/,
- key: /^([a-z_][a-z_\d]*)/i,
- key_access: /^\.([a-z_][a-z_\d]*)/i,
- index_access: /^\[(\d+)\]/,
- sign: /^[\+\-]/
- }
-
- function sprintf() {
- var key = arguments[0], cache = sprintf.cache
- if (!(cache[key] && cache.hasOwnProperty(key))) {
- cache[key] = sprintf.parse(key)
- }
- return sprintf.format.call(null, cache[key], arguments)
- }
-
- sprintf.format = function(parse_tree, argv) {
- var cursor = 1, tree_length = parse_tree.length, node_type = "", arg, output = [], i, k, match, pad, pad_character, pad_length, is_positive = true, sign = ""
- for (i = 0; i < tree_length; i++) {
- node_type = get_type(parse_tree[i])
- if (node_type === "string") {
- output[output.length] = parse_tree[i]
- }
- else if (node_type === "array") {
- match = parse_tree[i] // convenience purposes only
- if (match[2]) { // keyword argument
- arg = argv[cursor]
- for (k = 0; k < match[2].length; k++) {
- if (!arg.hasOwnProperty(match[2][k])) {
- throw new Error(sprintf("[sprintf] property '%s' does not exist", match[2][k]))
- }
- arg = arg[match[2][k]]
- }
- }
- else if (match[1]) { // positional argument (explicit)
- arg = argv[match[1]]
- }
- else { // positional argument (implicit)
- arg = argv[cursor++]
- }
-
- if (get_type(arg) == "function") {
- arg = arg()
- }
-
- if (re.not_string.test(match[8]) && (get_type(arg) != "number" && isNaN(arg))) {
- throw new TypeError(sprintf("[sprintf] expecting number but found %s", get_type(arg)))
- }
-
- if (re.number.test(match[8])) {
- is_positive = arg >= 0
- }
-
- switch (match[8]) {
- case "b":
- arg = arg.toString(2)
- break
- case "c":
- arg = String.fromCharCode(arg)
- break
- case "d":
- case "i":
- arg = parseInt(arg, 10)
- break
- case "e":
- arg = match[7] ? arg.toExponential(match[7]) : arg.toExponential()
- break
- case "f":
- arg = match[7] ? parseFloat(arg).toFixed(match[7]) : parseFloat(arg)
- break
- case "o":
- arg = arg.toString(8)
- break
- case "s":
- arg = ((arg = String(arg)) && match[7] ? arg.substring(0, match[7]) : arg)
- break
- case "u":
- arg = arg >>> 0
- break
- case "x":
- arg = arg.toString(16)
- break
- case "X":
- arg = arg.toString(16).toUpperCase()
- break
- }
- if (re.number.test(match[8]) && (!is_positive || match[3])) {
- sign = is_positive ? "+" : "-"
- arg = arg.toString().replace(re.sign, "")
- }
- else {
- sign = ""
- }
- pad_character = match[4] ? match[4] === "0" ? "0" : match[4].charAt(1) : " "
- pad_length = match[6] - (sign + arg).length
- pad = match[6] ? (pad_length > 0 ? str_repeat(pad_character, pad_length) : "") : ""
- output[output.length] = match[5] ? sign + arg + pad : (pad_character === "0" ? sign + pad + arg : pad + sign + arg)
- }
- }
- return output.join("")
- }
-
- sprintf.cache = {}
-
- sprintf.parse = function(fmt) {
- var _fmt = fmt, match = [], parse_tree = [], arg_names = 0
- while (_fmt) {
- if ((match = re.text.exec(_fmt)) !== null) {
- parse_tree[parse_tree.length] = match[0]
- }
- else if ((match = re.modulo.exec(_fmt)) !== null) {
- parse_tree[parse_tree.length] = "%"
- }
- else if ((match = re.placeholder.exec(_fmt)) !== null) {
- if (match[2]) {
- arg_names |= 1
- var field_list = [], replacement_field = match[2], field_match = []
- if ((field_match = re.key.exec(replacement_field)) !== null) {
- field_list[field_list.length] = field_match[1]
- while ((replacement_field = replacement_field.substring(field_match[0].length)) !== "") {
- if ((field_match = re.key_access.exec(replacement_field)) !== null) {
- field_list[field_list.length] = field_match[1]
- }
- else if ((field_match = re.index_access.exec(replacement_field)) !== null) {
- field_list[field_list.length] = field_match[1]
- }
- else {
- throw new SyntaxError("[sprintf] failed to parse named argument key")
- }
- }
- }
- else {
- throw new SyntaxError("[sprintf] failed to parse named argument key")
- }
- match[2] = field_list
- }
- else {
- arg_names |= 2
- }
- if (arg_names === 3) {
- throw new Error("[sprintf] mixing positional and named placeholders is not (yet) supported")
- }
- parse_tree[parse_tree.length] = match
- }
- else {
- throw new SyntaxError("[sprintf] unexpected placeholder")
- }
- _fmt = _fmt.substring(match[0].length)
- }
- return parse_tree
- }
-
- var vsprintf = function(fmt, argv, _argv) {
- _argv = (argv || []).slice(0)
- _argv.splice(0, 0, fmt)
- return sprintf.apply(null, _argv)
- }
-
- /**
- * helpers
- */
- function get_type(variable) {
- return Object.prototype.toString.call(variable).slice(8, -1).toLowerCase()
- }
-
- function str_repeat(input, multiplier) {
- return Array(multiplier + 1).join(input)
- }
-
- /**
- * export to either browser or node.js
- */
- if (typeof exports !== "undefined") {
- exports.sprintf = sprintf
- exports.vsprintf = vsprintf
- }
- else {
- window.sprintf = sprintf
- window.vsprintf = vsprintf
-
- if (typeof define === "function" && define.amd) {
- define(function() {
- return {
- sprintf: sprintf,
- vsprintf: vsprintf
- }
- })
- }
- }
-})(typeof window === "undefined" ? this : window);
diff --git a/debian/missing-sources/sprintf.js-1.0.2/test/test.js b/debian/missing-sources/sprintf.js-1.0.2/test/test.js
deleted file mode 100644
index 1717d8f..0000000
--- a/debian/missing-sources/sprintf.js-1.0.2/test/test.js
+++ /dev/null
@@ -1,72 +0,0 @@
-var assert = require("assert"),
- sprintfjs = require("../src/sprintf.js"),
- sprintf = sprintfjs.sprintf,
- vsprintf = sprintfjs.vsprintf
-
-describe("sprintfjs", function() {
- it("should return formated strings for simple placeholders", function() {
- assert.equal("%", sprintf("%%"))
- assert.equal("10", sprintf("%b", 2))
- assert.equal("A", sprintf("%c", 65))
- assert.equal("2", sprintf("%d", 2))
- assert.equal("2", sprintf("%i", 2))
- assert.equal("2", sprintf("%d", "2"))
- assert.equal("2", sprintf("%i", "2"))
- assert.equal("2e+0", sprintf("%e", 2))
- assert.equal("2", sprintf("%u", 2))
- assert.equal("4294967294", sprintf("%u", -2))
- assert.equal("2.2", sprintf("%f", 2.2))
- assert.equal("10", sprintf("%o", 8))
- assert.equal("%s", sprintf("%s", "%s"))
- assert.equal("ff", sprintf("%x", 255))
- assert.equal("FF", sprintf("%X", 255))
- assert.equal("Polly wants a cracker", sprintf("%2$s %3$s a %1$s", "cracker", "Polly", "wants"))
- assert.equal("Hello world!", sprintf("Hello %(who)s!", {"who": "world"}))
- })
-
- it("should return formated strings for complex placeholders", function() {
- // sign
- assert.equal("2", sprintf("%d", 2))
- assert.equal("-2", sprintf("%d", -2))
- assert.equal("+2", sprintf("%+d", 2))
- assert.equal("-2", sprintf("%+d", -2))
- assert.equal("2", sprintf("%i", 2))
- assert.equal("-2", sprintf("%i", -2))
- assert.equal("+2", sprintf("%+i", 2))
- assert.equal("-2", sprintf("%+i", -2))
- assert.equal("2.2", sprintf("%f", 2.2))
- assert.equal("-2.2", sprintf("%f", -2.2))
- assert.equal("+2.2", sprintf("%+f", 2.2))
- assert.equal("-2.2", sprintf("%+f", -2.2))
- assert.equal("-2.3", sprintf("%+.1f", -2.34))
- assert.equal("-0.0", sprintf("%+.1f", -0.01))
- assert.equal("-000000123", sprintf("%+010d", -123))
- assert.equal("______-123", sprintf("%+'_10d", -123))
- assert.equal("-234.34 123.2", sprintf("%f %f", -234.34, 123.2))
-
- // padding
- assert.equal("-0002", sprintf("%05d", -2))
- assert.equal("-0002", sprintf("%05i", -2))
- assert.equal(" <", sprintf("%5s", "<"))
- assert.equal("0000<", sprintf("%05s", "<"))
- assert.equal("____<", sprintf("%'_5s", "<"))
- assert.equal("> ", sprintf("%-5s", ">"))
- assert.equal(">0000", sprintf("%0-5s", ">"))
- assert.equal(">____", sprintf("%'_-5s", ">"))
- assert.equal("xxxxxx", sprintf("%5s", "xxxxxx"))
- assert.equal("1234", sprintf("%02u", 1234))
- assert.equal(" -10.235", sprintf("%8.3f", -10.23456))
- assert.equal("-12.34 xxx", sprintf("%f %s", -12.34, "xxx"))
-
- // precision
- assert.equal("2.3", sprintf("%.1f", 2.345))
- assert.equal("xxxxx", sprintf("%5.5s", "xxxxxx"))
- assert.equal(" x", sprintf("%5.1s", "xxxxxx"))
-
- })
-
- it("should return formated strings for callbacks", function() {
- assert.equal("foobar", sprintf("%s", function() { return "foobar" }))
- assert.equal(Date.now(), sprintf("%s", Date.now)) // should pass...
- })
-})
diff --git a/debian/patches/f14fix.diff b/debian/patches/f14fix.diff
deleted file mode 100644
index 0c8eeb4..0000000
--- a/debian/patches/f14fix.diff
+++ /dev/null
@@ -1,164 +0,0 @@
-Description: F14-B : Use correct property for scene illumination
- otherwise we get black contrails for MP aircraft.
-Origin: upstream d23c88c76151243141223f01f88adf8479582ae7
-Author: Richard Harrison
-
-diff --git a/Aircraft/f-14b/Models/Fx/contrail1.xml b/Aircraft/f-14b/Models/Fx/contrail1.xml
-index d6bae46..3bc4ad8 100644
---- a/Aircraft/f-14b/Models/Fx/contrail1.xml
-+++ b/Aircraft/f-14b/Models/Fx/contrail1.xml
-@@ -62,9 +62,9 @@
- <particle>
- <start>
- <color>
-- <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
-- <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
-- <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
-+ <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
-+ <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
-+ <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
- <alpha><value> 0.2 </value></alpha>
- </color>
- <size>
-@@ -74,9 +74,9 @@
-
- <end>
- <color>
-- <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
-- <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
-- <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
-+ <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
-+ <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
-+ <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
- <alpha><value> 0.6 </value></alpha>
- </color>
- <size>
-diff --git a/Aircraft/f-14b/Models/Fx/contrail2.xml b/Aircraft/f-14b/Models/Fx/contrail2.xml
-index 8a4665b..f8f39cf 100644
---- a/Aircraft/f-14b/Models/Fx/contrail2.xml
-+++ b/Aircraft/f-14b/Models/Fx/contrail2.xml
-@@ -62,9 +62,9 @@
- <particle>
- <start>
- <color>
-- <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
-- <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
-- <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
-+ <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
-+ <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
-+ <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
- <alpha><value> 0.2 </value></alpha>
- </color>
- <size>
-@@ -74,9 +74,9 @@
-
- <end>
- <color>
-- <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
-- <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
-- <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
-+ <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
-+ <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
-+ <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
- <alpha><value> 0.6 </value></alpha>
- </color>
- <size>
-diff --git a/Aircraft/f-14b/Models/Fx/smoke-generator.xml b/Aircraft/f-14b/Models/Fx/smoke-generator.xml
-index d5077b2..7674993 100644
---- a/Aircraft/f-14b/Models/Fx/smoke-generator.xml
-+++ b/Aircraft/f-14b/Models/Fx/smoke-generator.xml
-@@ -50,9 +50,9 @@ based on standard my wingtip contrail: rjh at zaretto.com
- <particle>
- <start>
- <color>
-- <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
-- <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
-- <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
-+ <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
-+ <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
-+ <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
- <alpha><value> 0.6 </value></alpha>
- </color>
- <size>
-@@ -62,9 +62,9 @@ based on standard my wingtip contrail: rjh at zaretto.com
-
- <end>
- <color>
-- <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
-- <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
-- <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
-+ <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
-+ <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
-+ <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
- <alpha><value> 0.00000001</value></alpha>
- </color>
- <size>
-diff --git a/Aircraft/f-14b/Models/Fx/smoke-trail.xml b/Aircraft/f-14b/Models/Fx/smoke-trail.xml
-index 4fff354..ded9b83 100644
---- a/Aircraft/f-14b/Models/Fx/smoke-trail.xml
-+++ b/Aircraft/f-14b/Models/Fx/smoke-trail.xml
-@@ -3,7 +3,7 @@ based on standard my wingtip contrail: rjh at zaretto.com
- -->
- <PropertyList>
- <particlesystem>
-- <name>wingroot-smoke</name>
-+ <name>Smoke Generator</name>
- <texture>vapour.png</texture>
-
- <emissive type="bool">false</emissive>
-@@ -50,9 +50,9 @@ based on standard my wingtip contrail: rjh at zaretto.com
- <particle>
- <start>
- <color>
-- <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
-- <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
-- <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
-+ <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
-+ <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
-+ <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
- <alpha><value> 0.6 </value></alpha>
- </color>
- <size>
-@@ -62,9 +62,9 @@ based on standard my wingtip contrail: rjh at zaretto.com
-
- <end>
- <color>
-- <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
-- <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
-- <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
-+ <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
-+ <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
-+ <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
- <alpha><value> 0.00000001</value></alpha>
- </color>
- <size>
-diff --git a/Aircraft/f-14b/Models/Fx/vapour.xml b/Aircraft/f-14b/Models/Fx/vapour.xml
-index cfde110..243a91a 100644
---- a/Aircraft/f-14b/Models/Fx/vapour.xml
-+++ b/Aircraft/f-14b/Models/Fx/vapour.xml
-@@ -79,9 +79,9 @@ based on standard FG wingtip contrail example; but modified condition params
- <particle>
- <start>
- <color>
-- <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
-- <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
-- <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
-+ <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
-+ <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
-+ <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
- <alpha><value> 0.5 </value></alpha>
- </color>
- <size>
-@@ -91,9 +91,9 @@ based on standard FG wingtip contrail example; but modified condition params
-
- <end>
- <color>
-- <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
-- <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
-- <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
-+ <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
-+ <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
-+ <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
- <alpha><value> 0.1 </value></alpha>
- </color>
- <size>
diff --git a/debian/patches/restrict-nasal-paths.diff b/debian/patches/restrict-nasal-paths.diff
deleted file mode 100644
index 05770fa..0000000
--- a/debian/patches/restrict-nasal-paths.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Remove FG_SCENERY/* and /tmp/*.xml from allowed paths list
-
-Author: Rebecca Palmer <rebecca_palmer at zoho.com>
-Bug-Debian: https://bugs.debian.org/780716 https://bugs.debian.org/780867
-Forwarded: not-needed
-
---- a/Nasal/IOrules
-+++ b/Nasal/IOrules
-@@ -28,9 +28,7 @@
- READ ALLOW $FG_ROOT/*
- READ ALLOW $FG_HOME/*
- READ ALLOW $FG_AIRCRAFT/*
--READ ALLOW $FG_SCENERY/*
-
--WRITE ALLOW /tmp/*.xml
- WRITE ALLOW $FG_HOME/*.sav
- WRITE ALLOW $FG_HOME/*.log
- WRITE ALLOW $FG_HOME/cache/*
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7f993e0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-use-system-jslibs.diff
-f14fix.diff
-restrict-nasal-paths.diff
diff --git a/debian/patches/use-system-jslibs.diff b/debian/patches/use-system-jslibs.diff
deleted file mode 100644
index afe3018..0000000
--- a/debian/patches/use-system-jslibs.diff
+++ /dev/null
@@ -1,84 +0,0 @@
-Description: Correct all references to jquery.
- The original sources provide a versioned JavaScript file, where
- as the libjs-jquery package's file is just jquery.min.js.
-Author: Markus Wanner <markus at bluegap.ch>
-Last-Update: 2015-02-18
-Forwarded: not-needed
-
---- a/Aircraft/SenecaII/WebPanel/Left.html
-+++ b/Aircraft/SenecaII/WebPanel/Left.html
-@@ -33,7 +33,7 @@
- </style>
-
- <script type="text/javascript" charset="utf-8"
-- src="/gui/3rdparty/jquery/jquery-1.11.1.min.js"></script>
-+ src="/gui/3rdparty/jquery/jquery.min.js"></script>
- <script type="text/javascript" charset="utf-8" src="fgfs.js"></script>
- <script type="text/javascript" charset="utf-8" src="jquery.fganimate.js"></script>
- <script type="text/javascript" charset="utf-8">
---- a/Aircraft/SenecaII/WebPanel/Panel1.html
-+++ b/Aircraft/SenecaII/WebPanel/Panel1.html
-@@ -76,7 +76,7 @@
- </style>
-
- <script type="text/javascript" charset="utf-8"
-- src="/gui/3rdparty/jquery/jquery-1.11.1.min.js"></script>
-+ src="/gui/3rdparty/jquery/jquery.min.js"></script>
- <script type="text/javascript" charset="utf-8" src="/gui/lib/jquery.fganimate.js"></script>
- <script type="text/javascript" charset="utf-8" src="/gui/lib/fgfs.js"></script>
- <script type="text/javascript" charset="utf-8">
---- a/webgui/examples/FGPanel-Sample.html
-+++ b/webgui/examples/FGPanel-Sample.html
-@@ -33,7 +33,7 @@
- </style>
-
- <script type="text/javascript" charset="utf-8"
-- src="/gui/3rdparty/jquery/jquery-1.11.1.min.js"></script>
-+ src="/gui/3rdparty/jquery/jquery.min.js"></script>
- <script type="text/javascript" charset="utf-8" src="/gui/lib/jquery.fganimate.js"></script>
- <script type="text/javascript" charset="utf-8" src="/gui/lib/fgfs.js"></script>
- </head>
---- a/webgui/instruments/kingradio.html
-+++ b/webgui/instruments/kingradio.html
-@@ -22,7 +22,7 @@
- <div style="clear: both"></div>
- </div>
-
-- <script src="../3rdparty/jquery/jquery-1.11.1.min.js"
-+ <script src="../3rdparty/jquery/jquery.min.js"
- type="text/javascript"></script>
- <script src="../lib/fgcommand.js" type="text/javascript"></script>
- <script src="../lib/props.js" type="text/javascript"></script>
---- a/webgui/map/index-2.0.html
-+++ b/webgui/map/index-2.0.html
-@@ -13,7 +13,7 @@
- <link rel="shortcut icon" sizes="200x200" href="/img/FlightGear_logo.png">
- <link rel="icon" sizes="200x200" href="/img/FlightGear_logo.png">
-
--<script src="../3rdparty/jquery/jquery-1.11.1.min.js" type="text/javascript"></script>
-+<script src="../3rdparty/jquery/jquery.min.js" type="text/javascript"></script>
- <link rel="stylesheet" href="../3rdparty/leaflet-0.7.3/leaflet.css" />
- <script src="../3rdparty/leaflet-0.7.3/leaflet.js" type="text/javascript"></script>
- <script src="../lib/fgfs.js" type="text/javascript"></script>
---- a/webgui/map/index.html
-+++ b/webgui/map/index.html
-@@ -1,7 +1,7 @@
- <!doctype html>
- <html>
- <head>
--<script src="../3rdparty/jquery/jquery-1.11.1.min.js"
-+<script src="../3rdparty/jquery/jquery.min.js"
- type="text/javascript"></script>
- <link rel="stylesheet"
- href="../3rdparty/leaflet-0.7.3/leaflet.css" />
---- a/webgui/radio.html
-+++ b/webgui/radio.html
-@@ -79,7 +79,7 @@
- <div id="footer">
- </div>
- </div>
-- <script src="3rdparty/jquery/jquery-1.11.1.min.js" type="text/javascript"></script>
-+ <script src="3rdparty/jquery/jquery.min.js" type="text/javascript"></script>
- <script src="lib/fgcommand.js" type="text/javascript"></script>
- <script src="lib/props.js" type="text/javascript"></script>
- <script src="radio.js" type="text/javascript"></script>
diff --git a/debian/rules b/debian/rules
index b5b77aa..6217b37 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,62 +9,22 @@
override_dh_auto_install:
dh_installdirs -pflightgear-data-base usr/share/games/flightgear
dh_installdirs -pflightgear-data-ai usr/share/games/flightgear
- dh_installdirs -pflightgear-data-aircrafts usr/share/games/flightgear
dh_installdirs -pflightgear-data-models usr/share/games/flightgear
-
+
# Contents of flightgear-data-base
- cp -av \
- $(CURDIR)/Airports \
- $(CURDIR)/Astro \
- $(CURDIR)/ATC \
- $(CURDIR)/Docs \
- $(CURDIR)/Effects \
- $(CURDIR)/Environment \
- $(CURDIR)/Fonts \
- $(CURDIR)/gui \
- $(CURDIR)/HLA \
- $(CURDIR)/Huds \
- $(CURDIR)/Input \
- $(CURDIR)/Lighting \
- $(CURDIR)/Materials \
- $(CURDIR)/MP \
- $(CURDIR)/Nasal \
- $(CURDIR)/Navaids \
- $(CURDIR)/Protocol \
- $(CURDIR)/Scenery \
- $(CURDIR)/Shaders \
- $(CURDIR)/Sounds \
- $(CURDIR)/Textures \
- $(CURDIR)/Translations \
- $(CURDIR)/webgui \
- $(CURDIR)/*.xml \
- $(CURDIR)/version \
+ cp -av `ls -1 | grep -v -e debian` \
debian/flightgear-data-base/usr/share/games/flightgear/
# Contents of flightgear-data-ai
- cp -av \
- $(CURDIR)/AI \
+ mv -v \
+ debian/flightgear-data-base/usr/share/games/flightgear/AI \
debian/flightgear-data-ai/usr/share/games/flightgear
-# Contents of flightgear-data-aircrafts
- cp -av \
- $(CURDIR)/Aircraft \
- debian/flightgear-data-aircrafts/usr/share/games/flightgear
-
# Contents of flightgear-data-models
- cp -av \
- $(CURDIR)/Models \
+ mv -v \
+ debian/flightgear-data-base/usr/share/games/flightgear/Models \
debian/flightgear-data-models/usr/share/games/flightgear
-# Put shared aircraft parts as well as the default aircraft into
-# flightgear-data-base rather than flightgear-aircraft-data
- dh_installdirs --package=flightgear-data-base usr/share/games/flightgear/Aircraft
- mv -v $(CURDIR)/debian/flightgear-data-aircrafts/usr/share/games/flightgear/Aircraft/Generic \
- $(CURDIR)/debian/flightgear-data-aircrafts/usr/share/games/flightgear/Aircraft/Instruments \
- $(CURDIR)/debian/flightgear-data-aircrafts/usr/share/games/flightgear/Aircraft/Instruments-3d \
- $(CURDIR)/debian/flightgear-data-aircrafts/usr/share/games/flightgear/Aircraft/c172p \
- $(CURDIR)/debian/flightgear-data-base/usr/share/games/flightgear/Aircraft
-
# Also move the performance db back into the base package, as
# flightgear errs out without it.
dh_installdirs --package=flightgear-data-base usr/share/games/flightgear/AI/Aircraft
@@ -83,14 +43,12 @@ override_dh_auto_install:
# Drop a couple of extra license files which are not needed due to
# debian/copyright.
- rm -f $(CURDIR)/debian/flightgear-data-aircrafts/usr/share/games/flightgear/Aircraft/Cub/copying.txt \
- $(CURDIR)/debian/flightgear-data-aircrafts/usr/share/games/flightgear/Aircraft/bo105/COPYING \
- $(CURDIR)/debian/flightgear-data-aircrafts/usr/share/games/flightgear/Aircraft/ASK13/COPYING \
+ rm -f $(CURDIR)/debian/flightgear-data-base/usr/share/games/flightgear/COPYING \
+ $(CURDIR)/debian/flightgear-data-base/usr/share/games/flightgear/Aircraft/c172p/LICENSE \
$(CURDIR)/debian/flightgear-data-base/usr/share/games/flightgear/Aircraft/Generic/Human/COPYING \
$(CURDIR)/debian/flightgear-data-ai/usr/share/games/flightgear/AI/Aircraft/A330-MRTT/COPYING \
$(CURDIR)/debian/flightgear-data-base/usr/share/games/flightgear/ATC/Chatter/BR/LICENCE.txt \
- $(CURDIR)/debian/flightgear-data-base/usr/share/games/flightgear/Aircraft/Generic/Engines/LICENSE \
- $(CURDIR)/debian/flightgear-data-base/usr/share/games/flightgear/webgui/3rdparty/sprintf/LICENSE
+ $(CURDIR)/debian/flightgear-data-base/usr/share/games/flightgear/Aircraft/Generic/Engines/LICENSE
override_dh_installchangelogs:
dh_installchangelogs ChangeLog
diff --git a/debian/watch b/debian/watch
index 71a8e79..7508b44 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,5 @@
version=3
opts=dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
-uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,\
-repacksuffix=+dfsg \
-http://mirrors.ibiblio.org/flightgear/ftp/Shared/FlightGear-data-(.*)\.tar\.bz2
+repacksuffix=+dfsg,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/ \
+ http://sf.net/flightgear/FlightGear-(.*)-data\.tar\.bz2
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/flightgear-data.git
More information about the pkg-fgfs-crew
mailing list