[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:18 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebengine.git;a=commitdiff;h=f8cb0d8
The following commit has been merged in the experimental branch:
commit f8cb0d8879bb27745d6b04c7719bfa8e106bf5ce
Author: Sandro Knauß <hefee at debian.org>
Date: Thu Jun 29 23:10:27 2017 +0200
Replace another copy of marked.min.js
---
debian/changelog | 1 +
debian/missing-sources/README | 7 ++++++-
debian/rules | 2 ++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index d7e48ac..a7916e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qtwebengine-opensource-src (5.9.0+dfsg-1) UNRELEASED; urgency=medium
- 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
+ * Check missing-source tarballs (one new occurence found)
[ Simon Quigley ]
* New upstream release. (Closes: #865273)
diff --git a/debian/missing-sources/README b/debian/missing-sources/README
index 1fccf98..7cdde7a 100644
--- a/debian/missing-sources/README
+++ b/debian/missing-sources/README
@@ -7,7 +7,7 @@ The GPL requires you to provide the corresponding source code.
For Debian all missing sources are bundled in this directory.
They have been grabbed from the various upstream projects.
-Last synchronization was made with QtWebEngine v5.7.1 at 2016-12-23.
+Last synchronization was made with QtWebEngine v5.9.0 at 2016-06-29.
Files: examples/webenginewidgets/contentmanipulation/jquery.min.js
Project: jQuery v1.3.2
@@ -19,6 +19,11 @@ Project: marked 0.3.6
License: Expat
Source: https://github.com/chjj/marked/archive/v0.3.6.tar.gz
+Files: examples/webengine/recipebrowser/resources/pages/assets/3rdparty/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
diff --git a/debian/rules b/debian/rules
index 5d524f1..6cf19e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,6 +82,7 @@ override_dh_auto_clean:
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
+ rm -rf $(CURDIR)/examples/webengine/recipebrowser/resources/pages/assets/3rdparty/marked.*.js
for fname in $(touch_files); do \
rm -rf $(CURDIR)/$${fname}; \
@@ -153,6 +154,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'
+ >examples/webengine/recipebrowser/resources/pages/assets/3rdparty/marked.min.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"
--
qtwebengine packaging
More information about the pkg-kde-commits
mailing list