[SCM] "Network Management" Plasma widget Debian packaging branch, master, updated. debian/0.1+git20110727.96f5505-1

Modestas Vainius modax at alioth.debian.org
Thu Jul 28 12:20:45 UTC 2011


The following commit has been merged in the master branch:
commit 0a8bb7ca91ee48f5b6ea5a4ea75c69aa3bfafcb0
Merge: 91689b37966406cb7cba59f0906306bfdfd4aa93 25310e8ce5cc213ebd4323b7f13265579ca2cc0f
Author: Modestas Vainius <modax at debian.org>
Date:   Thu Jul 28 10:37:40 2011 +0300

    Merge branch 'upstream'

 CMakeLists.txt                                     |   14 +-
 applet/networkmanager.cpp                          |    6 +
 applet/nmpopup.cpp                                 |   94 ++++----
 applet/nmpopup.h                                   |    1 -
 applet/plasma-applet-networkmanagement.desktop     |    2 +
 .../nmdbussettingsconnectionprovider.cpp           |   65 +----
 .../nmdbussettingsconnectionprovider.h             |    1 -
 backends/NetworkManager/nmdbussettingsservice.cpp  |    8 +-
 .../settings/802-11-wireless-securitydbus.cpp      |   18 +-
 dataengine/CMakeLists.txt                          |    3 +
 dataengine/networkmanagementengine.cpp             |   11 +-
 dataengine/networkmanagementengine.h               |   35 ++--
 dataengine/networkmanagementjob.cpp                |   47 ++++
 dataengine/networkmanagementjob.h                  |   45 ++++
 dataengine/networkmanagementresources.operations   |   10 +
 dataengine/networkmanagementservice.cpp            |   36 +++
 dataengine/networkmanagementservice.h              |   43 +++
 dataengine/plasma-engine-networkmanagement.desktop |   10 +
 kded/networkmanagement.desktop                     |    2 +
 kded/service.cpp                                   |   39 ++-
 kded/service.h                                     |    2 +
 libs/client/tests/CMakeLists.txt                   |    1 +
 libs/internals/settings/802-11-wireless-security.h |    4 +
 libs/internals/settings/vpnpersistence.cpp         |    3 +-
 .../interfaces/org.kde.networkmanagement.xml       |    1 +
 libs/service/networkinterfacemonitor.cpp           |   16 --
 libs/service/notificationmanager.cpp               |   76 +++---
 libs/service/notificationmanager.h                 |    5 +
 libs/service/sessionabstractedservice.cpp          |    5 +
 libs/service/sessionabstractedservice.h            |    2 +
 libs/ui/802_11_wirelesswidget.cpp                  |  152 ++++++++++-
 libs/ui/802_11_wirelesswidget.h                    |   15 +-
 libs/ui/connectioneditor.cpp                       |   16 +-
 libs/ui/networkmanagement_vpnuiplugin.desktop      |    2 +
 libs/ui/scanwidget.cpp                             |   44 +++-
 libs/ui/scanwidget.h                               |    2 +-
 libs/ui/security/wepwidget.cpp                     |    2 +-
 libs/ui/vpnpreferences.cpp                         |   20 ++
 libs/ui/vpnuiplugin.h                              |    4 +
 libs/ui/wirelesspreferences.cpp                    |   47 +---
 libs/ui/wirelesspreferences.h                      |    4 +-
 monolithic/kde4-knetworkmanager-autostart.desktop  |    3 +
 monolithic/knetworkmanager.desktop                 |    3 +
 networkmanagement.notifyrc                         |   37 +++-
 qml/package/metadata.desktop                       |    6 +
 qml/plasma-applet-networkconnections.desktop       |    6 +
 settings/config/CMakeLists.txt                     |    2 +-
 settings/config/addeditdeletebuttonset.cpp         |   13 +
 settings/config/addeditdeletebuttonset.h           |    5 +
 settings/config/kcm_networkmanagement.desktop      |    2 +
 settings/config/kcm_networkmanagement_tray.desktop |    2 +
 settings/config/manageconnectionwidget.cpp         |  156 +++++++++---
 settings/config/manageconnectionwidget.h           |   13 +-
 settings/config/mobileconnectionwizard.cpp         |   10 +-
 settings/config/othersettings.ui                   |    2 +-
 settings/configshell/bluetooth.cpp                 |   36 +++-
 settings/configshell/main.cpp                      |    9 +-
 .../networkmanagement_novellvpnui.desktop          |    2 +
 vpnplugins/novellvpn/novellvpn.cpp                 |   18 ++
 vpnplugins/novellvpn/novellvpn.h                   |    3 +
 .../openvpn/networkmanagement_openvpnui.desktop    |    2 +
 vpnplugins/openvpn/openvpn.cpp                     |   18 ++
 vpnplugins/openvpn/openvpn.h                       |    3 +
 vpnplugins/openvpn/openvpnwidget.cpp               |   11 +-
 vpnplugins/pptp/networkmanagement_pptpui.desktop   |    2 +
 vpnplugins/pptp/pptp.cpp                           |   18 ++
 vpnplugins/pptp/pptp.h                             |    3 +
 .../networkmanagement_strongswanui.desktop         |    2 +
 vpnplugins/strongswan/strongswan.cpp               |   18 ++
 vpnplugins/strongswan/strongswan.h                 |    3 +
 vpnplugins/vpnc/networkmanagement_vpncui.desktop   |    2 +
 vpnplugins/vpnc/nm-vpnc-service.h                  |    2 +
 vpnplugins/vpnc/vpnc.cpp                           |  269 ++++++++++++++++++++
 vpnplugins/vpnc/vpnc.h                             |   19 ++
 74 files changed, 1296 insertions(+), 317 deletions(-)

-- 
"Network Management" Plasma widget Debian packaging



More information about the pkg-kde-commits mailing list