[Merge] lp:~ken-vandine/ubuntu/utopic/folks/misc into lp:ubuntu/folks

[Renato Araujo Oliveira Filho]

Diff comments:

> === modified file 'debian/changelog'
> --- debian/changelog	2014-06-25 10:44:38 +0000
> +++ debian/changelog	2014-09-02 20:02:48 +0000
> @@ -1,3 +1,12 @@
> +folks (0.9.7.1-1ubuntu1) UNRELEASED; urgency=medium
> +
> +  * Split the dummy and key-file backends into a new libfolks-misc25 
> +    package, having them installed with libfolks25 caused them to 
> +    always get loaded at runtime, but they are only used 
> +    for tests (LP: #1364548)
> +
> + -- Ken VanDine <ken.vandine at canonical.com>  Tue, 02 Sep 2014 14:04:33 -0400
> +
>  folks (0.9.7.1-1) unstable; urgency=medium
>  
>    * New upstream version 0.9.7.1
> 
> === modified file 'debian/control'
> --- debian/control	2014-06-25 10:44:38 +0000
> +++ debian/control	2014-09-02 20:02:48 +0000
> @@ -159,6 +159,35 @@
>   .
>   This package contains the development files for libfolks EDS backend.
>  
> +Package: libfolks-misc25
> +Architecture: any
> +Depends: ${shlibs:Depends},
> +         ${misc:Depends},
> +         libfolks25 (= ${binary:Version})
> +Recommends: folks-common (= ${source:Version})
> +Pre-Depends: ${misc:Pre-Depends}
> +Multi-Arch: same
> +Description: Miscellaneous backends for libfolks
> + libfolks is a library that aggregates people from multiple sources
> + (eg, Telepathy connection managers and eventually evolution data server,
> + Facebook, etc.) to create metacontacts.
> + .
> + This package contains the dummy and key-file backends for libfolks
> +
> +Package: libfolks-misc-dev
> +Section: libdevel
> +Architecture: any
> +Depends: libfolks-eds25 (= ${binary:Version}),
> +         libfolks-dev (= ${binary:Version}),
> +         libglib2.0-dev (>= 2.24),
> +         ${misc:Depends}
> +Description: Miscellaneous backends for libfolks - development files
> + libfolks is a library that aggregates people from multiple sources
> + (eg, Telepathy connection managers and eventually evolution data server,
> + Facebook, etc.) to create metacontacts.
> + .
> + This package contains the development files for libfolks misc backends.
> +
>  Package: libfolks-eds-dbg
>  Section: debug
>  Priority: extra
> @@ -187,6 +216,20 @@
>   .
>   This package contains the debugging symbols for libfolks telepathy backend.
>  
> +Package: libfolks-misc-dbg
> +Section: debug
> +Priority: extra
> +Architecture: any
> +Depends: libfolks-misc25 (= ${binary:Version}),
> +         ${misc:Depends}
> +Multi-Arch: same
> +Description: Miscellaneous backends for libfolks - debugging symbols
> + libfolks is a library that aggregates people from multiple sources
> + (eg, Telepathy connection managers and eventually evolution data server,
> + Facebook, etc.) to create metacontacts.
> + .
> + This package contains the debugging symbols for libfolks misc backends.
> +
>  Package: folks-tools
>  Section: utils
>  Priority: extra
> 
> === modified file 'debian/libfolks-dev.install'
> --- debian/libfolks-dev.install	2014-06-23 12:44:09 +0000
> +++ debian/libfolks-dev.install	2014-09-02 20:02:48 +0000
> @@ -1,9 +1,6 @@
>  usr/lib/*/libfolks.so
>  usr/lib/*/libfolks-dummy.so
>  usr/include/folks/folks.h
> -usr/include/folks/folks-dummy.h
>  usr/lib/*/pkgconfig/folks.pc
> -usr/lib/*/pkgconfig/folks-dummy.pc
>  usr/share/vala/vapi/folks.*
> -usr/share/vala/vapi/folks-dummy.*
>  usr/share/gir-1.0/*.gir
> 
> === added file 'debian/libfolks-misc-dev.install'
> --- debian/libfolks-misc-dev.install	1970-01-01 00:00:00 +0000
> +++ debian/libfolks-misc-dev.install	2014-09-02 20:02:48 +0000
> @@ -0,0 +1,3 @@
> +usr/include/folks/folks-dummy.h
> +usr/lib/*/pkgconfig/folks-dummy.pc
> +usr/share/vala/vapi/folks-dummy.*
> 
> === added file 'debian/libfolks-misc25.install'
> --- debian/libfolks-misc25.install	1970-01-01 00:00:00 +0000
> +++ debian/libfolks-misc25.install	2014-09-02 20:02:48 +0000
> @@ -0,0 +1,2 @@
> +usr/lib/*/folks/*/backends/key-file/*.so
> +usr/lib/*/folks/*/backends/dummy/*.so
> 
> === modified file 'debian/libfolks25.install'
> --- debian/libfolks25.install	2014-06-23 12:44:09 +0000
> +++ debian/libfolks25.install	2014-09-02 20:02:48 +0000
> @@ -1,4 +1,2 @@
>  usr/lib/*/libfolks.so.*
>  usr/lib/*/libfolks-dummy.so.*

Should we move usr/lib/*/libfolks-dummy.so.* to the mic package too?

> -usr/lib/*/folks/*/backends/key-file/*.so
> -usr/lib/*/folks/*/backends/dummy/*.so
> 
> === modified file 'debian/rules'
> --- debian/rules	2014-06-25 10:44:38 +0000
> +++ debian/rules	2014-09-02 20:02:48 +0000
> @@ -24,13 +24,14 @@
>  	dh_strip -plibfolks25 --dbg-package=libfolks-dbg
>  	dh_strip -plibfolks-telepathy25 --dbg-package=libfolks-telepathy-dbg
>  	dh_strip -plibfolks-eds25 --dbg-package=libfolks-eds-dbg
> +	dh_strip -plibfolks-misc25 --dbg-package=libfolks-misc-dbg
>  	dh_strip -pfolks-tools
>  
>  export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
>  override_dh_makeshlibs:
> -	dh_makeshlibs -plibfolks25 -X/backends/
>  	dh_makeshlibs -plibfolks-telepathy25 -X/backends/
>  	dh_makeshlibs -plibfolks-eds25 -X/backends/
> +	dh_makeshlibs -plibfolks-misc25 -X/backends/
>  
>  override_dh_install:
>  	find debian/tmp -name *.la -print -delete
> 


-- 
https://code.launchpad.net/~ken-vandine/ubuntu/utopic/folks/misc/+merge/233111
Your team Ubuntu branches is requested to review the proposed merge of lp:~ken-vandine/ubuntu/utopic/folks/misc into lp:ubuntu/folks.