diff -Nru kwalletmanager-4.12.3/debian/changelog kwalletmanager-4.12.90/debian/changelog --- kwalletmanager-4.12.3/debian/changelog 2014-03-10 13:45:32.000000000 +0000 +++ kwalletmanager-4.12.90/debian/changelog 2014-03-19 12:19:05.000000000 +0000 @@ -1,8 +1,8 @@ -kwalletmanager (4:4.12.3-0ubuntu2) trusty; urgency=medium +kwalletmanager (4:4.12.90-0ubuntu1) trusty; urgency=medium - * Fix kde4libs build-depend + * New upstream beta release - -- Jonathan Riddell Mon, 10 Mar 2014 13:45:08 +0000 + -- Jonathan Riddell Wed, 19 Mar 2014 11:33:17 +0000 kwalletmanager (4:4.12.3-0ubuntu1) trusty; urgency=medium diff -Nru kwalletmanager-4.12.3/debian/control kwalletmanager-4.12.90/debian/control --- kwalletmanager-4.12.3/debian/control 2014-03-10 13:45:04.000000000 +0000 +++ kwalletmanager-4.12.90/debian/control 2014-03-19 12:19:05.000000000 +0000 @@ -10,11 +10,11 @@ Lisandro Damián Nicanor Pérez Meyer Build-Depends: kde-sc-dev-latest (>= 4:4.10.2), cmake, debhelper (>= 8.0.0), pkg-kde-tools (>= 0.12), - kdelibs5-dev (>= 4:4.12.3) + kdelibs5-dev (>= 4:4.12.90) Standards-Version: 3.9.3 Homepage: http://www.kde.org -Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kwallet -Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kwallet +Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kwalletmanager +Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kwalletmanager X-Vcs-Debian-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kwallet.git X-Vcs-Debian-Git: git://git.debian.org/pkg-kde/kde-sc/kwallet.git diff -Nru kwalletmanager-4.12.3/src/konfigurator/konfigurator.cpp kwalletmanager-4.12.90/src/konfigurator/konfigurator.cpp --- kwalletmanager-4.12.3/src/konfigurator/konfigurator.cpp 2014-02-21 07:52:27.000000000 +0000 +++ kwalletmanager-4.12.90/src/konfigurator/konfigurator.cpp 2014-03-04 06:03:57.000000000 +0000 @@ -188,7 +188,7 @@ KConfigGroup config(_cfg, "Wallet"); _wcw->_enabled->setChecked(config.readEntry("Enabled", true)); _wcw->_openPrompt->setChecked(config.readEntry("Prompt on Open", false)); - _wcw->_launchManager->setChecked(config.readEntry("Launch Manager", true)); + _wcw->_launchManager->setChecked(config.readEntry("Launch Manager", false)); _wcw->_autocloseManager->setChecked(! config.readEntry("Leave Manager Open", false)); _wcw->_screensaverLock->setChecked(config.readEntry("Close on Screensaver", false)); _wcw->_autoclose->setChecked(!config.readEntry("Leave Open", false)); diff -Nru kwalletmanager-4.12.3/src/konfigurator/kwallet.actions kwalletmanager-4.12.90/src/konfigurator/kwallet.actions --- kwalletmanager-4.12.3/src/konfigurator/kwallet.actions 2014-02-21 07:52:27.000000000 +0000 +++ kwalletmanager-4.12.90/src/konfigurator/kwallet.actions 2014-03-04 06:03:57.000000000 +0000 @@ -1,6 +1,6 @@ [Domain] Name=KDE Wallet system -Name[bs]=KDE sistem novčanika +Name[bs]=Sistem KDE novčanika Name[ca]=Sistema de cartera del KDE Name[ca@valencia]=Sistema de cartera del KDE Name[cs]=Systém úschovny pro KDE @@ -16,10 +16,10 @@ Name[ia]=KDE Wallet System (Systema de portafolio de KDE) Name[it]=Il sistema di portafogli di KDE Name[kk]=KDE әмиян жүйесі +Name[ko]=KDE 지갑 시스템 Name[nb]=KDEs Lommebok-system Name[nds]=KDE-Knippensysteem Name[nl]=KDE-portefeuillesysteem -Name[pa]=KDE ਵਾਲਿਟ ਸਿਸਟਮ Name[pl]=System portfela KDE Name[pt]=Sistema da Carteira do KDE Name[pt_BR]=Sistema de carteiras do KDE @@ -41,7 +41,7 @@ [org.kde.kcontrol.kcmkwallet.save] Name=Save wallet configuration -Name[bs]=Snimi podešavanje novčanika +Name[bs]=Snimi konfiguraciju novčanika Name[ca]=Desa la configuració de la cartera Name[ca@valencia]=Guarda la configuració de la cartera Name[cs]=Uložit nastavení úschovny @@ -57,10 +57,10 @@ Name[ia]=Salveguarda configuration de portafolio Name[it]=Salva la configurazione del portafogli Name[kk]=Әмиянның баптауын сақтау +Name[ko]=지갑 저장 설정 Name[nb]=Lagre lommebok-oppsett Name[nds]=Knippinstellen sekern Name[nl]=Portefeuille-instellingen opslaan -Name[pa]=ਵਾਲਿਟ ਸੰਰਚਨਾ ਸੰਭਾਲੋ Name[pl]=Zapisz konfigurację portfela Name[pt]=Gravar a configuração da carteira Name[pt_BR]=Salvar a configuração da carteira @@ -79,7 +79,7 @@ Name[zh_CN]=保存钱包配置 Name[zh_TW]=儲存錢包設定 Description=Allow saving wallet configuration settings -Description[bs]=Dopusti snimanje konfiguracijskih postavki novčanika +Description[bs]=Dopusti snimanje postavki novčanika Description[ca]=Permet desar els paràmetres de configuració de la cartera Description[ca@valencia]=Permet guardar els paràmetres de configuració de la cartera Description[cs]=Povolit uložení nastavení úschovny @@ -95,10 +95,10 @@ Description[ia]=Il permitte salveguardar preferentias de configuration de portafolio Description[it]=Permette il salvataggio della configurazione del portafogli Description[kk]=Әмиян баптау параметрлерін сақтауын рұқсат ету +Description[ko]=지갑 설정 저장 허용 Description[nb]=Kan lagre oppsettsinnstillingene for lommeboka Description[nds]=Sekern vun Knippinstellen tolaten Description[nl]=Opslaan van instellingen van de portefeuille toestaan -Description[pa]=ਵਾਲਿਟ ਸੰਰਚਨਾ ਸੈਟਿੰਗ ਸੰਭਾਲਣ ਦੀ ਮਨਜ਼ੂਰੀ Description[pl]=Zezwól na zapisywanie konfiguracji portfela Description[pt]=Permitir a gravação das definições da carteira Description[pt_BR]=Permite salvar as configurações da carteira diff -Nru kwalletmanager-4.12.3/src/konfigurator/savehelper.cpp kwalletmanager-4.12.90/src/konfigurator/savehelper.cpp --- kwalletmanager-4.12.3/src/konfigurator/savehelper.cpp 2014-02-21 07:52:27.000000000 +0000 +++ kwalletmanager-4.12.90/src/konfigurator/savehelper.cpp 2014-03-04 06:03:57.000000000 +0000 @@ -22,8 +22,8 @@ #include #include -#if defined(Q_WS_WIN) -// TODO: or rather use uid_t in the getuid() call below? or test for if __uid_t is present +#if defined(Q_CC_MSVC) +// TODO: or rather use uid_t in the getuid() call below? #define __uid_t uid_t #endif diff -Nru kwalletmanager-4.12.3/src/konfigurator/walletconfigwidget.ui kwalletmanager-4.12.90/src/konfigurator/walletconfigwidget.ui --- kwalletmanager-4.12.3/src/konfigurator/walletconfigwidget.ui 2014-02-21 07:52:27.000000000 +0000 +++ kwalletmanager-4.12.90/src/konfigurator/walletconfigwidget.ui 2014-03-04 06:03:57.000000000 +0000 @@ -19,7 +19,7 @@ - <p>The wallet subsystem provides a convenient and secure way to manage all your passwords. This option specifies whether or not you want to use it.</p> + <p>The wallet subsystem provides a convenient and secure way to manage all your passwords. This option specifies whether or not you want to use it.</p> &Enable the KDE wallet subsystem diff -Nru kwalletmanager-4.12.3/src/manager/kwalletmanager.cpp kwalletmanager-4.12.90/src/manager/kwalletmanager.cpp --- kwalletmanager-4.12.3/src/manager/kwalletmanager.cpp 2014-02-21 07:52:27.000000000 +0000 +++ kwalletmanager-4.12.90/src/manager/kwalletmanager.cpp 2014-03-04 06:03:57.000000000 +0000 @@ -62,7 +62,7 @@ m_kwalletdModule = 0; KConfig cfg( QLatin1String( "kwalletrc" )); // not sure why this setting isn't in kwalletmanagerrc... KConfigGroup walletConfigGroup(&cfg, "Wallet"); - if (walletConfigGroup.readEntry("Launch Manager", true)) { + if (walletConfigGroup.readEntry("Launch Manager", false)) { _tray = new KStatusNotifierItem(this); _tray->setObjectName( QLatin1String("kwalletmanager tray" )); _tray->setCategory( KStatusNotifierItem::SystemServices );