[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.9.1+dfsg-10-274-g3eecf80
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Sat Sep 23 17:39:18 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=3eecf80
The following commit has been merged in the ubuntu+1 branch:
commit 3eecf800d516245a1b78e7d8bf4c711fdd13954b
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Sat Sep 23 20:39:05 2017 +0300
Fix indentation in debian/rules.
---
debian/rules | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/debian/rules b/debian/rules
index 4fed8e1..6fabed6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -131,7 +131,7 @@ override_dh_auto_configure:
override_dh_auto_test:
ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),$(testrun_architectures)))
ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
- xvfb-run -a -s "-screen 0 640x480x24" make check QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib PATH=$(CURDIR)/bin:$(PATH) -k
+ xvfb-run -a -s "-screen 0 640x480x24" make check QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib PATH=$(CURDIR)/bin:$(PATH) -k
endif
endif
@@ -161,7 +161,7 @@ override_dh_auto_clean:
;
# Leftover dirs
- # Ubuntu diff: tests enablement related
+ # Ubuntu diff: tests enablement related
find -depth -type d \( -false \
-o -name debug-shared \
-o -name debug-static \
@@ -177,7 +177,7 @@ override_dh_auto_clean:
| xargs rm -rf
# Leftover files and all symlinks
- # Ubuntu diff: tests enablement related
+ # Ubuntu diff: tests enablement related
find \( -false \
-o -name lib\*.a \
-o -name Makefile.Debug \
@@ -203,7 +203,7 @@ override_dh_auto_clean:
-print0 | xargs -0 rm -rf
# Any remaining executables
- # Ubuntu diff: tests enablement related
+ # Ubuntu diff: tests enablement related
find $(CURDIR) -type f -perm /u+x,g+x,o+x -exec file -i '{}' \; \
| grep -e application/x-executable \
| cut -d ':' -f 1 | grep -v tests/auto | xargs rm -f
--
qtbase packaging
More information about the pkg-kde-commits
mailing list