[SCM] qtwebkit-examples packaging branch, experimental, updated. debian/5.3.2+dfsg-2-8-g46c269a

Dmitry Shachnev mitya57 at moszumanska.debian.org
Sat Dec 27 17:10:47 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit-examples.git;a=commitdiff;h=659382b

The following commit has been merged in the experimental branch:
commit 659382ba08aae60edbc839268c09e889b3ca487c
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Dec 27 20:06:57 2014 +0300

    Move rm jquery.min.js call to where it is actually needed.
---
 debian/changelog | 1 +
 debian/rules     | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b79e64c..faab886 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtwebkit-examples-opensource-src (5.4.0+dfsg-1) UNRELEASED; urgency=medium
   * Update build-dependencies for Qt 5.4.0.
   * Build-depend on qtbase5-doc-html and qtwebkit5-doc-html,
     for docs linking.
+  * Simplify debian/rules.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 27 Dec 2014 19:57:19 +0300
 
diff --git a/debian/rules b/debian/rules
index e8b6928..7612197 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ override_dh_auto_configure:
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf doc/qtwebkitexamples doc/qtwebkitexamples.qch .qmake.cache
+	rm -fv examples/webkitwidgets/fancybrowser/jquery.min.js
 
 override_dh_auto_build-indep:
 	dh_auto_build -Smakefile -- docs
@@ -45,7 +46,3 @@ override_dh_auto_install-indep:
 
 override_dh_install:
 	dh_install --fail-missing
-
-prune-nonfree:
-	# No source code for jquery is shipped.
-	rm -fv examples/webkitwidgets/fancybrowser/jquery.min.js

-- 
qtwebkit-examples packaging



More information about the pkg-kde-commits mailing list