Zoltan Balogh has proposed merging lp:~bzoltan/kubuntu-packaging/proper_naming into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src.
Commit message: rename qt5-qmake-cross-armhf to qt5-qmake-arm-linux-gnueabihf Requested reviews: Kubuntu Packagers (kubuntu-packagers) For more details, see: https://code.launchpad.net/~bzoltan/kubuntu-packaging/proper_naming/+merge/242179 rename qt5-qmake-cross-armhf to qt5-qmake-arm-linux-gnueabihf -- Your team Kubuntu Packagers is requested to review the proposed merge of lp:~bzoltan/kubuntu-packaging/proper_naming into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src.
=== modified file 'debian/changelog' --- debian/changelog 2014-11-18 06:39:14 +0000 +++ debian/changelog 2014-11-19 10:18:28 +0000 @@ -1,3 +1,9 @@ +qtbase-opensource-src (5.3.2+dfsg-4ubuntu4) vivid; urgency=medium + + * Rename qt5-qmake-cross-armhf to qt5-qmake-arm-linux-gnueabihf + + -- Zoltán Balogh <[email protected]> Wed, 19 Nov 2014 12:06:18 +0200 + qtbase-opensource-src (5.3.2+dfsg-4ubuntu3) vivid; urgency=medium * Add qmake cross-compilation package qt5-qmake-cross-armhf === modified file 'debian/control' --- debian/control 2014-11-12 15:30:32 +0000 +++ debian/control 2014-11-19 10:18:28 +0000 @@ -364,32 +364,32 @@ . This package contains also these platform specifications. -Package: qt5-qmake-cross-armhf +Package: qt5-qmake-arm-linux-gnueabihf Architecture: amd64 i386 Multi-Arch: same Section: devel -Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends} -Description: Qt 5 qmake-cross-armhf Makefile generator tool +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: Qt 5 qt5-qmake-arm-linux-gnueabihf Makefile generator tool Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. . - This package contains the Qt 5 qmake-cross-armhf, a tool that helps - simplify the build process for development project across different - platforms. + This package contains the Qt 5 qt5-qmake-arm-linux-gnueabihf, a tool + that helps simplify the build process for development project across + different platforms. qmake-cross-armhf automates the generation of Makefiles so that only a few lines of information are needed to create each Makefile. qmake can be used for any software project, whether it is written using Qt or not. . - Qt 5 qmake-cross-armhf requires a platform and compiler description - file which contains many default values used to generate appropriate - Makefiles. + Qt 5 qt5-qmake-arm-linux-gnueabihf requires a platform and compiler + description file which contains many default values used to generate + appropriate Makefiles. . This package contains also these platform specifications. . - The qmake-cross-armhf is made for creating Makefile in multiarch build - environment. It can be used for example in a i386 chroot with armhf - development packages. + The qt5-qmake-arm-linux-gnueabihf is made for creating Makefile in + multiarch build environment. It can be used for example in a i386 chroot + with armhf development packages. Package: qtbase5-examples Architecture: any === renamed file 'debian/patches/qt5-qmake-cross-armhf' => 'debian/patches/qt5-qmake-arm-linux-gnueabihf' --- debian/patches/qt5-qmake-cross-armhf 2014-11-12 15:30:32 +0000 +++ debian/patches/qt5-qmake-arm-linux-gnueabihf 2014-11-19 10:18:28 +0000 @@ -1,8 +1,8 @@ -Description: Add mkspec for the qt5-qmake-cross-armhf build +Description: Add mkspec for the qt5-qmake-arm-linux-gnueabihf build . qtbase-opensource-src (5.3.0+dfsg-3ubuntu1) utopic; urgency=medium . - * Add qt5-qmake-cross-armhf to support qmake projects in multiarch + * Add to support qmake projects in multiarch crossbuilders Author: Zoltán Balogh <[email protected]> === modified file 'debian/patches/series' --- debian/patches/series 2014-11-12 15:30:32 +0000 +++ debian/patches/series 2014-11-19 10:18:28 +0000 @@ -14,7 +14,7 @@ # Ubuntu specific. disable_overlay_scrollbars.diff load_testability_from_env_var.patch -qt5-qmake-cross-armhf +qt5-qmake-arm-linux-gnueabihf Add-workaround-for-GL-on-Android-emulator.patch === renamed file 'debian/qt5-qmake-cross-armhf.install' => 'debian/qt5-qmake-arm-linux-gnueabihf.install' --- debian/qt5-qmake-cross-armhf.install 2014-11-12 15:30:32 +0000 +++ debian/qt5-qmake-arm-linux-gnueabihf.install 2014-11-19 10:18:28 +0000 @@ -1,1 +1,1 @@ -usr/bin/qt5-qmake-cross-armhf +usr/bin/qt5-qmake-arm-linux-gnueabihf === modified file 'debian/rules' --- debian/rules 2014-11-12 15:30:32 +0000 +++ debian/rules 2014-11-19 10:18:28 +0000 @@ -131,7 +131,7 @@ -no-directfb \ -no-sql-ibase -no-pch -no-opengl \ -xplatform ubuntu-arm-gnueabihf-g++ || file $(CURDIR)/bin/qmake; - mv $(CURDIR)/bin/qmake $(CURDIR)/bin/qt5-qmake-cross-armhf + mv $(CURDIR)/bin/qmake $(CURDIR)/bin/qt5-qmake-arm-linux-gnueabihf endif ./configure -confirm-license \ -prefix "/usr" \ @@ -305,9 +305,9 @@ ln -s /usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/default.conf ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(x86_architectures))) - # ship the qt5-qmake-cross-armhf in /usr/bin + # ship the qt5-qmake-arm-linux-gnueabihf in /usr/bin mkdir -p $(CURDIR)/debian/tmp/usr/bin - cp $(CURDIR)/bin/qt5-qmake-cross-armhf $(CURDIR)/debian/tmp/usr/bin + cp $(CURDIR)/bin/qt5-qmake-arm-linux-gnueabihf $(CURDIR)/debian/tmp/usr/bin endif # Remove leftover directories
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
