[SCM] "Network Management" Plasma widget Debian packaging branch, master, updated. debian/0.9-git20111002.90c59c3-1-4-g40a30fb

Michael Biebl biebl at alioth.debian.org
Fri Nov 4 12:51:16 UTC 2011


The following commit has been merged in the master branch:
commit fb8c468639ab98dc6fec419f8c67fee06138f7cc
Merge: 1fa0e4da96293d3a6a09c3462426bef8caa7d7c0 5b09c66fc230d8a91329db777612a20c5d5947af
Author: Michael Biebl <biebl at debian.org>
Date:   Fri Nov 4 13:10:09 2011 +0100

    Merge commit 'upstream/0.9-git20111103.1240c6f'

 applet/CMakeLists.txt                              |    4 +
 applet/activatableitem.cpp                         |   14 +-
 applet/activatableitem.h                           |    1 +
 applet/activatablelistwidget.cpp                   |    4 +-
 applet/gsminterfaceconnectionitem.cpp              |   54 ++-
 applet/gsminterfaceconnectionitem.h                |    4 +-
 applet/interfaceconnectionitem.cpp                 |   12 +-
 applet/interfaceconnectionitem.h                   |    3 -
 applet/interfacedetailswidget.cpp                  |    1 +
 applet/network2.svgz                               |  Bin 0 -> 59396 bytes
 applet/networkmanager.cpp                          |  268 +++++++-----
 applet/networkmanager.h                            |   10 +-
 applet/plasma-applet-networkmanagement.desktop     |   34 +--
 applet/vpninterfaceitem.cpp                        |    1 +
 applet/wirelessnetworkitem.cpp                     |   22 +-
 applet/wirelessnetworkitem.h                       |    4 +-
 applet/wirelessstatus.cpp                          |    9 +-
 .../settings/802-11-wireless-securitydbus.cpp      |    4 +-
 dataengine/networkmanagementengine.cpp             |    9 +
 dataengine/plasma-engine-networkmanagement.desktop |   24 +-
 kded/networkmanagement.desktop                     |   35 +--
 kded/nm08connections.cpp                           |    3 +
 libs/client/remoteactivatablelist.cpp              |    4 +-
 libs/client/remotewirelessinterfaceconnection.cpp  |    5 +
 libs/client/remotewirelessinterfaceconnection.h    |    1 +
 libs/client/remotewirelessnetwork.cpp              |    6 +
 libs/client/remotewirelessnetwork.h                |    1 +
 libs/client/remotewirelessobject.h                 |    5 +-
 libs/internals/connection.cpp                      |    8 +
 libs/internals/setting.cpp                         |    1 +
 libs/internals/uiutils.cpp                         |    3 +
 libs/service/configurationlauncher.cpp             |    7 +
 libs/service/pindialog.cpp                         |   12 +
 libs/service/pinwidget.ui                          |    9 -
 libs/ui/802-11-wireless.ui                         |    2 +-
 libs/ui/editlistdialog.cpp                         |    4 +
 libs/ui/editlistdialog.h                           |    1 +
 libs/ui/ipv6widget.cpp                             |    2 +
 libs/ui/networkmanagement_vpnuiplugin.desktop      |   31 +--
 libs/ui/security/eapmethodpeapbase.ui              |    2 +-
 libs/ui/security/eapmethodtlsbase.ui               |    2 +-
 libs/ui/security/eapmethodttlsbase.ui              |    2 +-
 libs/ui/security/peapwidget.cpp                    |    1 +
 libs/ui/security/tlswidget.cpp                     |    1 +
 libs/ui/security/ttlswidget.cpp                    |    1 +
 libs/ui/security/wepauthwidget.cpp                 |    3 +
 libs/ui/vpnpreferences.cpp                         |    2 +-
 monolithic/kde4-knetworkmanager-autostart.desktop  |   50 +--
 monolithic/knetworkmanager.desktop                 |   50 +--
 networkmanagement.notifyrc                         |  473 ++++----------------
 plasma_nm_version.h                                |    2 +-
 qml/package/metadata.desktop                       |   25 +-
 qml/plasma-applet-networkconnections.desktop       |   25 +-
 settings/config/kcm_networkmanagement.desktop      |   28 +--
 settings/config/kcm_networkmanagement_tray.desktop |   36 +--
 settings/config/manageconnectionwidget.cpp         |    9 +-
 settings/configshell/manageconnection.cpp          |    1 +
 solidcontrolfuture/libs/solid/control/Messages.sh  |    2 +-
 .../control/backends/fakenet/solid_fakenet.desktop |  135 +------
 .../libs/solid/control/networkmanager.cpp          |    2 +-
 .../libs/solid/control/networkmanager.h            |    2 +-
 .../libs/solid/control/networkmodeminterface.h     |    4 +-
 .../solid/control/solidnetworkmanagernm09.desktop  |   67 +---
 .../networkmanager-0.9/networkmodeminterface.cpp   |   18 +-
 .../networkmanager-0.9/networkmodeminterface_p.h   |    1 +
 .../solid_networkmanager09.desktop                 |  131 +------
 .../networkmanagement_novellvpnui.desktop          |   31 +--
 vpnplugins/novellvpn/novellvpn.cpp                 |    7 +
 vpnplugins/openconnect/CMakeLists.txt              |    4 +-
 .../networkmanagement_openconnectui.desktop        |   30 ++
 vpnplugins/openconnect/openconnectauth.ui          |    2 +-
 vpnplugins/openconnect/openconnectprop.ui          |    2 +-
 .../openvpn/networkmanagement_openvpnui.desktop    |   30 +--
 vpnplugins/pptp/networkmanagement_pptpui.desktop   |   28 +--
 vpnplugins/pptp/pptp.cpp                           |    7 +
 vpnplugins/pptp/pptpwidget.cpp                     |    2 +-
 .../networkmanagement_strongswanui.desktop         |   28 +--
 vpnplugins/strongswan/strongswan.cpp               |    7 +
 vpnplugins/vpnc/networkmanagement_vpncui.desktop   |   28 +--
 79 files changed, 606 insertions(+), 1297 deletions(-)

-- 
"Network Management" Plasma widget Debian packaging



More information about the pkg-kde-commits mailing list