[SCM] qtwebkit-examples packaging branch, master, updated. debian/5.1.0-2-4-gdb3705a

Lisandro Damián Nicanor Pérez lisandro at alioth.debian.org
Sun Oct 20 14:07:53 UTC 2013


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

The following commit has been merged in the master branch:
commit db3705ae357d6c1d7541a4e6ae4096e365e3e90a
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Oct 20 11:07:29 2013 -0300

    Do not delete what we are not shipping.
---
 debian/changelog |    1 +
 debian/rules     |    2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2c76d4d..bf01d5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtwebkit-examples-opensource-src (5.1.0+dfsg-1) UNRELEASED; urgency=low
     (Closes: #723035).
     - Repackage source tarball and add +dfsg to the version.
     - Add prune-nonfree to debian/rules to remove non free stuff.
+    - Modify debian/rules to not delete the file we are not shipping.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 20 Oct 2013 10:57:52 -0300
 
diff --git a/debian/rules b/debian/rules
index 682292f..dd1aedc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,8 +24,6 @@ override_dh_auto_build-indep:
 	dh_auto_build -Smakefile -- docs
 
 override_dh_auto_install-arch:
-	# We will replace jquery.min.js with a symbolic link to a packaged version.
-	rm -rf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/webkitwidgets/fancybrowser/jquery.min.js
 	dh_auto_install
 	find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/ \
 		-perm /u+x,g+x,o+x -type f \

-- 
qtwebkit-examples packaging



More information about the pkg-kde-commits mailing list