Michael Terry has proposed merging lp:~mterry/kubuntu-packaging/qtpim-cleanup into lp:~kubuntu-packagers/kubuntu-packaging/qtpim-opensource-src.
Requested reviews: Timo Jyrinki (timo-jyrinki) For more details, see: https://code.launchpad.net/~mterry/kubuntu-packaging/qtpim-cleanup/+merge/156199 Just some minor packaging cleanup and sorting. -- https://code.launchpad.net/~mterry/kubuntu-packaging/qtpim-cleanup/+merge/156199 Your team Kubuntu Packagers is subscribed to branch lp:~kubuntu-packagers/kubuntu-packaging/qtpim-opensource-src.
=== modified file 'debian/changelog' --- debian/changelog 2013-02-05 07:38:05 +0000 +++ debian/changelog 2013-03-29 17:56:19 +0000 @@ -1,4 +1,4 @@ -qtpim (5.0~git20121214-0ubuntu1) UNRELEASED; urgency=low +qtpim-opensource-src (5.0~git20121214-0ubuntu1) UNRELEASED; urgency=low * Initial release === modified file 'debian/control' --- debian/control 2013-02-05 07:38:05 +0000 +++ debian/control 2013-03-29 17:56:19 +0000 @@ -1,20 +1,23 @@ -Source: qtpim +Source: qtpim-opensource-src Section: libs Priority: extra -Maintainer: Timo Jyrinki <[email protected]> -Build-Depends: debhelper (>= 9.0.0), +Maintainer: Ubuntu Developers <[email protected]> +Build-Depends: debhelper (>= 9), + pkg-kde-tools, + qt5-default, qtbase5-private-dev, qtdeclarative5-private-dev, - qt5-default, - pkg-kde-tools, -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Homepage: http://qt-project.org/ +Vcs-Bzr: lp:~kubuntu-packagers/kubuntu-packaging/qtpim-opensource-src +Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/qtpim-opensource-src Package: libqt5contacts5 -Architecture: any +Architecture: i386 amd64 armhf Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends}, + ${shlibs:Depends} Description: Qt PIM module, Contacts library Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -22,10 +25,11 @@ This package contains Qt PIM module's Contacts library. Package: libqt5organizer5 -Architecture: any +Architecture: i386 amd64 armhf Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends}, + ${shlibs:Depends} Description: Qt PIM module, Organizer library Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -33,10 +37,11 @@ This package contains Qt PIM module's Organizer library. Package: libqt5versit5 -Architecture: any +Architecture: i386 amd64 armhf Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends}, + ${shlibs:Depends} Description: Qt PIM module, Versit library Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -44,10 +49,11 @@ This package contains Qt PIM module's Versit library. Package: libqt5versitorganizer5 -Architecture: any +Architecture: i386 amd64 armhf Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends}, + ${shlibs:Depends} Description: Qt PIM module, Versit Organizer library Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -56,9 +62,12 @@ Package: qtpim5-dev Section: libdevel -Architecture: any -Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} -Depends: libqt5contacts5 (= ${binary:Version}), libqt5organizer5 (= ${binary:Version}), libqt5versit5 (= ${binary:Version}), libqt5versitorganizer5 (= ${binary:Version}), ${misc:Depends} +Architecture: i386 amd64 armhf +Depends: ${misc:Depends}, + libqt5contacts5 (= ${binary:Version}), + libqt5organizer5 (= ${binary:Version}), + libqt5versit5 (= ${binary:Version}), + libqt5versitorganizer5 (= ${binary:Version}), Description: Qt 5 PIM development files Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -67,12 +76,13 @@ applications using Qt PIM libraries. Package: qtpim5-private-dev -Architecture: any Section: libdevel -Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} -Depends: libqt5contacts5 (= ${binary:Version}), libqt5organizer5 (= ${binary:Version}), libqt5versit5 (= ${binary:Version}), libqt5versitorganizer5 (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends} +Architecture: i386 amd64 armhf +Depends: ${misc:Depends}, + libqt5contacts5 (= ${binary:Version}), + libqt5organizer5 (= ${binary:Version}), + libqt5versit5 (= ${binary:Version}), + libqt5versitorganizer5 (= ${binary:Version}), Description: Qt 5 PIM private development files Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -83,11 +93,13 @@ Use at your own risk. Package: qtpim5-dbg -Priority: extra -Architecture: any Section: debug -Depends: libqt5contacts5 (= ${binary:Version}), libqt5organizer5 (= ${binary:Version}), libqt5versit5 (= ${binary:Version}), libqt5versitorganizer5 (= ${binary:Version}), - ${misc:Depends} +Architecture: i386 amd64 armhf +Depends: ${misc:Depends}, + libqt5contacts5 (= ${binary:Version}), + libqt5organizer5 (= ${binary:Version}), + libqt5versit5 (= ${binary:Version}), + libqt5versitorganizer5 (= ${binary:Version}), Description: Qt PIM library debugging symbols Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. === modified file 'debian/copyright' --- debian/copyright 2013-02-05 07:38:05 +0000 +++ debian/copyright 2013-03-29 17:56:19 +0000 @@ -1,5 +1,4 @@ -Format: http://dep.debian.net/deps/dep5 -Upstream-Name: qtpim +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Source: http://qt.gitorious.org/qt/qtpim Files: * === modified file 'debian/qtpim5-private-dev.install' --- debian/qtpim5-private-dev.install 2013-02-05 07:38:05 +0000 +++ debian/qtpim5-private-dev.install 2013-03-29 17:56:19 +0000 @@ -1,4 +1,4 @@ -usr/include/qt5/QtContacts/5.0.0/QtContacts/private/* -usr/include/qt5/QtOrganizer/5.0.0/QtOrganizer/private/* -usr/include/qt5/QtVersit/5.0.0/QtVersit/private/* -usr/include/qt5/QtVersitOrganizer/5.0.0/QtVersitOrganizer/private/* +usr/include/qt5/QtContacts/*/QtContacts/private/* +usr/include/qt5/QtOrganizer/*/QtOrganizer/private/* +usr/include/qt5/QtVersit/*/QtVersit/private/* +usr/include/qt5/QtVersitOrganizer/*/QtVersitOrganizer/private/* === modified file 'debian/rules' --- debian/rules 2013-02-05 07:38:05 +0000 +++ debian/rules 2013-03-29 17:56:19 +0000 @@ -10,6 +10,11 @@ %: dh $@ --list-missing --parallel --with pkgkde_symbolshelper --dbg-package=qtpim5-dbg +override_dh_auto_clean: + dh_auto_clean + rm -f plugins/*/*.so + rm -f qml/*/*.so + override_dh_auto_configure: qmake
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
