summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>2014-04-27 16:35:11 -0300
committerLisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>2014-04-27 16:35:11 -0300
commit54db6e36e190dded290b401f665231d9a03cfd98 (patch)
tree9b5df3e2bbe266fc5c6be54d7bbb60f96955d5ae
parent86e911b83fd701a5bbb67b1e19aa90fa4d7909ac (diff)
downloadqt5webkit-54db6e36e190dded290b401f665231d9a03cfd98.tar.gz
Use Files-Excluded and remove dygraph-combined.js.
-rw-r--r--debian/changelog4
-rw-r--r--debian/copyright8
-rwxr-xr-xdebian/rules7
3 files changed, 12 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 357934e..4c184e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ qtwebkit-opensource-src (5.2.1+dfsg-6) UNRELEASED; urgency=medium
* Add qtdeclarative5-dev as a dependency of libqt5webkit5-dev as it seems
to be a requirement for stuff building with webkit.
* Update symbols files with buildd's logs.
+ * Remove prune-nonfree from debian/rules and instead use Files-Excluded in
+ debian/copyright.
+ * Remove dygraph-combined.js from the original tarball: minified javascript
+ without source.
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 06 Apr 2014 10:04:08 -0300
diff --git a/debian/copyright b/debian/copyright
index f2c7d84..abb227b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,13 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Source: http://releases.qt-project.org/qt5/5.0.1/submodules_tar/
+Files-Excluded: Source/WebInspectorUI/Scripts/jsmin.py
+ Source/WebInspectorUI/Tools/PrettyPrinting/populate/jquery.min.js
+ Tools/TestResultServer/static-dashboards/dygraph-combined.js
+# jsmin.py: see
+# http://lists.qt-project.org/pipermail/development/2013-December/014659.html
+# and https://wiki.debian.org/qa.debian.org/jsonevil
+#
+# jquery.min.js and dygraph-combined.js: minified javascript without source.
Files: *
Copyright: 2010 Apple Inc.
diff --git a/debian/rules b/debian/rules
index 9bb7781..d9578a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,10 +82,3 @@ override_dh_install:
override_dh_builddeb:
dh_builddeb -- -Zxz
-
-prune-nonfree:
- # See http://lists.qt-project.org/pipermail/development/2013-December/014659.html
- # and https://wiki.debian.org/qa.debian.org/jsonevil
- rm -fv Source/WebInspectorUI/Scripts/jsmin.py
- # Minified jquery without source.
- rm -vf Source/WebInspectorUI/Tools/PrettyPrinting/populate/jquery.min.js