Source: colord
Version: 1.2.11-1
Severity: important
Tags: patch
Hi,
colord 1.2.11-1 fails to build on kFreeBSD [1][2] and Hurd [3].
The attached patch fixes & improves the non-Linux build of colord:
* argyll now is Linux-only, so restrict the argyll B-D-I to linux-any
* restrict colord-sensor-argyll as linux-any: while the plugin seems
built, it depends on argyll which is Linux-only
* deal with less files installed in colord: the current colord.install
is renamed to colord.install.linux (hence used only on linux-any),
and put in colord.install only the files actually installed on
non-Linux architectures. This is not the only solution to do this;
alternative approaches involve using dh-exec, or grepping things away
from .install files, etc
* move the --disable-print-profiles not just for Hurd but for any
non-Linux architecture, since --enable-print-profiles requires argyll
which is Linux-only
[1]
https://buildd.debian.org/status/fetch.php?pkg=colord&arch=kfreebsd-amd64&ver=1.2.11-1&stamp=1439467612
[2]
https://buildd.debian.org/status/fetch.php?pkg=colord&arch=kfreebsd-i386&ver=1.2.11-1&stamp=1439469246
[3]
https://buildd.debian.org/status/fetch.php?pkg=colord&arch=hurd-i386&ver=1.2.11-1&stamp=1439468797
Thanks,
--
Pino
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Build-Depends:
bash-completion,
dh-systemd (>= 1.4),
Build-Depends-Indep:
- argyll,
+ argyll [linux-any],
Standards-Version: 3.9.5
XS-Testsuite: autopkgtest
Section: graphics
@@ -95,7 +95,7 @@ Description: system service to manage de
This package contains the dbus-activated colord system daemon.
Package: colord-sensor-argyll
-Architecture: any
+Architecture: linux-any
Depends:
${shlibs:Depends},
${misc:Depends},
--- a/debian/colord.install
+++ b/debian/colord.install
@@ -2,12 +2,7 @@ debian/tmp/etc/
lib/udev/rules.d/
usr/bin/
usr/lib/colord*
-usr/lib/*/colord-plugins
-usr/lib/*/colord-sensors/lib*-private.so
-usr/lib/*/colord-sensors/libcolord_sensor_colorhug.so
-usr/lib/*/colord-sensors/libcolord_sensor_dtp94.so
usr/lib/*/colord-sensors/libcolord_sensor_dummy.so
-usr/lib/*/colord-sensors/libcolord_sensor_huey.so
usr/share/glib-2.0/schemas
usr/share/dbus-1
usr/share/man
--- /dev/null
+++ b/debian/colord.install.linux
@@ -0,0 +1,16 @@
+debian/tmp/etc/
+lib/udev/rules.d/
+usr/bin/
+usr/lib/colord*
+usr/lib/*/colord-plugins
+usr/lib/*/colord-sensors/lib*-private.so
+usr/lib/*/colord-sensors/libcolord_sensor_colorhug.so
+usr/lib/*/colord-sensors/libcolord_sensor_dtp94.so
+usr/lib/*/colord-sensors/libcolord_sensor_dummy.so
+usr/lib/*/colord-sensors/libcolord_sensor_huey.so
+usr/share/glib-2.0/schemas
+usr/share/dbus-1
+usr/share/man
+usr/share/polkit-1
+usr/share/bash-completion
+lib/systemd/system/*.service
--- a/debian/rules
+++ b/debian/rules
@@ -36,14 +36,10 @@ confflags += SPOTREAD=/usr/bin/spotread
ifeq ($(DEB_HOST_ARCH_OS),linux)
confflags += --enable-sane --enable-gusb --enable-systemd-login --enable-udev
+ indep_flags = --enable-print-profiles
else
confflags += --disable-sane --disable-gusb --disable-systemd-login --disable-udev
-endif
-
-ifeq ($(DEB_HOST_ARCH_OS),hurd)
indep_flags = --disable-print-profiles
-else
- indep_flags = --enable-print-profiles
endif
override_dh_auto_configure-arch:
