[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#836453: marked as done (xserver-xorg-dev: please move xorg-server.pc to a multiarch path)

Your message dated Fri, 26 Jan 2018 15:33:00 +0000
with message-id <E1ef5zw-0009sL-NS@fasolo.debian.org>
and subject line Bug#836453: fixed in xorg-server 2:1.19.6-1
has caused the Debian Bug report #836453,
regarding xserver-xorg-dev: please move xorg-server.pc to a multiarch path
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
836453: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=836453
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: xserver-xorg-dev
Version: 2:1.18.4-1
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap
Control: affects -1 + src:xf86-input-wacom src:xserver-xorg-input-evdev src:xserver-xorg-input-libinput src:xserver-xorg-input-mouse src:xserver-xorg-input-synaptics src:xserver-xorg-video-amdgpu src:xserver-xorg-video-ati src:xserver-xorg-video-cirrus src:xserver-xorg-video-fbdev src:xserver-xorg-video-mach64 src:xserver-xorg-video-mga src:xserver-xorg-video-neomagic src:xserver-xorg-video-nouveau src:xserver-xorg-video-r128 src:xserver-xorg-video-savage src:xserver-xorg-video-siliconmotion src:xserver-xorg-video-sisusb src:xserver-xorg-video-tdfx src:xserver-xorg-video-trident

Hi,

xserver-xorg-dev makes the aforementioned affected packages fail to
cross build from source, because pkg-config does not consider[1]
/usr/lib/pkgconfig/ during cross compilation. In contrast, it always
considers /usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig, so moving
xorg-server.pc there will make both native and cross builds happy.

The requested change is implemented in the attached patch for your
convenience.

Helmut

[1] This choice was discusses with pkg-config maintainer Tollef Fog Heen
    and the conclusion was that packages should move their .pc files.

diff -u xorg-server-1.18.4/debian/changelog xorg-server-1.18.4/debian/changelog
--- xorg-server-1.18.4/debian/changelog
+++ xorg-server-1.18.4/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.18.4-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install xserver-xorg.pc into a multiarch path. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de>  Sat, 03 Sep 2016 09:02:57 +0200
+
 xorg-server (2:1.18.4-1) unstable; urgency=medium
 
   * New upstream stable release.
diff -u xorg-server-1.18.4/debian/rules xorg-server-1.18.4/debian/rules
--- xorg-server-1.18.4/debian/rules
+++ xorg-server-1.18.4/debian/rules
@@ -21,10 +21,7 @@
 	MAKEFLAGS += -j$(NUMJOBS)
 endif
 
-DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_ARCH_OS   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+include /usr/share/dpkg/architecture.mk
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 	confflags += --build=$(DEB_HOST_GNU_TYPE)
 else
@@ -396,6 +393,8 @@
 	install -m 644 debian/local/64-xorg-xkb.rules debian/xserver-xorg-core-udeb/lib/udev/rules.d
 endif
 endif
+	$(INSTALL) -m 755 -d debian/xserver-xorg-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
+	$(INSTALL) -m 644 debian/tmp/main/usr/lib/pkgconfig/xorg-server.pc debian/xserver-xorg-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/
 	dh_installdebconf -s
 	dh_installman -s
 	dh_link -s
diff -u xorg-server-1.18.4/debian/xserver-xorg-dev.install xorg-server-1.18.4/debian/xserver-xorg-dev.install
--- xorg-server-1.18.4/debian/xserver-xorg-dev.install
+++ xorg-server-1.18.4/debian/xserver-xorg-dev.install
@@ -1,5 +1,4 @@
 main/usr/include/xorg	usr/include
-main/usr/lib/pkgconfig/xorg-server.pc	usr/lib/pkgconfig
 main/usr/share/aclocal	usr/share
 
 ../../debian/local/dh_xsf_substvars usr/bin

--- End Message ---
--- Begin Message --- 
Source: xorg-server
Source-Version: 2:1.19.6-1

We believe that the bug you reported is fixed in the latest version of
xorg-server, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 836453@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Timo Aaltonen <tjaalton@debian.org> (supplier of updated xorg-server package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Thu, 18 Jan 2018 14:11:18 +0200
Source: xorg-server
Binary: xserver-xorg-core xserver-xorg-core-udeb xserver-xorg-dev xdmx xdmx-tools xnest xvfb xserver-xephyr xserver-common xorg-server-source xwayland xserver-xorg-legacy
Architecture: source
Version: 2:1.19.6-1
Distribution: unstable
Urgency: medium
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Changed-By: Timo Aaltonen <tjaalton@debian.org>
Description:
 xdmx       - distributed multihead X server
 xdmx-tools - Distributed Multihead X tools
 xnest      - Nested X server
 xorg-server-source - Xorg X server - source files
 xserver-common - common files used by various X servers
 xserver-xephyr - nested X server
 xserver-xorg-core - Xorg X server - core server
 xserver-xorg-core-udeb - Xorg X server - core server (udeb)
 xserver-xorg-dev - Xorg X server - development files
 xserver-xorg-legacy - setuid root Xorg server wrapper
 xvfb       - Virtual Framebuffer 'fake' X server
 xwayland   - Xwayland X server
Closes: 836453
Changes:
 xorg-server (2:1.19.6-1) unstable; urgency=medium
 .
   [ Emilio Pozuelo Monfort ]
   * Use --sourcedir=debian/tmp/udeb for the udeb package and
     --sourcedir=debian/tmp/main for the rest, so that we don't have
     to specify where the files come from as well as where they should
     be installed to in *.install.
   * Install xorg-server.pc to a multiarch location. Based on a patch
     from Helmut Grohne. Closes: #836453.
   * Move xserver-xorg-legacy to priority optional, as priority extra is
     deprecated.
   * Make calculation of xserver-xorg-core's xinput/video ABI provides more
     robust.
   * Use ${prefix} rather than ${libexecdir} for --with-module-dir, as the
     module dir ends up in the pkg-config file, where libexecdir is not
     defined.
 .
   [ Timo Aaltonen ]
   * New upstream release.
   * 07-glx-do-not-pick-srgb-config-for-32bit-rgba-visual.diff: Add a
     patch from upstream to fix potential issues with mesa git.
Checksums-Sha1:
 ac9d0806ad8a51e0b28c57c6e35d11ea633503b1 4804 xorg-server_1.19.6-1.dsc
 f58b318bd17fe3af41ebf32d5a22da5dc667009e 8402365 xorg-server_1.19.6.orig.tar.gz
 1de986f08ea6604df6a6d1fc88c7bdc2e22190dd 140462 xorg-server_1.19.6-1.diff.gz
Checksums-Sha256:
 8f295207fbbb9e5ce8b08dda92bfd9956141fe10803a06a46f48db7e00556165 4804 xorg-server_1.19.6-1.dsc
 3c0e4a354a6b1d5d357b121357946ee8ffdb2f52158b2e63e105be9cef013168 8402365 xorg-server_1.19.6.orig.tar.gz
 89f9bd654e70fc2232441789fd06bc87ea23e1e17796750fe9f0ed6f18a45f19 140462 xorg-server_1.19.6-1.diff.gz
Files:
 c3de2f0477d769dd4805e8eb675c04ef 4804 x11 optional xorg-server_1.19.6-1.dsc
 ada013becbe850b92e2a8433dfb2cfe6 8402365 x11 optional xorg-server_1.19.6.orig.tar.gz
 a678fea60e22b25942e749aebeb6085e 140462 x11 optional xorg-server_1.19.6-1.diff.gz

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAEBCAAGBQJaazvXAAoJEMtwMWWoiYTc87wQAJKVVQyDVme56Xgt6UtZsEgt
429IXhAlkHY1y2HJ7YQuJz5cMxb/gj7PHTuwrJ0zwr2uND/pdYA15EW5D2ZLcDD7
hNBl1Yt3862JWSFDxuxmcItk5hjH3YXUIeVf4o/TxwCgNXnQNyTKXpZHFc9Exfg+
0jxtEJdyPmA2+4boYdAp65FUjo18v6Jig6VCUoxMSj6zZ8JyH//I9xpZlLBXE4+S
Qvt5nf3EIQJwpJPuajoma7q/CYbzKVrKOwt8qdqHxsLsdroPduCUhR13VApHOvUf
HQ2tge/FY6MehoTx4eyLSuCb3zNGvEKfSgayVo6CZykreqfZ2lVO2UOIptyytMWS
ljltB5i5cj3PUI9zF1AGFFcFkxPE1EPJU2OG0AYk+cDo4Jh3gf2qFEcWcAyA+Bcq
RfcuL+IknBrtzlYBj9rHIsDJz2uOaXcIUPfXuS34UwEBqLnlU8ngUCbkJRdFR7NF
+tWOYlGLUoHlLWjDpXTys4ln3MjM8pIIQLQ182noidalvB/27Qh8/nLH/v2aheX8
mJuJZPMRxMxxsvhgaLBOpapBhuIAQbhSQcrdNG9+Rshgih1p4Hf/yCHcLm2E5bRc
mBwX+YH72D2fKbeCO7q8FHTy6YQAXtHh/06AJ7yJUWOTBwIU5p3nYXyhUYMJK+eA
E0D6/Zb5xUwMXpokzqUF
=a6yP
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: