summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2014-09-26 17:18:16 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2014-09-26 17:18:16 +0200
commit9ea1c1bcfc91423217f3423355b90cfc200d6f2e (patch)
tree8ee9a3f737efbbb69acba9ff06acdb698629a014
parent800110ad9681e31a87fa2742c53ee8ef2541658f (diff)
Debian bug #762887
-rw-r--r--debian/argyll-doc.docs2
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/03_usb-db.diff15
-rw-r--r--debian/patches/120_usb-db_new.patch19
-rw-r--r--debian/patches/series2
-rwxr-xr-xdebian/rules2
6 files changed, 27 insertions, 20 deletions
diff --git a/debian/argyll-doc.docs b/debian/argyll-doc.docs
index 031ab94..f7d7b3b 100644
--- a/debian/argyll-doc.docs
+++ b/debian/argyll-doc.docs
@@ -1,2 +1,2 @@
-doc/*
+doc/*
Readme.txt
diff --git a/debian/changelog b/debian/changelog
index a3ec686..4c133d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,15 +11,18 @@ argyll (1.6.3-2) unstable; urgency=medium
- Add missing multiarch directories for libtiff and libjpeg
(Closes: #762772).
* New debain/patches/20_hurd_PATH_MAX.patch:
- - Add missing PATH_MAX for hurdi386 (Closes: #762774).
+ - Add missing PATH_MAX for hurd-i386 (Closes: #762774).
* debian/rules:
- Remove the move of the html docs into a subdirectory (Closes: #762771).
- Remove BUILTIN_TIFF=false from JAMCMDLINE to prevent
false negative tests for libtiff
- Remove "-A --link-doc=argyll-doc" from dh_installdocs (Closes: #762853).
* debian/*.(postinst|preinst|postrm):
- - replace dpkg-maintscript-helper dir_to_symlink to sysmlink_to_dir.
+ - replace dpkg-maintscript-helper dir_to_symlink to sysmlink_to_dir.
* Remove useless debian/argyll.examples
+ * Remove obsolete debian/patches/03_usb-db.diff.
+ * New debian/patches/120_usb-db_new.patch: (Closes: #762887)
+ - Instead of the obsolete usb-db use the builtin hwdb in the udev rules.
-- Jörg Frings-Fürst <debian@jff-webhosting.net> Thu, 25 Sep 2014 20:49:49 +0200
diff --git a/debian/patches/03_usb-db.diff b/debian/patches/03_usb-db.diff
deleted file mode 100644
index 7c437ba..0000000
--- a/debian/patches/03_usb-db.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Use hwdb builtin, instead of the obsolete usb-db in the udev rules.
-Author: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1200185
-Last-Update: 2014-09-14
-
---- a/usb/55-Argyll.rules
-+++ b/usb/55-Argyll.rules
-@@ -85,6 +85,6 @@ TEST=="/var/run/ConsoleKit/database", EN
- ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}!="*?", MODE="660", GROUP="plugdev"
-
- # Set ID_VENDOR and ID_MODEL acording to VID and PID
--TEST=="/lib/udev/usb-db", IMPORT{program}="usb-db %p"
-+TEST=="/lib/udev/usb-db", IMPORT{builtin}="hwdb --subsystem=usb"
-
- LABEL="argyll_rules_end"
diff --git a/debian/patches/120_usb-db_new.patch b/debian/patches/120_usb-db_new.patch
new file mode 100644
index 0000000..f826509
--- /dev/null
+++ b/debian/patches/120_usb-db_new.patch
@@ -0,0 +1,19 @@
+Description: Use hwdb builtin, instead of the obsolete usb-db in the udev rules.
+Author: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1200185
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=762887
+Last-Update: 2014-09-26
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/usb/55-Argyll.rules
+===================================================================
+--- trunk.orig/usb/55-Argyll.rules 2014-09-25 11:10:12.000000000 +0200
++++ trunk/usb/55-Argyll.rules 2014-09-26 14:08:21.067295380 +0200
+@@ -85,6 +85,6 @@
+ ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}!="*?", MODE="660", GROUP="plugdev"
+
+ # Set ID_VENDOR and ID_MODEL acording to VID and PID
+-TEST=="/lib/udev/usb-db", IMPORT{program}="usb-db %p"
++IMPORT{builtin}="hwdb --subsystem=usb"
+
+ LABEL="argyll_rules_end"
diff --git a/debian/patches/series b/debian/patches/series
index 928d441..42d8b08 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
110_dispwin_segfault.patch
100_spelling.patch
15_jam.patch
-03_usb-db.diff
20_hurd_PATH_MAX.patch
+120_usb-db_new.patch
diff --git a/debian/rules b/debian/rules
index 4c9853a..106e173 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ export DH_OPTIONS
NO_PROC=$(shell cat /proc/cpuinfo | grep processor | wc -l)
-JAMCMDLINE = -q -fJambase -j$(NO_PROC) -sPREFIX=/usr -sDESTDIR=$(CURDIR)/debian/tmp -sREFSUBDIR=share/color/argyll/ref
+JAMCMDLINE = -q -fJambase -j$(NO_PROC) -sPREFIX=/usr -sDESTDIR=$(CURDIR)/debian/tmp -sREFSUBDIR=share/color/argyll/ref
%:
dh $@