[kubuntu-devel] [Merge request] kubuntu_unstable kf 5.12: kdelibs4support

[Jonathan Riddell]

changes are already in




On Fri, Jul 10, 2015 at 09:24:22AM +0200, José Manuel Santamaría Lema wrote:
> Hi,
> 
> when I was packaging kdelibs4support for siduction I noticed they were some 
> missing files; also I got this lintian warning:
> W: kdelibs4support source: dependency-is-not-multi-archified 
> libkf5kdelibs4support5 depends on libkf5kdelibs4support-data (multi-arch: no)
> 
> Patches attached, please consider to include them when you package frameworks 
> 5.12.
> 
> Cheers.

> >From b76d224b5b97e02dd4b5b0be19e03690042bc530 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Santamar=C3=ADa=20Lema?=
>  <panfaust at gmail.com>
> Date: Thu, 9 Jul 2015 21:22:23 +0200
> Subject: [PATCH 1/2] Update installed files.
> 
> ---
>  debian/changelog                          | 6 ++++++
>  debian/libkf5kdelibs4support-data.install | 1 +
>  2 files changed, 7 insertions(+)
> 
> diff --git a/debian/changelog b/debian/changelog
> index 320c7eb..29d0965 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,9 @@
> +kdelibs4support (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
> +
> +  * Update installed files.
> +
> + -- José Manuel Santamaría Lema <panfaust at gmail.com>  Thu, 09 Jul 2015 21:19:35 +0200
> +
>  kdelibs4support (5.11.0-1) unstable; urgency=medium
>  
>    * New upstream release (5.10.0).
> diff --git a/debian/libkf5kdelibs4support-data.install b/debian/libkf5kdelibs4support-data.install
> index 9982bda..4edffb4 100644
> --- a/debian/libkf5kdelibs4support-data.install
> +++ b/debian/libkf5kdelibs4support-data.install
> @@ -6,6 +6,7 @@ etc/xdg/colors/Web.colors
>  etc/xdg/kdebug.areas
>  etc/xdg/kdebugrc
>  etc/xdg/ksslcalist
> +usr/share/doc/HTML/*/kcontrol/
>  usr/share/doc/HTML/*/kdebugdialog5/
>  usr/share/kf5/kdoctools/customization/catalog4.xml
>  usr/share/kf5/kdoctools/customization/dtd/kdex.dtd
> -- 
> 2.1.4
> 

> >From a9e82ff2d2453bff28ba5d43a243839c5ec0768a Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Santamar=C3=ADa=20Lema?=
>  <panfaust at gmail.com>
> Date: Thu, 9 Jul 2015 23:06:34 +0200
> Subject: [PATCH 2/2] Set libkf5kdelibs4support-data as Multi-Arch: foreign.
> 
> ---
>  debian/changelog | 1 +
>  debian/control   | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/debian/changelog b/debian/changelog
> index 29d0965..4a6cdba 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,6 +1,7 @@
>  kdelibs4support (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
>  
>    * Update installed files.
> +  * Set libkf5kdelibs4support-data as Multi-Arch: foreign.
>  
>   -- José Manuel Santamaría Lema <panfaust at gmail.com>  Thu, 09 Jul 2015 21:19:35 +0200
>  
> diff --git a/debian/control b/debian/control
> index 535e261..3846bf6 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -139,6 +139,7 @@ Description: Porting aid from KDELibs4.
>   variable correctly.
>  
>  Package: libkf5kdelibs4support-data
> +Multi-Arch: foreign
>  Architecture: all
>  Depends: ${misc:Depends}, ${shlibs:Depends}
>  Breaks: libkf5kdelibs4support5-data
> -- 
> 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