[Merge request] KDE Frameworks template

[Jonathan Riddell]

applied thanks!

Jonathan



On Mon, Jun 08, 2015 at 04:28:01PM +0200, José Manuel Santamaría Lema wrote:
> Hi,
> 
> I think current kdesu from kubuntu_wily_archive is going to fail to upgrade 
> from vivid.
> 
> I have pushed the proposed change to this repository:
> https://gitlab.com/siduction-kde-frameworks/kwallet
> 
> in the kubuntu_wily_archive branch:
> https://gitlab.com/siduction-kde-frameworks/kwallet/commits/kubuntu_wily_archive_tmp
> 
> Also I'm attaching the patch retrieved with git format-patch.

> From 1030043d53ce86cefe94410507e43236a37272ca Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Santamar=C3=ADa=20Lema?=
>  <panfaust at gmail.com>
> Date: Mon, 8 Jun 2015 11:10:37 +0200
> Subject: [PATCH] libkf5wallet-data Breaks/Replaces libkf5wallet5 (<< 5.10)
> 
> ---
>  debian/changelog | 6 ++++++
>  debian/control   | 4 ++--
>  2 files changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/debian/changelog b/debian/changelog
> index dd39582..10cea93 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,9 @@
> +kwallet-kf5 (5.10.0-0ubuntu2) UNRELEASED; urgency=medium
> +
> +  * libkf5wallet-data Breaks/Replaces libkf5wallet5 (<< 5.10)
> +
> + -- José Manuel Santamaría Lema <panfaust at gmail.com>  Mon, 08 Jun 2015 11:06:38 +0200
> +
>  kwallet-kf5 (5.10.0-0ubuntu1) wily; urgency=medium
>  
>    [ Maximiliano Curia ]
> diff --git a/debian/control b/debian/control
> index 941fbc5..526a69d 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -67,8 +67,8 @@ Package: libkf5wallet-data
>  Architecture: all
>  Multi-Arch: foreign
>  Depends: ${misc:Depends}, ${shlibs:Depends}
> -Breaks: libkf5wallet5 (<< 5.6.0)
> -Replaces: libkf5wallet5 (<< 5.6.0)
> +Breaks: libkf5wallet5 (<< 5.10)
> +Replaces: libkf5wallet5 (<< 5.10)
>  Description: Secure and unified container for user passwords.
>   Interface to KWallet, the safe desktop-wide storage
>   for passwords on KDE workspaces.
> -- 
> 2.1.4
> 




> -- 
> kubuntu-devel mailing list
> kubuntu-devel at lists.ubuntu.com
> Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel