[SCM] qtwebengine packaging branch, master, updated. debian/5.9.2+dfsg-1-2-gf528c60

Dmitry Shachnev mitya57 at moszumanska.debian.org
Fri Oct 27 18:35:04 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebengine.git;a=commitdiff;h=ab5119c

The following commit has been merged in the master branch:
commit ab5119cd760551d4793ad867bc332ba565c12096
Author: Sandro Knauß <hefee at debian.org>
Date:   Thu Oct 19 12:05:52 2017 +0200

    Syncronize missing-sources for 5.9.2.
---
 debian/changelog              |  1 +
 debian/copyright              |  1 +
 debian/missing-sources/README |  4 ++--
 debian/rules                  | 12 +++++++-----
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 885a9bb..827a049 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ qtwebengine-opensource-src (5.9.2+dfsg-1~) UNRELEASED; urgency=medium
   * Add new Build-Dependency: qtquickcontrols2-5-dev
   * Bump Qt build-dependencies to 5.9.2.
   * Update symbols for libqt5webenginecore5 for 5.9.2 for amd64.
+  * Synchronize missing-sources for 5.9.2.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 17 Oct 2017 23:57:46 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 3fbb8e6..a7365c2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -54,6 +54,7 @@ License: GPL or Expat
 
 Files: debian/missing-sources/marked-v0.3.6.tar.gz
        examples/webengine/recipebrowser/resources/pages/assets/3rdparty/marked.min.js
+       examples/webenginewidgets/markdowneditor/resources/3rdparty/marked.min.js
 Copyright: 2011-2014, Christopher Jeffrey (https://github.com/chjj/)
 License: Expat
 
diff --git a/debian/missing-sources/README b/debian/missing-sources/README
index 7cdde7a..3642740 100644
--- a/debian/missing-sources/README
+++ b/debian/missing-sources/README
@@ -7,14 +7,14 @@ 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.9.0 at 2016-06-29.
+Last synchronization was made with QtWebEngine v5.9.2 at 2017-09-19.
 
 Files: examples/webenginewidgets/contentmanipulation/jquery.min.js
 Project: jQuery v1.3.2
 License: Expat or GPL
 Source: http://code.jquery.com/jquery-1.3.2.js
 
-Files: examples/webenginewidgets/markdowneditor/resources/marked.min.js
+Files: examples/webenginewidgets/markdowneditor/resources/3rdparty/marked.min.js
 Project: marked 0.3.6
 License: Expat
 Source: https://github.com/chjj/marked/archive/v0.3.6.tar.gz
diff --git a/debian/rules b/debian/rules
index bd78f87..46617d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -99,8 +99,8 @@ override_dh_auto_clean:
 	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
-	rm -rf $(CURDIR)/examples/webengine/recipebrowser/resources/pages/assets/3rdparty/marked.*.js
+	rm -rf $(CURDIR)/examples/webenginewidgets/markdowneditor/resources/3rdparty/marked*.js
+	rm -rf $(CURDIR)/examples/webengine/recipebrowser/resources/pages/assets/3rdparty/marked*.js
 	
 	for fname in $(touch_files); do \
 		rm -rf $(CURDIR)/$${fname}; \
@@ -174,10 +174,12 @@ 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'
+	>examples/webenginewidgets/markdowneditor/resources/3rdparty/marked.js tar xaf debian/missing-sources/marked*.tar.gz --wildcards --to-stdout '*/marked.js'
+	>examples/webengine/recipebrowser/resources/pages/assets/3rdparty/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"
+	yui-compressor --type js "examples/webenginewidgets/markdowneditor/resources/3rdparty/marked.js" -o "examples/webenginewidgets/markdowneditor/resources/3rdparty/marked.min.js"
+	yui-compressor --type js "examples/webengine/recipebrowser/resources/pages/assets/3rdparty/marked.js" -o "examples/webengine/recipebrowser/resources/pages/assets/3rdparty/marked.min.js"
+
 	
 	for fname in $(touch_files); do \
 		touch $(CURDIR)/$${fname}; \

-- 
qtwebengine packaging



More information about the pkg-kde-commits mailing list