From 1cc13e481efbacc09d51b2d639f42e3597fa9dcb Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Thu, 13 Aug 2015 01:45:49 +0200 Subject: [PATCH] some changes for debian $foo - dependencies fixed - installs fixed - current symbols - multiarch removed, handled by cmake --- debian/control | 12 +-- debian/liblxqt-globalkeys-ui0-dev.install | 6 +- debian/liblxqt-globalkeys-ui0.symbols | 4 +- debian/liblxqt-globalkeys0-dev.install | 6 +- debian/liblxqt-globalkeys0.symbols | 98 +---------------------- debian/rules | 8 +- 6 files changed, 19 insertions(+), 115 deletions(-) diff --git a/debian/control b/debian/control index 360993b..d72c396 100644 --- a/debian/control +++ b/debian/control @@ -4,18 +4,18 @@ Priority: optional Maintainer: LXQt Packaging Team Uploaders: Alf Gaida , - ChangZhuo Chen (陳昌倬) + ChangZhuo Chen (陳昌倬) , Build-Depends: cmake (>= 3.0.2), debhelper (>= 9), libx11-dev, pkg-config, - libkf5windowsystem-dev (>= 5.5.0), + libkf5windowsystem-dev (>= 5.9.0), liblxqt0-dev (>= 0.9.0), - libqt5x11extras5-dev (>= 5.3.2), - libqt5xdg-dev (>= 1.1.0), - qttools5-dev (>= 5.3.2), - qttools5-dev-tools (>= 5.3.2), + libqt5x11extras5-dev (>= 5.3), + libqt5xdg-dev (>= 1.2.0), + qttools5-dev (>= 5.3), + qttools5-dev-tools (>= 5.3), Standards-Version: 3.9.6 Homepage: https://github.com/lxde/lxqt-globalkeys Vcs-Git: git://anonscm.debian.org/pkg-lxqt/lxqt-globalkeys.git diff --git a/debian/liblxqt-globalkeys-ui0-dev.install b/debian/liblxqt-globalkeys-ui0-dev.install index 7477f94..8817645 100644 --- a/debian/liblxqt-globalkeys-ui0-dev.install +++ b/debian/liblxqt-globalkeys-ui0-dev.install @@ -5,5 +5,7 @@ usr/include/lxqt-globalkeys-ui/LXQtGlobalKeysUi/ShortcutSelector usr/lib/*/liblxqt-globalkeys-ui.so usr/lib/*/pkgconfig/lxqt-globalkeys-ui.pc -usr/lib/*/cmake/lxqt-globalkeys-ui/lxqt_globalkeys_ui_use.cmake -usr/lib/*/cmake/lxqt-globalkeys-ui/lxqt-globalkeys-ui-config.cmake +usr/share/cmake/lxqt-globalkeys-ui/lxqt-globalkeys-ui-targets-none.cmake +usr/share/cmake/lxqt-globalkeys-ui/lxqt-globalkeys-ui-config.cmake +usr/share/cmake/lxqt-globalkeys-ui/lxqt-globalkeys-ui-config-version.cmake +usr/share/cmake/lxqt-globalkeys-ui/lxqt-globalkeys-ui-targets.cmake diff --git a/debian/liblxqt-globalkeys-ui0.symbols b/debian/liblxqt-globalkeys-ui0.symbols index 77c014f..0b229c2 100644 --- a/debian/liblxqt-globalkeys-ui0.symbols +++ b/debian/liblxqt-globalkeys-ui0.symbols @@ -11,11 +11,9 @@ liblxqt-globalkeys-ui.so.0 liblxqt-globalkeys-ui0 #MINVER# (c++)"ShortcutSelector::clear()@Base" 0.8.0 (c++)"ShortcutSelector::cancelNow()@Base" 0.8.0 (c++)"ShortcutSelector::ShortcutSelector(QWidget*)@Base" 0.8.0 - (c++)"ShortcutSelector::~ShortcutSelector()@Base" 0.8.0 - (c++)"QString::~QString()@Base" 0.8.0 (c++)"ShortcutSelector::isGrabbing() const@Base" 0.8.0 (c++)"ShortcutSelector::metaObject() const@Base" 0.8.0 (c++)"typeinfo for ShortcutSelector@Base" 0.8.0 (c++)"typeinfo name for ShortcutSelector@Base" 0.8.0 (c++)"vtable for ShortcutSelector@Base" 0.8.0 - (c++)"non-virtual thunk to ShortcutSelector::~ShortcutSelector()@Base" 0.8.0 + diff --git a/debian/liblxqt-globalkeys0-dev.install b/debian/liblxqt-globalkeys0-dev.install index 2f40191..dc70240 100644 --- a/debian/liblxqt-globalkeys0-dev.install +++ b/debian/liblxqt-globalkeys0-dev.install @@ -2,6 +2,8 @@ usr/include/lxqt-globalkeys/ usr/lib/*/pkgconfig/lxqt-globalkeys.pc usr/lib/*/liblxqt-globalkeys.so -usr/lib/*/cmake/lxqt-globalkeys/lxqt-globalkeys-config.cmake -usr/lib/*/cmake/lxqt-globalkeys/lxqt_globalkeys_use.cmake +usr/share/cmake/lxqt-globalkeys/lxqt-globalkeys-config.cmake +usr/share/cmake/lxqt-globalkeys/lxqt-globalkeys-config-version.cmake +usr/share/cmake/lxqt-globalkeys/lxqt-globalkeys-targets-none.cmake +usr/share/cmake/lxqt-globalkeys/lxqt-globalkeys-targets.cmake diff --git a/debian/liblxqt-globalkeys0.symbols b/debian/liblxqt-globalkeys0.symbols index c5fd6bd..06a74fa 100644 --- a/debian/liblxqt-globalkeys0.symbols +++ b/debian/liblxqt-globalkeys0.symbols @@ -1,49 +1,11 @@ liblxqt-globalkeys.so.0 liblxqt-globalkeys0 #MINVER# - (c++)"QByteArray::~QByteArray()@Base" 0.8.0 - (c++)"QDBusError::~QDBusError()@Base" 0.8.0 - (c++)"QDBusReply::~QDBusReply()@Base" 0.8.0 - (c++)"QMetaTypeId::qt_metatype_id()@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ActionImpl::qt_metacall(QMetaObject::Call, int, void**)@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ActionImpl::qt_metacast(char const*)@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ActionImpl::setShortcut(QString const&)@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ActionImpl::emitActivated()@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ActionImpl::changeShortcut(QString const&)@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ActionImpl::shortcutChanged(QString const&, QString const&)@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ActionImpl::staticMetaObject@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ActionImpl::changeDescription(QString const&)@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ActionImpl::emitShortcutChanged(QString const&, QString const&)@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ActionImpl::setValid(bool)@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ActionImpl::activated()@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ActionImpl::ActionImpl(GlobalKeyShortcut::ClientImpl*, GlobalKeyShortcut::Action*, QString const&, QString const&, QObject*)@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ActionImpl::~ActionImpl()@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ClientImpl::qt_metacall(QMetaObject::Call, int, void**)@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ClientImpl::qt_metacast(char const*)@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ClientImpl::grabShortcut(unsigned int)@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ClientImpl::removeAction(GlobalKeyShortcut::ActionImpl*)@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ClientImpl::daemonAppeared(QString const&)@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ClientImpl::addClientAction(QString const&, QString const&, QString const&, QObject*)@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ClientImpl::staticMetaObject@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ClientImpl::daemonDisappeared(QString const&)@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ClientImpl::cancelShortcutGrab()@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ClientImpl::emitDaemonAppeared()@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ClientImpl::modifyClientAction(QString const&, QString const&)@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ClientImpl::removeClientAction(QString const&)@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ClientImpl::emitShortcutGrabbed(QString const&)@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ClientImpl::grabShortcutFinished(QDBusPendingCallWatcher*)@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ClientImpl::emitDaemonDisappeared()@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ClientImpl::emitGrabShortcutFailed()@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ClientImpl::emitGrabShortcutTimedout()@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ClientImpl::emitDaemonPresenceChanged(bool)@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ClientImpl::emitGrabShortcutCancelled()@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ClientImpl::changeClientActionShortcut(QString const&, QString const&)@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ClientImpl::ClientImpl(GlobalKeyShortcut::Client*, QObject*)@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ClientImpl::~ClientImpl()@Base" 0.8.0 (c++)"GlobalKeyShortcut::Action::qt_metacall(QMetaObject::Call, int, void**)@Base" 0.8.0 (c++)"GlobalKeyShortcut::Action::qt_metacast(char const*)@Base" 0.8.0 (c++)"GlobalKeyShortcut::Action::changeShortcut(QString const&)@Base" 0.8.0 (c++)"GlobalKeyShortcut::Action::shortcutChanged(QString const&, QString const&)@Base" 0.8.0 (c++)"GlobalKeyShortcut::Action::staticMetaObject@Base" 0.8.0 (c++)"GlobalKeyShortcut::Action::changeDescription(QString const&)@Base" 0.8.0 + (c++)"GlobalKeyShortcut::Action::registrationFinished()@Base" 0.9.0 (c++)"GlobalKeyShortcut::Action::activated()@Base" 0.8.0 (c++)"GlobalKeyShortcut::Action::Action(QObject*)@Base" 0.8.0 (c++)"GlobalKeyShortcut::Action::~Action()@Base" 0.8.0 @@ -64,45 +26,6 @@ liblxqt-globalkeys.so.0 liblxqt-globalkeys0 #MINVER# (c++)"GlobalKeyShortcut::Client::addAction(QString const&, QString const&, QString const&, QObject*)@Base" 0.8.0 (c++)"GlobalKeyShortcut::Client::Client()@Base" 0.8.0 (c++)"GlobalKeyShortcut::Client::~Client()@Base" 0.8.0 - (c++)"QtMetaTypePrivate::QMetaTypeFunctionHelper::Create(void const*)@Base" 0.8.0 - (c++)"QtMetaTypePrivate::QMetaTypeFunctionHelper::Delete(void*)@Base" 0.8.0 - (c++)"QtMetaTypePrivate::QMetaTypeFunctionHelper::Destruct(void*)@Base" 0.8.0 - (c++)"QtMetaTypePrivate::QMetaTypeFunctionHelper::Construct(void*, void const*)@Base" 0.8.0 - (c++)"QtMetaTypePrivate::QMetaTypeFunctionHelper::Create(void const*)@Base" 0.8.0 - (c++)"QtMetaTypePrivate::QMetaTypeFunctionHelper::Delete(void*)@Base" 0.8.0 - (c++)"QtMetaTypePrivate::QMetaTypeFunctionHelper::Destruct(void*)@Base" 0.8.0 - (c++)"QtMetaTypePrivate::QMetaTypeFunctionHelper::Construct(void*, void const*)@Base" 0.8.0 - (c++)"QtMetaTypePrivate::QMetaTypeFunctionHelper::Create(void const*)@Base" 0.8.0 - (c++)"QtMetaTypePrivate::QMetaTypeFunctionHelper::Delete(void*)@Base" 0.8.0 - (c++)"QtMetaTypePrivate::QMetaTypeFunctionHelper::Destruct(void*)@Base" 0.8.0 - (c++)"QtMetaTypePrivate::QMetaTypeFunctionHelper::Construct(void*, void const*)@Base" 0.8.0 - (c++)"OrgLxqtActionClientAdaptor::qt_metacall(QMetaObject::Call, int, void**)@Base" 0.8.0 - (c++)"OrgLxqtActionClientAdaptor::qt_metacast(char const*)@Base" 0.8.0 - (c++)"OrgLxqtActionClientAdaptor::shortcutChanged(QString const&, QString const&)@Base" 0.8.0 - (c++)"OrgLxqtActionClientAdaptor::staticMetaObject@Base" 0.8.0 - (c++)"OrgLxqtActionClientAdaptor::activated()@Base" 0.8.0 - (c++)"OrgLxqtActionClientAdaptor::OrgLxqtActionClientAdaptor(GlobalKeyShortcut::ActionImpl*)@Base" 0.8.0 - (c++)"OrgLxqtActionClientAdaptor::~OrgLxqtActionClientAdaptor()@Base" 0.8.0 - (c++)"OrgLxqtGlobal_key_shortcutsNativeInterface::qt_metacall(QMetaObject::Call, int, void**)@Base" 0.8.0 - (c++)"OrgLxqtGlobal_key_shortcutsNativeInterface::qt_metacast(char const*)@Base" 0.8.0 - (c++)"OrgLxqtGlobal_key_shortcutsNativeInterface::staticMetaObject@Base" 0.8.0 - (c++)"OrgLxqtGlobal_key_shortcutsNativeInterface::OrgLxqtGlobal_key_shortcutsNativeInterface(QString const&, QString const&, QDBusConnection const&, QObject*)@Base" 0.8.0 - (c++)"OrgLxqtGlobal_key_shortcutsNativeInterface::~OrgLxqtGlobal_key_shortcutsNativeInterface()@Base" 0.8.0 - (c++)"QMap::detach_helper()@Base" 0.8.0 - (c++)"QMap::remove(QString const&)@Base" 0.8.0 - (c++)"QMap::~QMap()@Base" 0.8.0 - (c++)"QList::detach_helper_grow(int, int)@Base" 0.8.0 - (c++)"QList::append(QVariant const&)@Base" 0.8.0 - (c++)"QList::~QList()@Base" 0.8.0 - (c++)"QString::~QString()@Base" 0.8.0 - (c++)"QMapNode::destroySubTree()@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ActionImpl::metaObject() const@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ActionImpl::description() const@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ActionImpl::path() const@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ActionImpl::isValid() const@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ActionImpl::shortcut() const@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ClientImpl::metaObject() const@Base" 0.8.0 - (c++)"GlobalKeyShortcut::ClientImpl::isDaemonPresent() const@Base" 0.8.0 (c++)"GlobalKeyShortcut::Action::metaObject() const@Base" 0.8.0 (c++)"GlobalKeyShortcut::Action::description() const@Base" 0.8.0 (c++)"GlobalKeyShortcut::Action::path() const@Base" 0.8.0 @@ -110,28 +33,9 @@ liblxqt-globalkeys.so.0 liblxqt-globalkeys0 #MINVER# (c++)"GlobalKeyShortcut::Action::shortcut() const@Base" 0.8.0 (c++)"GlobalKeyShortcut::Client::metaObject() const@Base" 0.8.0 (c++)"GlobalKeyShortcut::Client::isDaemonPresent() const@Base" 0.8.0 - (c++)"OrgLxqtActionClientAdaptor::metaObject() const@Base" 0.8.0 - (c++)"OrgLxqtGlobal_key_shortcutsNativeInterface::metaObject() const@Base" 0.8.0 - (c++)"QMapData::findNode(QString const&) const@Base" 0.8.0 - (c++)"QMapNode::copy(QMapData*) const@Base" 0.8.0 - (c++)"typeinfo for OrgLxqtActionClientAdaptor@Base" 0.8.0 - (c++)"typeinfo for OrgLxqtGlobal_key_shortcutsNativeInterface@Base" 0.8.0 - (c++)"typeinfo for GlobalKeyShortcut::ActionImpl@Base" 0.8.0 - (c++)"typeinfo for GlobalKeyShortcut::ClientImpl@Base" 0.8.0 (c++)"typeinfo for GlobalKeyShortcut::Action@Base" 0.8.0 (c++)"typeinfo for GlobalKeyShortcut::Client@Base" 0.8.0 - (c++)"typeinfo name for OrgLxqtActionClientAdaptor@Base" 0.8.0 - (c++)"typeinfo name for OrgLxqtGlobal_key_shortcutsNativeInterface@Base" 0.8.0 - (c++)"typeinfo name for GlobalKeyShortcut::ActionImpl@Base" 0.8.0 - (c++)"typeinfo name for GlobalKeyShortcut::ClientImpl@Base" 0.8.0 (c++)"typeinfo name for GlobalKeyShortcut::Action@Base" 0.8.0 (c++)"typeinfo name for GlobalKeyShortcut::Client@Base" 0.8.0 - (c++)"vtable for OrgLxqtActionClientAdaptor@Base" 0.8.0 - (c++)"vtable for OrgLxqtGlobal_key_shortcutsNativeInterface@Base" 0.8.0 - (c++)"vtable for GlobalKeyShortcut::ActionImpl@Base" 0.8.0 - (c++)"vtable for GlobalKeyShortcut::ClientImpl@Base" 0.8.0 (c++)"vtable for GlobalKeyShortcut::Action@Base" 0.8.0 (c++)"vtable for GlobalKeyShortcut::Client@Base" 0.8.0 - (c++)"QMetaTypeId::qt_metatype_id()::metatype_id@Base" 0.8.0 - (c++)"QMetaTypeId::qt_metatype_id()::metatype_id@Base" 0.8.0 - (c++)"QMetaTypeIdQObject::qt_metatype_id()::metatype_id@Base" 0.8.0 diff --git a/debian/rules b/debian/rules index 35f30f6..dab79f6 100755 --- a/debian/rules +++ b/debian/rules @@ -1,12 +1,10 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) - %: - dh ${@} --buildsystem cmake --parallel --list-missing --fail-missing + dh ${@} --buildsystem cmake --parallel -override_dh_auto_configure: - dh_auto_configure -- -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" +override_dh_install: + dh_install --list-missing --fail-missing