[pkg-fgfs-crew] [flightgear-data] 01/01: Re-add webgui.
Markus Wanner
markus_wanner-guest at moszumanska.debian.org
Wed Feb 18 11:49:52 UTC 2015
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 c8257a70c9e211b5df3a90f870f586828ed65e89
Author: Markus Wanner <markus at bluegap.ch>
Date: Wed Feb 18 12:27:03 2015 +0100
Re-add webgui.
* update d/changelog accordingly
* change repacking to include webgui, but not the js libraries
already in Debian.
* Add the necessary JavaScript dependencies, instead.
* Add missing-sources for the sprintf js library.
* Update the watch file.
---
debian/changelog | 14 +-
debian/control | 23 ++-
debian/copyright | 33 +++-
debian/flightgear-data-base.postinst | 9 +
debian/flightgear-data-base.prerm | 12 ++
debian/get-orig-source | 9 +-
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.js | 4 +
.../sprintf.js-1.0.2/dist/angular-sprintf.min.map | 1 +
.../sprintf.js-1.0.2/dist/sprintf.min.js | 4 +
.../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/rules | 1 +
21 files changed, 578 insertions(+), 17 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 448df63..55f235a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,15 +15,17 @@ flightgear-data (3.4.0+dfsg-0~exp1) UNRELEASED; urgency=medium
* New upstream release 3.4 (Closes: #776913).
* Drop patch translation-update-pt.diff, it got applied upstream.
* Drop references to Textures.high from d/rules. These directories
- no longer exist.
+ no longer exist. Add the new webgui.
* Update debian/copyright and debian/watch.
- * Repack upstream's tarball: drop the experimental webgui (it doesn't
- quite seem ready, yet, and bundles various 3rdparty JavaScript
- libraries) and strip the unneeded copies of tzdata and the liberation
- font.
+ * 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 missing-sources for the sprintf js library.
* Bump S-V: no changes needed.
+ * Update the watch file.
- -- Markus Wanner <markus at bluegap.ch> Wed, 11 Feb 2015 09:37:39 +0100
+ -- Markus Wanner <markus at bluegap.ch> Wed, 18 Feb 2015 12:19:59 +0100
flightgear-data (3.0.0-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index c70c814..8e7d25d 100644
--- a/debian/control
+++ b/debian/control
@@ -12,10 +12,15 @@ Vcs-Git: git://anonscm.debian.org/collab-maint/flightgear-data.git
Package: flightgear-data-base
Architecture: all
-Depends: tzdata, fonts-liberation, ${misc:Depends}
+Depends: tzdata,
+ fonts-liberation,
+ libjs-jquery,
+ libjs-jquery-flot,
+ libjs-leaflet,
+ ${misc:Depends}
Replaces: fgfs-base (<< 2.10.0), fgfs-scenery-base (<< 2.10.0),
fgfs-aircraft-base (<< 2.10.0~)
-Breaks: flightgear (<< 3.2.0~),
+Breaks: flightgear (<< 3.4.0~),
fgfs-base (<< 2.10.0~), fgfs-scenery-base (<< 2.10.0~),
fgfs-aircraft-base (<< 2.10.0~)
Description: FlightGear Flight Simulator -- base files
@@ -31,7 +36,7 @@ Description: FlightGear Flight Simulator -- base files
Package: flightgear-data-ai
Architecture: all
Depends: ${misc:Depends}
-Breaks: flightgear (<< 3.2.0~), fgfs-base (<< 2.10.0~)
+Breaks: flightgear (<< 3.4.0~), fgfs-base (<< 2.10.0~)
Description: FlightGear Flight Simulator -- standard AI data
FlightGear is a free and highly sophisticated flight simulator.
.
@@ -42,7 +47,7 @@ Package: flightgear-data-aircrafts
Architecture: all
Depends: ${misc:Depends}
Replaces: fgfs-base (<< 2.0.0), fgfs-aircraft-base (<< 2.10.0~)
-Breaks: flightgear (<< 3.2.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.
.
@@ -53,7 +58,7 @@ Package: flightgear-data-models
Architecture: all
Depends: ${misc:Depends}
Replaces: fgfs-base (<< 2.0.0), fgfs-models-base (<< 2.10.0)
-Breaks: flightgear (<< 3.2.0~), fgfs-models-base (<< 2.10.0~)
+Breaks: flightgear (<< 3.4.0~), fgfs-models-base (<< 2.10.0~)
Description: FlightGear Flight Simulator -- standard models
FlightGear is a free and highly sophisticated flight simulator.
.
@@ -63,10 +68,10 @@ Description: FlightGear Flight Simulator -- standard models
Package: flightgear-data-all
Architecture: all
Depends:
- flightgear-data-base (>= 3.2.0~),
- flightgear-data-ai (>= 3.2.0~),
- flightgear-data-aircrafts (>= 3.2.0~),
- flightgear-data-models (>= 3.2.0~),
+ flightgear-data-base (>= 3.4.0~),
+ flightgear-data-ai (>= 3.4.0~),
+ flightgear-data-aircrafts (>= 3.4.0~),
+ flightgear-data-models (>= 3.4.0~),
${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 d9b92ec..8c4413f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,9 @@ 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
+Files-Excluded: webgui/3rdparty/flot
+ webgui/3rdparty/jquery
+ webgui/3rdparty/leaflet-0.7.3
Fonts/LiberationFonts
Timezone
@@ -16,6 +18,10 @@ Copyright: 1999-2012 Curtis L. Olson <curt at flightgear.org>
and the the FlightGear team (see the Thanks file).
License: GPL-3+
+Files: debian/missing-sources/sprintf.js-1.0.2/*
+Copyright: 2007-2013, Alexandru Marasteanu <hello [at) alexei (dot] ro>
+License: BSD-3-clause
+
Files: debian/*
Copyright: 2001-2012 Ove Kaaven <ovek at arcticnet.no>
2013 Scott Howard <showard at debian.org>
@@ -49,3 +55,28 @@ License: GPL-3+
.
A copy of the license is available on Debian systems at
/usr/share/common-licenses/GPL-3
+
+License: BSD-3-clause
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. 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.
+ 3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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/flightgear-data-base.postinst b/debian/flightgear-data-base.postinst
index 55e0425..cd9b1ed 100644
--- a/debian/flightgear-data-base.postinst
+++ b/debian/flightgear-data-base.postinst
@@ -15,4 +15,13 @@ fi
[ -e /usr/share/games/flightgear/Fonts/LiberationFonts ] || \
ln -sTf /usr/share/fonts/truetype/liberation /usr/share/games/flightgear/Fonts/LiberationFonts
+[ -e /usr/share/games/flightgear/webgui/3rdparty/jquery ] || \
+ ln -sTf /usr/share/javascript/jquery /usr/share/games/flightgear/webgui/3rdparty/jquery
+
+[ -e /usr/share/games/flightgear/webgui/3rdparty/flot ] || \
+ ln -sTf /usr/share/javascript/jquery-flot /usr/share/games/flightgear/webgui/3rdparty/flot
+
+[ -e /usr/share/games/flightgear/webgui/3rdparty/leaflet-0.7.3 ] || \
+ ln -sTf /usr/share/javascript/leaflet /usr/share/games/flightgear/webgui/3rdparty/leaflet-0.7.3
+
#DEBHELPER#
diff --git a/debian/flightgear-data-base.prerm b/debian/flightgear-data-base.prerm
index 8ad8c36..7a79174 100644
--- a/debian/flightgear-data-base.prerm
+++ b/debian/flightgear-data-base.prerm
@@ -10,4 +10,16 @@ if [ -h /usr/share/games/flightgear/Fonts/LiberationFonts ] ; then
rm -f /usr/share/games/flightgear/Fonts/LiberationFonts
fi
+if [ -h /usr/share/games/flightgear/webgui/3rdparty/jquery ] ; then
+ rm -f /usr/share/games/flightgear/webgui/3rdparty/jquery
+fi
+
+if [ -h /usr/share/games/flightgear/webgui/3rdparty/flot ] ; then
+ rm -f /usr/share/games/flightgear/webgui/3rdparty/flot
+fi
+
+if [ -h /usr/share/games/flightgear/webgui/3rdparty/leaflet-0.7.3 ] ; then
+ rm -f /usr/share/games/flightgear/webgui/3rdparty/leaflet-0.7.3
+fi
+
#DEBHELPER#
diff --git a/debian/get-orig-source b/debian/get-orig-source
index 4951140..e6fb633 100755
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -7,4 +7,11 @@ VERSION=`dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/
uscan --verbose --force-download --no-symlink
-bunzip2 -c ../FlightGear-data-${VERSION}.tar.bz2 | tar --delete --wildcards -vf - fgdata/webgui fgdata/Fonts/LiberationFonts fgdata/Timezone | bzip2 -c > ../${PACKAGE}_${VERSION}+dfsg.orig.tar.bz2
+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
diff --git a/debian/missing-sources/sprintf.js-1.0.2/.gitignore b/debian/missing-sources/sprintf.js-1.0.2/.gitignore
new file mode 100644
index 0000000..096746c
--- /dev/null
+++ b/debian/missing-sources/sprintf.js-1.0.2/.gitignore
@@ -0,0 +1 @@
+/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
new file mode 100644
index 0000000..5c74c82
--- /dev/null
+++ b/debian/missing-sources/sprintf.js-1.0.2/LICENSE
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 0000000..d4c7203
--- /dev/null
+++ b/debian/missing-sources/sprintf.js-1.0.2/README.md
@@ -0,0 +1,82 @@
+# 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
new file mode 100644
index 0000000..ecdf6d5
--- /dev/null
+++ b/debian/missing-sources/sprintf.js-1.0.2/bower.json
@@ -0,0 +1,14 @@
+{
+ "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
new file mode 100644
index 0000000..3559efd
--- /dev/null
+++ b/debian/missing-sources/sprintf.js-1.0.2/demo/angular.html
@@ -0,0 +1,20 @@
+<!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.js b/debian/missing-sources/sprintf.js-1.0.2/dist/angular-sprintf.min.js
new file mode 100644
index 0000000..dbaf744
--- /dev/null
+++ b/debian/missing-sources/sprintf.js-1.0.2/dist/angular-sprintf.min.js
@@ -0,0 +1,4 @@
+/*! sprintf-js | Alexandru Marasteanu <hello at alexei.ro> (http://alexei.ro/) | BSD-3-Clause */
+
+angular.module("sprintf",[]).filter("sprintf",function(){return function(){return sprintf.apply(null,arguments)}}).filter("fmt",["$filter",function(a){return a("sprintf")}]).filter("vsprintf",function(){return function(a,b){return vsprintf(a,b)}}).filter("vfmt",["$filter",function(a){return a("vsprintf")}]);
+//# sourceMappingURL=angular-sprintf.min.map
\ No newline at end of file
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
new file mode 100644
index 0000000..055964c
--- /dev/null
+++ b/debian/missing-sources/sprintf.js-1.0.2/dist/angular-sprintf.min.map
@@ -0,0 +1 @@
+{"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.js b/debian/missing-sources/sprintf.js-1.0.2/dist/sprintf.min.js
new file mode 100644
index 0000000..d5bcd09
--- /dev/null
+++ b/debian/missing-sources/sprintf.js-1.0.2/dist/sprintf.min.js
@@ -0,0 +1,4 @@
+/*! sprintf-js | Alexandru Marasteanu <hello at alexei.ro> (http://alexei.ro/) | BSD-3-Clause */
+
+!function(a){function b(){var a=arguments[0],c=b.cache;return c[a]&&c.hasOwnProperty(a)||(c[a]=b.parse(a)),b.format.call(null,c[a],arguments)}function c(a){return Object.prototype.toString.call(a).slice(8,-1).toLowerCase()}function d(a,b){return Array(b+1).join(a)}var e={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- [...]
+//# sourceMappingURL=sprintf.min.map
\ 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
new file mode 100644
index 0000000..33fe163
--- /dev/null
+++ b/debian/missing-sources/sprintf.js-1.0.2/dist/sprintf.min.map
@@ -0,0 +1 @@
+{"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
new file mode 100644
index 0000000..246e1c3
--- /dev/null
+++ b/debian/missing-sources/sprintf.js-1.0.2/gruntfile.js
@@ -0,0 +1,36 @@
+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
new file mode 100644
index 0000000..ebf4a21
--- /dev/null
+++ b/debian/missing-sources/sprintf.js-1.0.2/package.json
@@ -0,0 +1,22 @@
+{
+ "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
new file mode 100644
index 0000000..9c69123
--- /dev/null
+++ b/debian/missing-sources/sprintf.js-1.0.2/src/angular-sprintf.js
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 0000000..0ccb64c
--- /dev/null
+++ b/debian/missing-sources/sprintf.js-1.0.2/src/sprintf.js
@@ -0,0 +1,195 @@
+(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
new file mode 100644
index 0000000..1717d8f
--- /dev/null
+++ b/debian/missing-sources/sprintf.js-1.0.2/test/test.js
@@ -0,0 +1,72 @@
+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/rules b/debian/rules
index bd97464..84207a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,6 +36,7 @@ override_dh_auto_install:
$(CURDIR)/Sounds \
$(CURDIR)/Textures \
$(CURDIR)/Translations \
+ $(CURDIR)/webgui \
$(CURDIR)/*.xml \
$(CURDIR)/version \
debian/flightgear-data-base/usr/share/games/flightgear/
--
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