diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2013-12-26 21:19:25 +0400 |
|---|---|---|
| committer | Dmitry Shachnev <mitya57@gmail.com> | 2013-12-26 21:19:43 +0400 |
| commit | 24ba2c1518a272206d39d4a67e798bf6a95c3cd2 (patch) | |
| tree | a3d3a1e54b784f275e12514182cfd1558f849f81 | |
| parent | 0803d4d9efce523ebe0adc957d40423e2a8a8f6a (diff) | |
| download | qt4-x11-24ba2c1518a272206d39d4a67e798bf6a95c3cd2.tar.gz | |
Remove Ubuntu-specific code to add armel to armv6_architectures.
Ubuntu no longer supports armel.
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | debian/rules | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index f22646c..023f320 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ qt4-x11 (4:4.8.5+git192-g085f851+dfsg-3) UNRELEASED; urgency=medium + [ Dmitry Shachnev ] + * Remove Ubuntu-specific code to add armel to armv6_architectures. + Ubuntu no longer supports armel. -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 26 Dec 2013 21:17:33 +0400 diff --git a/debian/rules b/debian/rules index 61ac6d5..c161185 100755 --- a/debian/rules +++ b/debian/rules @@ -50,9 +50,6 @@ ifeq ($(DEB_HOST_ARCH),arm) endif armv6_architectures := armhf -ifeq ($(vendor),Ubuntu) - armv6_architectures += armel -endif ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(armv6_architectures))) extra_configure_opts += -arch armv6 endif |