summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Shachnev <mitya57@gmail.com>2013-12-26 21:23:20 +0400
committerDmitry Shachnev <mitya57@gmail.com>2013-12-26 21:23:20 +0400
commit1cd352aac5490b64bf45ab9c64fdea2f344034b6 (patch)
treed15177e8f862602966464efd93fc93a2f7c19fee
parent1dc6f3e1519a8d47c5a1f590f78caadef1f43f2b (diff)
downloadqtbase-1cd352aac5490b64bf45ab9c64fdea2f344034b6.tar.gz
Remove unused piece of code in debian/rules.
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/rules5
2 files changed, 2 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index a093f56..af9f525 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
qtbase-opensource-src (5.2.0+dfsg-4) UNRELEASED; urgency=medium
+ [ Dmitry Shachnev ]
+ * Remove unused piece of code in debian/rules.
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 26 Dec 2013 21:21:17 +0400
diff --git a/debian/rules b/debian/rules
index 4f5502a..ad188db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,11 +53,6 @@ ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(no_pch_architectures)))
extra_configure_opts += -no-pch
endif
-armv6_architectures := armhf
-ifeq ($(vendor),Ubuntu)
- armv6_architectures += armel
-endif
-
gles2_architectures := armel armhf
ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
extra_configure_opts += -opengl es2