[pkg-wine-party] Bug#732968: [wine] 01/01: Move files in /usr/include to arch specific directory.

[Jens Reyer]

On 09/16/2015 01:53 AM, Jens Reyer wrote:
> This is an automated email from the git hooks/post-receive script.
> 
> jreyer-guest pushed a commit to branch master
> in repository wine.
> 
> commit c5d3c08e3069435c56606d5eeb2bb9308f449239
> Author: Jens Reyer <jre.winesim at gmail.com>
> Date:   Wed Sep 16 01:52:28 2015 +0200
> 
>     Move files in /usr/include to arch specific directory.
>     
>     Closes in wine (stable): #732968
>       libwine-dev: arch-dependent file in "Multi-Arch: same" package
>     
>     Debian Policy 9.1.1.4 allows /usr/include/triplet since version 3.9.6.0.
>     
>     A change of libwineVERSION-dev.install is not necessary.
> ---
>  debian/rules | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian/rules b/debian/rules
> index 7be5176..2976587 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -7,7 +7,7 @@ VERSION=$(shell dpkg-parsechangelog -S Source | sed s/wine//g)
>  
>  MANDIR=usr/share/man
>  DATDIR=usr/share/wine$(VERSION)
> -INCDIR=usr/include/wine$(VERSION)
> +INCDIR=usr/include/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/wine$(VERSION)
>  LIBDIR=usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/wine$(VERSION)
>  
>  # enable verbose build log
> 

Hi

Next to the commit message:

I built and installed the packages successfully. The following debdiff
was fine, only changes related to my previous commits:
  debdiff --move usr/include usr/include/x86_64-linux-gnu \
    libwine-development-dev_1.7.51-1_amd64.deb \
    libwine-development-dev_1.7.51-1.1_amd64.deb
The same debdiff with the -dbg packages has tons of differing files
which are named by their build id, so nothing to worry.
[btw, any way to get a amd64.changes, not only the source.changes?]

Because I don't use wine-dev at all, I' not totally sure if there could
be any sideeffects that I couldn't think of (I couldn't find anything
related in debian/). I guess and hope not.

Depending on future development, maybe backport this to wine (stable).
I'm not setting the bug to pending, because it is on another branch.

Greets
jre