[SCM] qtwebengine packaging branch, experimental, updated. debian/5.7.1+dfsg-6.1-37-g762de0b
Sandro Knauß
hefee at moszumanska.debian.org
Thu Jun 29 21:33:17 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebengine.git;a=commitdiff;h=630cbaf
The following commit has been merged in the experimental branch:
commit 630cbaf4793e78dc97b7db9af9551181e3659e20
Author: Sandro Knauß <hefee at debian.org>
Date: Thu Jun 29 23:07:23 2017 +0200
Replace minimised js with a propper tarball.
---
debian/changelog | 1 +
debian/missing-sources/README | 5 +++++
debian/missing-sources/mocha-v2.5.3.tar.gz | Bin 0 -> 247766 bytes
debian/rules | 2 ++
debian/source/include-binaries | 1 +
5 files changed, 9 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 0c9e221..d7e48ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtwebengine-opensource-src (5.9.0+dfsg-1) UNRELEASED; urgency=medium
* Bump Standards-Version:
- add Recommends to doc package for dev package
- MPL-1.0 and MPL-2.0 are now in common-licenses
+ * replace mocha.js with a missing-source tarball
[ Simon Quigley ]
* New upstream release. (Closes: #865273)
diff --git a/debian/missing-sources/README b/debian/missing-sources/README
index 9ae2a1b..1fccf98 100644
--- a/debian/missing-sources/README
+++ b/debian/missing-sources/README
@@ -18,3 +18,8 @@ Files: examples/webenginewidgets/markdowneditor/resources/marked.min.js
Project: marked 0.3.6
License: Expat
Source: https://github.com/chjj/marked/archive/v0.3.6.tar.gz
+
+Files: src/3rdparty/chromium/third_party/mocha/mocha.js
+Project: Mocha 2.5.3
+License: MIT
+Source: https://github.com/mochajs/mocha/archive/v2.5.3.tar.gz
diff --git a/debian/missing-sources/mocha-v2.5.3.tar.gz b/debian/missing-sources/mocha-v2.5.3.tar.gz
new file mode 100644
index 0000000..e90924b
Binary files /dev/null and b/debian/missing-sources/mocha-v2.5.3.tar.gz differ
diff --git a/debian/rules b/debian/rules
index 4c1301a..5d524f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,6 +79,7 @@ override_dh_auto_clean:
rm -rf $(CURDIR)/docs
rm -rf $(CURDIR)/.local
rm -rf $(CURDIR)/src/3rdparty/chromium/third_party/jstemplate/jstemplate_compiled.js
+ rm -rf $(CURDIR)/src/3rdparty/chromium/third_party/mocha/mocha.js
rm -rf $(CURDIR)/examples/webenginewidgets/contentmanipulation/jquery*.js
rm -rf $(CURDIR)/examples/webenginewidgets/markdowneditor/resources/marked*.js
@@ -152,6 +153,7 @@ endif
>examples/webenginewidgets/contentmanipulation/jquery.js cat debian/missing-sources/jquery-*.js
yui-compressor --type js "examples/webenginewidgets/contentmanipulation/jquery.js" -o "examples/webenginewidgets/contentmanipulation/jquery.min.js"
>examples/webenginewidgets/markdowneditor/resources/marked.js tar xaf debian/missing-sources/marked*.tar.gz --wildcards --to-stdout '*/marked.js'
+ >src/3rdparty/chromium/third_party/mocha/mocha.js tar xaf debian/missing-sources/mocha*.tar.gz --wildcards --to-stdout '*/mocha.js'
yui-compressor --type js "examples/webenginewidgets/markdowneditor/resources/marked.js" -o "examples/webenginewidgets/markdowneditor/resources/marked.min.js"
for fname in $(touch_files); do \
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index e60d130..f8fb4bf 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -1 +1,2 @@
debian/missing-sources/marked-v0.3.6.tar.gz
+debian/missing-sources/mocha-v2.5.3.tar.gz
--
qtwebengine packaging
More information about the pkg-kde-commits
mailing list