Am 12.09.2013 13:04, schrieb Michael Biebl: > found 717503 1.0.2-1 > thanks > > Hi, > > Am 30.07.2013 11:06, schrieb Debian Bug Tracking System: >> This is an automatic notification regarding your Bug report >> which was filed against the colord package: >> >> #717503: Test for usb-db before using it / replaced by hwdb in newer udev >> releases >> >> It has been closed by Christopher James Halse Rogers <[email protected]>. > > So I noticed today, that I still get those error messages on startup > about the missing usb-db. Yet my patch is applied properly so I was > wondering what's going wrong. > Seems I accidentally patched the wrong file. Should have patched > rules/69-cd-sensors.rules.in and not > rules/69-cd-sensors.rules > > Please update debian/patches/test-for-usb-db-before-running-it.patch > accordingly or let me know, and I'll send you an updated patch.
Actually, simply updating test-for-usb-db-before-running-it.patch and patching 69-cd-sensors.rules.in won't help. We also need to make sure 69-cd-sensors.rules is removed and recreated. The attached patch removes rules/69-cd-sensors.rules vi debian/clean and should do the trick. Please review and verify that after you have built the package, the result rules file has the change applied. Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
diff -Nru colord-1.0.2/debian/changelog colord-1.0.2/debian/changelog --- colord-1.0.2/debian/changelog 2013-07-30 09:46:08.000000000 +0200 +++ colord-1.0.2/debian/changelog 2013-09-12 13:17:42.000000000 +0200 @@ -1,3 +1,11 @@ +colord (1.0.2-1.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Patch the correct 69-cd-sensors.rules.in file and remove + 69-cd-sensors.rules as part of the clean process, so it is regenerated. + + -- Michael Biebl <[email protected]> Thu, 12 Sep 2013 13:16:57 +0200 + colord (1.0.2-1) unstable; urgency=low * New upstream stable release diff -Nru colord-1.0.2/debian/clean colord-1.0.2/debian/clean --- colord-1.0.2/debian/clean 1970-01-01 01:00:00.000000000 +0100 +++ colord-1.0.2/debian/clean 2013-09-12 13:16:48.000000000 +0200 @@ -0,0 +1 @@ +src/69-cd-sensors.rules diff -Nru colord-1.0.2/debian/patches/test-for-usb-db-before-running-it.patch colord-1.0.2/debian/patches/test-for-usb-db-before-running-it.patch --- colord-1.0.2/debian/patches/test-for-usb-db-before-running-it.patch 2013-07-30 09:46:08.000000000 +0200 +++ colord-1.0.2/debian/patches/test-for-usb-db-before-running-it.patch 2013-09-12 13:16:44.000000000 +0200 @@ -10,11 +10,11 @@ rules/69-cd-sensors.rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/rules/69-cd-sensors.rules b/rules/69-cd-sensors.rules -index a955a63..5bc8cdb 100644 ---- a/rules/69-cd-sensors.rules -+++ b/rules/69-cd-sensors.rules -@@ -87,7 +87,7 @@ ATTRS{idVendor}=="273f", ATTRS{idProduct}=="1002", ENV{COLORD_SENSOR_KIND}="colo +Index: colord-1.0.2/rules/69-cd-sensors.rules.in +=================================================================== +--- colord-1.0.2.orig/rules/69-cd-sensors.rules.in 2013-09-12 13:16:42.592021952 +0200 ++++ colord-1.0.2/rules/69-cd-sensors.rules.in 2013-09-12 13:16:42.584021866 +0200 +@@ -87,7 +87,7 @@ # color calibration device ENV{COLORD_SENSOR_KIND}=="*?", ENV{COLOR_MEASUREMENT_DEVICE}="1" ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL}=="", IMPORT{program}="usb_id --export %p" @@ -22,7 +22,4 @@ +ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL_FROM_DATABASE}=="", TEST=="/lib/udev/usb-db", IMPORT{program}="usb-db %p" # Allow the daemon to access the color devices - ENV{COLORD_SENSOR_KIND}=="*?", GROUP="root" --- -1.8.3.2 - + ENV{COLORD_SENSOR_KIND}=="*?", GROUP="@daemon_user@"
signature.asc
Description: OpenPGP digital signature
