This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch _volatile-rc
in repository flashproxy.
commit dc80afc48bfc4b0545ddaa71d0582e5e51f8dee2
Author: Ximin Luo <infinity0 at gmx.com>
Date: Sat Jan 18 00:41:22 2014 +0000
add some more patches from upstream and add .patch to filenames
---
debian/patches/bump-facilitator-version.patch | 17 ++++++
...x-copyright-years => fix-copyright-years.patch} | 0
debian/patches/fix-test-verbose.patch | 19 ++++++
...out-of-doc => move-initconfig-out-of-doc.patch} | 2 +-
.../{nodejs-shebang => nodejs-shebang.patch} | 8 +++
debian/patches/run-test-using-nodejs.patch | 71 ++++++++++++++++++++++
debian/patches/series | 9 ++-
7 files changed, 122 insertions(+), 4 deletions(-)
diff --git a/debian/patches/bump-facilitator-version.patch b/debian/patches/bump-facilitator-version.patch
new file mode 100644
index 0000000..f3b9e53
--- /dev/null
+++ b/debian/patches/bump-facilitator-version.patch
@@ -0,0 +1,17 @@
+Description: bump facilitator version to match rest of package
+Author: Ximin Luo <infinity0 at gmx.com>
+Applied-Upstream: commit:0625a91d988d92694f58c98a253dce4d10b1842a
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/facilitator/configure.ac
++++ b/facilitator/configure.ac
+@@ -1,5 +1,5 @@
+ AC_PREREQ([2.68])
+-AC_INIT([flashproxy-facilitator], [1.4])
++AC_INIT([flashproxy-facilitator], [1.5])
+ AM_INIT_AUTOMAKE([-Wall foreign])
+
+ AC_ARG_VAR(fpfacilitatoruser, [the user/group for the facilitator to run as])
+--
+1.8.5.2
+
diff --git a/debian/patches/fix-copyright-years b/debian/patches/fix-copyright-years.patch
similarity index 100%
rename from debian/patches/fix-copyright-years
rename to debian/patches/fix-copyright-years.patch
diff --git a/debian/patches/fix-test-verbose.patch b/debian/patches/fix-test-verbose.patch
new file mode 100644
index 0000000..4426a79
--- /dev/null
+++ b/debian/patches/fix-test-verbose.patch
@@ -0,0 +1,19 @@
+Description: fix VERBOSE flag test in flashproxy-test
+Author: Ximin Luo <infinity0 at gmx.com>
+Applied-Upstream: commit:0ab9f052b6aaa30506c1f7db6c6718bdef8dcd62
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/proxy/flashproxy-test.js
++++ b/proxy/flashproxy-test.js
+@@ -4,7 +4,7 @@
+ (apt-get install rhino). */
+
+ var VERBOSE = false;
+-if ("-v" in arguments)
++if (arguments.indexOf("-v") >= 0)
+ VERBOSE = true;
+
+ var num_tests = 0;
+--
+1.8.5.2
+
diff --git a/debian/patches/move-initconfig-out-of-doc b/debian/patches/move-initconfig-out-of-doc.patch
similarity index 91%
rename from debian/patches/move-initconfig-out-of-doc
rename to debian/patches/move-initconfig-out-of-doc.patch
index ff8b4f3..26ce92d 100644
--- a/debian/patches/move-initconfig-out-of-doc
+++ b/debian/patches/move-initconfig-out-of-doc.patch
@@ -2,7 +2,7 @@ Description: Move init config out of /usr/share/doc
Policy 12.3: "Packages must not require the existence of any files in
/usr/share/doc/ in order to function."
Author: Ximin Luo <infinity0 at gmx.com>
-Applied-Upstream: 2af442f799785cf0baa4c18aa85cfdd507986633
+Applied-Upstream: commit:2af442f799785cf0baa4c18aa85cfdd507986633
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/facilitator/Makefile.am
diff --git a/debian/patches/nodejs-shebang b/debian/patches/nodejs-shebang.patch
similarity index 69%
rename from debian/patches/nodejs-shebang
rename to debian/patches/nodejs-shebang.patch
index 478d7a1..03ed71c 100644
--- a/debian/patches/nodejs-shebang
+++ b/debian/patches/nodejs-shebang.patch
@@ -12,3 +12,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
var fs = require("fs");
var path = require("path");
+--- a/proxy/flashproxy-test.js
++++ b/proxy/flashproxy-test.js
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env node
++#!/usr/bin/nodejs
+
+ /* To run this test program, install nodejs (apt-get install nodejs). */
+
diff --git a/debian/patches/run-test-using-nodejs.patch b/debian/patches/run-test-using-nodejs.patch
new file mode 100644
index 0000000..0a96789
--- /dev/null
+++ b/debian/patches/run-test-using-nodejs.patch
@@ -0,0 +1,71 @@
+Description: run flashproxy-test.js using nodejs instead of rhino
+Author: Ximin Luo <infinity0 at gmx.com>
+Applied-Upstream: commit:aa66587104addced0bd40918e8108011c8cd5c8b
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/proxy/flashproxy-test.js
++++ b/proxy/flashproxy-test.js
+@@ -1,10 +1,9 @@
+-#!/usr/bin/env rhino
++#!/usr/bin/env node
+
+-/* To run this test program, install the Rhino JavaScript interpreter
+- (apt-get install rhino). */
++/* To run this test program, install nodejs (apt-get install nodejs). */
+
+ var VERBOSE = false;
+-if (arguments.indexOf("-v") >= 0)
++if (process.argv.indexOf("-v") >= 0)
+ VERBOSE = true;
+
+ var num_tests = 0;
+@@ -13,7 +12,9 @@ var num_failed = 0;
+ var window = {location: {search: "?"}};
+ var document = {cookie: ""};
+
+-load("flashproxy.js");
++var fs = require("fs");
++var data = fs.readFileSync("./flashproxy.js", "utf-8");
++eval(data);
+
+ function objects_equal(a, b) {
+ if ((a === null) != (b === null))
+@@ -39,8 +40,8 @@ var top = true;
+ function announce(test_name) {
+ if (VERBOSE) {
+ if (!top)
+- print();
+- print(test_name);
++ console.log();
++ console.log(test_name);
+ }
+ top = false;
+ }
+@@ -48,13 +49,13 @@ function announce(test_name) {
+ function pass(test) {
+ num_tests++;
+ if (VERBOSE)
+- print("PASS " + repr(test));
++ console.log("PASS " + repr(test));
+ }
+
+ function fail(test, expected, actual) {
+ num_tests++;
+ num_failed++;
+- print("FAIL " + repr(test) + " expected: " + repr(expected) + " actual: " + repr(actual));
++ console.log("FAIL " + repr(test) + " expected: " + repr(expected) + " actual: " + repr(actual));
+ }
+
+ function test_build_url() {
+@@ -354,6 +355,6 @@ test_lang_keys();
+ test_have_websocket_binary_frames();
+
+ if (num_failed == 0)
+- quit(0);
++ process.exit(0);
+ else
+- quit(1);
++ process.exit(1);
+--
+1.8.5.2
+
diff --git a/debian/patches/series b/debian/patches/series
index b3a02be..85ba7e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,6 @@
-nodejs-shebang
-move-initconfig-out-of-doc
-fix-copyright-years
+move-initconfig-out-of-doc.patch
+fix-copyright-years.patch
+fix-test-verbose.patch
+run-test-using-nodejs.patch
+bump-facilitator-version.patch
+nodejs-shebang.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/flashproxy.git