[SCM] qtcreator packaging branch, master, updated. debian/3.4.1+dfsg-2-6-ge3fe5a8

Adam Majer adamm at moszumanska.debian.org
Tue Aug 25 13:57:49 UTC 2015


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

The following commit has been merged in the master branch:
commit b3918ba32f234ed0a28298e73fb811c93322412a
Author: Adam Majer <adamm at zombino.com>
Date:   Wed Aug 19 16:20:45 2015 -0500

    Update README.source since one minified jquery is no longer in upstream's tarball
---
 debian/README.source | 1 -
 debian/rules         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index df48c6d..e7016a0 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -9,4 +9,3 @@ Files replaced were,
 $ find -name jquery\*.js -print -exec cp /usr/share/javascript/jquery/jquery.js {} \;
 ./doc/titlecase/jquery.js
 ./src/shared/qbs/doc/templates/scripts/jquery.js
-./tests/manual/appwizards/htmlimportscenario_01/jquery-1.5.min.js
diff --git a/debian/rules b/debian/rules
index b4bf708..c809ca1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ upstream_changes := $(wildcard dist/changes-*)
 
 override_dh_auto_configure:
 	# Create some symlinks to jquery stuff.
-	ln -s /usr/share/javascript/jquery/jquery.min.js tests/manual/appwizards/htmlimportscenario_01/jquery-1.5.min.js
+	# ln -s /usr/share/javascript/jquery/jquery.min.js tests/manual/appwizards/htmlimportscenario_01/jquery-1.5.min.js
 	mkdir -p src/shared/qbs/doc/templates/scripts
 	ln -s /usr/share/javascript/jquery/jquery.min.js src/shared/qbs/doc/templates/scripts/jquery.js
 	ln -s /usr/share/javascript/jquery/jquery.min.js doc/titlecase/jquery.js

-- 
qtcreator packaging



More information about the pkg-kde-commits mailing list