Package: src:evolution-data-server Version: 3.18.3-1 Tags: patch User: d...@debian.org Usertags: multiarch
patch attached
* Multiarchify the library packages. diff -Nru evolution-data-server-3.18.3/debian/control evolution-data-server-3.18.3/debian/control --- evolution-data-server-3.18.3/debian/control 2015-12-16 14:55:01.000000000 +0100 +++ evolution-data-server-3.18.3/debian/control 2016-01-28 00:59:39.000000000 +0100 @@ -138,6 +138,8 @@ Package: libedataserver-1.2-21 Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, evolution-data-server-common (>= ${gnome:Version}) @@ -150,6 +152,7 @@ Package: libedataserver1.2-dev Section: libdevel Architecture: any +Multi-Arch: same Depends: libedataserver-1.2-21 (= ${binary:Version}), gir1.2-edataserver-1.2 (= ${binary:Version}), ${shlibs:Depends}, @@ -168,6 +171,7 @@ Package: gir1.2-edataserver-1.2 Section: introspection Architecture: any +Multi-Arch: same Depends: ${gir:Depends}, ${shlibs:Depends}, ${misc:Depends} @@ -182,6 +186,8 @@ Package: libedataserverui-1.2-1 Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, evolution-data-server-common (>= ${gnome:Version}) @@ -194,6 +200,7 @@ Package: libedataserverui1.2-dev Section: libdevel Architecture: any +Multi-Arch: same Depends: libedataserverui-1.2-1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, @@ -214,6 +221,8 @@ Package: libcamel-1.2-54 Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: Evolution MIME message handling library @@ -227,6 +236,7 @@ Package: libcamel1.2-dev Section: libdevel Architecture: any +Multi-Arch: same Depends: libcamel-1.2-54 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, @@ -247,6 +257,8 @@ Package: libebook-1.2-16 Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: Client library for evolution address books @@ -258,6 +270,7 @@ Package: libebook1.2-dev Section: libdevel Architecture: any +Multi-Arch: same Depends: libebook-1.2-16 (= ${binary:Version}), gir1.2-ebook-1.2 (= ${binary:Version}), ${misc:Depends}, @@ -277,6 +290,7 @@ Package: gir1.2-ebook-1.2 Section: introspection Architecture: any +Multi-Arch: same Depends: ${gir:Depends}, ${shlibs:Depends}, ${misc:Depends} @@ -291,6 +305,8 @@ Package: libedata-book-1.2-25 Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: Backend library for evolution address books @@ -302,6 +318,7 @@ Package: libedata-book1.2-dev Section: libdevel Architecture: any +Multi-Arch: same Depends: libedata-book-1.2-25 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, @@ -317,6 +334,7 @@ Package: gir1.2-ebookcontacts-1.2 Section: introspection Architecture: any +Multi-Arch: same Depends: ${gir:Depends}, ${shlibs:Depends}, ${misc:Depends} @@ -331,6 +349,8 @@ Package: libebook-contacts-1.2-2 Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: Client library for evolution contacts books @@ -342,6 +362,7 @@ Package: libebook-contacts1.2-dev Section: libdevel Architecture: any +Multi-Arch: same Depends: libebook-contacts-1.2-2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, @@ -357,6 +378,8 @@ Package: libecal-1.2-19 Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: Client library for evolution calendars @@ -368,6 +391,7 @@ Package: libecal1.2-dev Section: libdevel Architecture: any +Multi-Arch: same Depends: libecal-1.2-19 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, @@ -383,6 +407,8 @@ Package: libedata-cal-1.2-28 Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: Backend library for evolution calendars @@ -394,6 +420,7 @@ Package: libedata-cal1.2-dev Section: libdevel Architecture: any +Multi-Arch: same Depends: libedata-cal-1.2-28 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, @@ -410,6 +437,8 @@ Package: libebackend-1.2-10 Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: Utility library for evolution data servers @@ -422,6 +451,7 @@ Package: libebackend1.2-dev Section: libdevel Architecture: any +Multi-Arch: same Depends: libebackend-1.2-10 (= ${binary:Version}), ${misc:Depends}, libedataserver1.2-dev (= ${binary:Version}), diff -Nru evolution-data-server-3.18.3/debian/gir1.2-ebook-1.2.install evolution-data-server-3.18.3/debian/gir1.2-ebook-1.2.install --- evolution-data-server-3.18.3/debian/gir1.2-ebook-1.2.install 2015-12-16 14:55:01.000000000 +0100 +++ evolution-data-server-3.18.3/debian/gir1.2-ebook-1.2.install 2016-01-27 23:36:37.000000000 +0100 @@ -1 +1 @@ -usr/lib/girepository-1.0/EBook-1.2.typelib +usr/lib/*/girepository-1.0/EBook-1.2.typelib diff -Nru evolution-data-server-3.18.3/debian/gir1.2-ebookcontacts-1.2.install evolution-data-server-3.18.3/debian/gir1.2-ebookcontacts-1.2.install --- evolution-data-server-3.18.3/debian/gir1.2-ebookcontacts-1.2.install 2015-12-16 14:55:01.000000000 +0100 +++ evolution-data-server-3.18.3/debian/gir1.2-ebookcontacts-1.2.install 2016-01-27 23:36:41.000000000 +0100 @@ -1 +1 @@ -usr/lib/girepository-1.0/EBookContacts-1.2.typelib +usr/lib/*/girepository-1.0/EBookContacts-1.2.typelib diff -Nru evolution-data-server-3.18.3/debian/gir1.2-edataserver-1.2.install evolution-data-server-3.18.3/debian/gir1.2-edataserver-1.2.install --- evolution-data-server-3.18.3/debian/gir1.2-edataserver-1.2.install 2015-12-16 14:55:01.000000000 +0100 +++ evolution-data-server-3.18.3/debian/gir1.2-edataserver-1.2.install 2016-01-27 23:36:46.000000000 +0100 @@ -1 +1 @@ -usr/lib/girepository-1.0/EDataServer-1.2.typelib +usr/lib/*/girepository-1.0/EDataServer-1.2.typelib diff -Nru evolution-data-server-3.18.3/debian/libcamel-1.2-54.install evolution-data-server-3.18.3/debian/libcamel-1.2-54.install --- evolution-data-server-3.18.3/debian/libcamel-1.2-54.install 2015-12-16 14:55:01.000000000 +0100 +++ evolution-data-server-3.18.3/debian/libcamel-1.2-54.install 2016-01-27 23:34:27.000000000 +0100 @@ -1 +1 @@ -usr/lib/libcamel-*.so.* +usr/lib/*/libcamel-*.so.* diff -Nru evolution-data-server-3.18.3/debian/libcamel1.2-dev.install evolution-data-server-3.18.3/debian/libcamel1.2-dev.install --- evolution-data-server-3.18.3/debian/libcamel1.2-dev.install 2015-12-16 14:55:01.000000000 +0100 +++ evolution-data-server-3.18.3/debian/libcamel1.2-dev.install 2016-01-27 23:34:35.000000000 +0100 @@ -1,3 +1,3 @@ -usr/lib/libcamel*.so -usr/lib/pkgconfig/camel* +usr/lib/*/libcamel*.so +usr/lib/*/pkgconfig/camel* usr/include/evolution-data-server/camel diff -Nru evolution-data-server-3.18.3/debian/libebackend-1.2-10.install evolution-data-server-3.18.3/debian/libebackend-1.2-10.install --- evolution-data-server-3.18.3/debian/libebackend-1.2-10.install 2015-12-16 14:55:01.000000000 +0100 +++ evolution-data-server-3.18.3/debian/libebackend-1.2-10.install 2016-01-27 23:34:39.000000000 +0100 @@ -1,2 +1,2 @@ -usr/lib/libebackend-1.2.so.* +usr/lib/*/libebackend-1.2.so.* diff -Nru evolution-data-server-3.18.3/debian/libebackend1.2-dev.install evolution-data-server-3.18.3/debian/libebackend1.2-dev.install --- evolution-data-server-3.18.3/debian/libebackend1.2-dev.install 2015-12-16 14:55:01.000000000 +0100 +++ evolution-data-server-3.18.3/debian/libebackend1.2-dev.install 2016-01-27 23:34:48.000000000 +0100 @@ -1,3 +1,3 @@ -usr/lib/pkgconfig/libebackend-1.2.pc -usr/lib/libebackend-1.2.so +usr/lib/*/pkgconfig/libebackend-1.2.pc +usr/lib/*/libebackend-1.2.so usr/include/evolution-data-server/libebackend diff -Nru evolution-data-server-3.18.3/debian/libebook-1.2-16.install evolution-data-server-3.18.3/debian/libebook-1.2-16.install --- evolution-data-server-3.18.3/debian/libebook-1.2-16.install 2015-12-16 14:55:01.000000000 +0100 +++ evolution-data-server-3.18.3/debian/libebook-1.2-16.install 2016-01-27 23:34:53.000000000 +0100 @@ -1 +1 @@ -usr/lib/libebook-1.2.so.* +usr/lib/*/libebook-1.2.so.* diff -Nru evolution-data-server-3.18.3/debian/libebook1.2-dev.install evolution-data-server-3.18.3/debian/libebook1.2-dev.install --- evolution-data-server-3.18.3/debian/libebook1.2-dev.install 2015-12-16 14:55:01.000000000 +0100 +++ evolution-data-server-3.18.3/debian/libebook1.2-dev.install 2016-01-27 23:35:24.000000000 +0100 @@ -1,5 +1,5 @@ -usr/lib/pkgconfig/libebook-1.2.pc -usr/lib/libebook-1.2.so +usr/lib/*/pkgconfig/libebook-1.2.pc +usr/lib/*/libebook-1.2.so usr/include/evolution-data-server/libebook usr/share/gir-1.0/EBook-1.2.gir usr/share/vala/vapi/libebook-1.2.vapi diff -Nru evolution-data-server-3.18.3/debian/libebook-contacts-1.2-2.install evolution-data-server-3.18.3/debian/libebook-contacts-1.2-2.install --- evolution-data-server-3.18.3/debian/libebook-contacts-1.2-2.install 2015-12-16 14:55:01.000000000 +0100 +++ evolution-data-server-3.18.3/debian/libebook-contacts-1.2-2.install 2016-01-27 23:34:59.000000000 +0100 @@ -1 +1 @@ -usr/lib/libebook-contacts-1.2.so.* +usr/lib/*/libebook-contacts-1.2.so.* diff -Nru evolution-data-server-3.18.3/debian/libebook-contacts1.2-dev.install evolution-data-server-3.18.3/debian/libebook-contacts1.2-dev.install --- evolution-data-server-3.18.3/debian/libebook-contacts1.2-dev.install 2015-12-16 14:55:01.000000000 +0100 +++ evolution-data-server-3.18.3/debian/libebook-contacts1.2-dev.install 2016-01-27 23:35:14.000000000 +0100 @@ -1,5 +1,5 @@ -usr/lib/pkgconfig/libebook-contacts-1.2.pc -usr/lib/libebook-contacts-1.2.so +usr/lib/*/pkgconfig/libebook-contacts-1.2.pc +usr/lib/*/libebook-contacts-1.2.so usr/include/evolution-data-server/libebook-contacts usr/share/gir-1.0/EBookContacts-1.2.gir usr/share/vala/vapi/libebook-contacts-1.2.vapi diff -Nru evolution-data-server-3.18.3/debian/libecal-1.2-19.install evolution-data-server-3.18.3/debian/libecal-1.2-19.install --- evolution-data-server-3.18.3/debian/libecal-1.2-19.install 2015-12-16 14:55:01.000000000 +0100 +++ evolution-data-server-3.18.3/debian/libecal-1.2-19.install 2016-01-27 23:35:29.000000000 +0100 @@ -1 +1 @@ -usr/lib/libecal-1.2.so.* +usr/lib/*/libecal-1.2.so.* diff -Nru evolution-data-server-3.18.3/debian/libecal1.2-dev.install evolution-data-server-3.18.3/debian/libecal1.2-dev.install --- evolution-data-server-3.18.3/debian/libecal1.2-dev.install 2015-12-16 14:55:01.000000000 +0100 +++ evolution-data-server-3.18.3/debian/libecal1.2-dev.install 2016-01-27 23:35:35.000000000 +0100 @@ -1,3 +1,3 @@ -usr/lib/pkgconfig/libecal-1.2.pc -usr/lib/libecal-1.2.so +usr/lib/*/pkgconfig/libecal-1.2.pc +usr/lib/*/libecal-1.2.so usr/include/evolution-data-server/libecal diff -Nru evolution-data-server-3.18.3/debian/libedata-book-1.2-25.install evolution-data-server-3.18.3/debian/libedata-book-1.2-25.install --- evolution-data-server-3.18.3/debian/libedata-book-1.2-25.install 2015-12-16 14:55:01.000000000 +0100 +++ evolution-data-server-3.18.3/debian/libedata-book-1.2-25.install 2016-01-27 23:35:41.000000000 +0100 @@ -1 +1 @@ -usr/lib/libedata-book-1.2.so.* +usr/lib/*/libedata-book-1.2.so.* diff -Nru evolution-data-server-3.18.3/debian/libedata-book1.2-dev.install evolution-data-server-3.18.3/debian/libedata-book1.2-dev.install --- evolution-data-server-3.18.3/debian/libedata-book1.2-dev.install 2015-12-16 14:55:01.000000000 +0100 +++ evolution-data-server-3.18.3/debian/libedata-book1.2-dev.install 2016-01-27 23:35:48.000000000 +0100 @@ -1,3 +1,3 @@ -usr/lib/pkgconfig/libedata-book-1.2.pc -usr/lib/libedata-book-1.2.so +usr/lib/*/pkgconfig/libedata-book-1.2.pc +usr/lib/*/libedata-book-1.2.so usr/include/evolution-data-server/libedata-book diff -Nru evolution-data-server-3.18.3/debian/libedata-cal-1.2-28.install evolution-data-server-3.18.3/debian/libedata-cal-1.2-28.install --- evolution-data-server-3.18.3/debian/libedata-cal-1.2-28.install 2015-12-16 14:55:01.000000000 +0100 +++ evolution-data-server-3.18.3/debian/libedata-cal-1.2-28.install 2016-01-27 23:35:58.000000000 +0100 @@ -1 +1 @@ -usr/lib/libedata-cal-1.2.so.* +usr/lib/*/libedata-cal-1.2.so.* diff -Nru evolution-data-server-3.18.3/debian/libedata-cal1.2-dev.install evolution-data-server-3.18.3/debian/libedata-cal1.2-dev.install --- evolution-data-server-3.18.3/debian/libedata-cal1.2-dev.install 2015-12-16 14:55:01.000000000 +0100 +++ evolution-data-server-3.18.3/debian/libedata-cal1.2-dev.install 2016-01-27 23:36:05.000000000 +0100 @@ -1,3 +1,3 @@ -usr/lib/pkgconfig/libedata-cal-1.2.pc -usr/lib/libedata-cal-1.2.so +usr/lib/*/pkgconfig/libedata-cal-1.2.pc +usr/lib/*/libedata-cal-1.2.so usr/include/evolution-data-server/libedata-cal diff -Nru evolution-data-server-3.18.3/debian/libedataserver-1.2-21.install evolution-data-server-3.18.3/debian/libedataserver-1.2-21.install --- evolution-data-server-3.18.3/debian/libedataserver-1.2-21.install 2015-12-16 14:55:01.000000000 +0100 +++ evolution-data-server-3.18.3/debian/libedataserver-1.2-21.install 2016-01-27 23:36:11.000000000 +0100 @@ -1 +1 @@ -usr/lib/libedataserver-1.2.so.* +usr/lib/*/libedataserver-1.2.so.* diff -Nru evolution-data-server-3.18.3/debian/libedataserver1.2-dev.install evolution-data-server-3.18.3/debian/libedataserver1.2-dev.install --- evolution-data-server-3.18.3/debian/libedataserver1.2-dev.install 2015-12-16 14:55:01.000000000 +0100 +++ evolution-data-server-3.18.3/debian/libedataserver1.2-dev.install 2016-01-27 23:36:19.000000000 +0100 @@ -1,5 +1,5 @@ -usr/lib/pkgconfig/libedataserver-1.2.pc -usr/lib/libedataserver-1.2.so +usr/lib/*/pkgconfig/libedataserver-1.2.pc +usr/lib/*/libedataserver-1.2.so usr/include/evolution-data-server/libedataserver usr/share/gir-1.0/EDataServer-1.2.gir usr/share/vala/vapi/libedataserver-1.2.vapi diff -Nru evolution-data-server-3.18.3/debian/libedataserverui-1.2-1.install evolution-data-server-3.18.3/debian/libedataserverui-1.2-1.install --- evolution-data-server-3.18.3/debian/libedataserverui-1.2-1.install 2015-12-16 14:55:01.000000000 +0100 +++ evolution-data-server-3.18.3/debian/libedataserverui-1.2-1.install 2016-01-27 23:36:24.000000000 +0100 @@ -1 +1 @@ -usr/lib/libedataserverui-1.2.so.* +usr/lib/*/libedataserverui-1.2.so.* diff -Nru evolution-data-server-3.18.3/debian/libedataserverui1.2-dev.install evolution-data-server-3.18.3/debian/libedataserverui1.2-dev.install --- evolution-data-server-3.18.3/debian/libedataserverui1.2-dev.install 2015-12-16 14:55:01.000000000 +0100 +++ evolution-data-server-3.18.3/debian/libedataserverui1.2-dev.install 2016-01-27 23:36:31.000000000 +0100 @@ -1,3 +1,3 @@ -usr/lib/pkgconfig/libedataserverui-1.2.pc -usr/lib/libedataserverui-1.2.so +usr/lib/*/pkgconfig/libedataserverui-1.2.pc +usr/lib/*/libedataserverui-1.2.so usr/include/evolution-data-server/libedataserverui diff -Nru evolution-data-server-3.18.3/debian/rules evolution-data-server-3.18.3/debian/rules --- evolution-data-server-3.18.3/debian/rules 2015-12-16 14:55:01.000000000 +0100 +++ evolution-data-server-3.18.3/debian/rules 2016-01-28 00:53:41.000000000 +0100 @@ -52,6 +52,16 @@ DEB_DH_MAKESHLIBS_ARGS_evolution-data-server += -Xusr/lib/evolution-data-server/ DEB_FIXPERMS_EXCLUDE_evolution-data-server += usr/lib/evolution/camel-lock-helper* +# don't configure with --libdir, but move the files manually, because +# /usr/lib/evolution-data-server must not change. +common-install-impl:: + mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig + mv debian/tmp/usr/lib/*.so debian/tmp/usr/lib/*.so.* debian/tmp/usr/lib/girepository-1.0 \ + debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) + mv debian/tmp/usr/lib/pkgconfig/lib* debian/tmp/usr/lib/pkgconfig/camel* \ + debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig + + binary-install/evolution-data-server:: chgrp mail $(CURDIR)/debian/evolution-data-server/usr/lib/evolution/camel-lock-helper* chmod g+s $(CURDIR)/debian/evolution-data-server/usr/lib/evolution/camel-lock-helper*