diff -Nru debtags-1.8.0+git20120213ubuntu1/configure.ac debtags-1.9+git20120302/configure.ac
--- debtags-1.8.0+git20120213ubuntu1/configure.ac	2012-01-20 12:56:09.000000000 +0000
+++ debtags-1.9+git20120302/configure.ac	2012-03-02 10:14:10.000000000 +0000
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(debtags, 1.8, [enrico@debian.org])
+AC_INIT(debtags, 1.9, [enrico@debian.org])
 AC_CONFIG_SRCDIR([configure.ac])
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([foreign])
diff -Nru debtags-1.8.0+git20120213ubuntu1/debian/changelog debtags-1.9+git20120302/debian/changelog
--- debtags-1.8.0+git20120213ubuntu1/debian/changelog	2012-02-13 09:34:09.000000000 +0000
+++ debtags-1.9+git20120302/debian/changelog	2012-03-02 10:18:42.000000000 +0000
@@ -1,3 +1,25 @@
+debtags (1.9+git20120302) precise; urgency=low
+
+  * new git snapshot that fixes support for hardware::{digicam,webcam}
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 02 Mar 2012 11:18:18 +0100
+
+debtags (1.9) unstable; urgency=low
+
+  [ Michael Vogt ]
+  * debtagshw/*:
+    - add support for matching a given hardware:: tag against the
+      current running architecture
+  * debian/control:
+    - add python-setuptools build-dependency
+
+  [ Enrico Zini ]
+  * debtags-fetch: cleanup stray commas from tag lines.
+    Closes: #660180, #660222
+  * A 3-part version scheme isn't really needed: moving to major.minor
+
+ -- Enrico Zini <enrico@debian.org>  Fri, 17 Feb 2012 15:34:45 +0100
+
 debtags (1.8.0+git20120213ubuntu1) precise; urgency=low
 
   * updated git snapshot:
diff -Nru debtags-1.8.0+git20120213ubuntu1/debtags-fetch debtags-1.9+git20120302/debtags-fetch
--- debtags-1.8.0+git20120213ubuntu1/debtags-fetch	2012-01-20 12:56:09.000000000 +0000
+++ debtags-1.9+git20120302/debtags-fetch	2012-03-02 10:14:10.000000000 +0000
@@ -100,7 +100,7 @@
                     res.append(pfx + sfx)
             else:
                 res.append(tag)
-        return ", ".join(res)
+        return ", ".join(x.strip(",") for x in res)
 
     def __init__(self, dst):
         self.dst = os.path.join(OUTPUTDIR, dst)
diff -Nru debtags-1.8.0+git20120213ubuntu1/debtagshw/debtagshw.py debtags-1.9+git20120302/debtagshw/debtagshw.py
--- debtags-1.8.0+git20120213ubuntu1/debtagshw/debtagshw.py	2012-02-13 09:32:22.000000000 +0000
+++ debtags-1.9+git20120302/debtagshw/debtagshw.py	2012-03-02 10:14:10.000000000 +0000
@@ -22,7 +22,7 @@
 import logging
 LOG=logging.getLogger(__name__)
 
-# get the detecotors lib
+# get the detectors lib
 import detectors
 
 from enums import HardwareSupported
diff -Nru debtags-1.8.0+git20120213ubuntu1/debtagshw/detectors.py debtags-1.9+git20120302/debtagshw/detectors.py
--- debtags-1.8.0+git20120213ubuntu1/debtagshw/detectors.py	2012-02-13 09:32:22.000000000 +0000
+++ debtags-1.9+git20120302/debtagshw/detectors.py	2012-03-02 10:14:10.000000000 +0000
@@ -98,8 +98,21 @@
         "hardware::input:mouse" : "ID_INPUT_MOUSE",
         "hardware::input:keyboard" : "ID_INPUT_KEYBOARD",
         "hardware::input:joystick" : "ID_INPUT_JOYSTICK",
+        # digicam
+        "hardware::digicam" : "ID_GPHOTO2",
     }
 
+    DEBTAG_TO_ID_TYPE = {
+        # webcam
+        'hardware::webcam' : 'video',
+        # floppy
+        'hardware::floppy' : 'floppy',
+    }
+
+    # all tags this class knows about
+    SUPPORTED_TAGS = DEBTAG_TO_UDEV_PROPERTY.keys() + \
+                      DEBTAG_TO_ID_TYPE.keys()
+
     def __init__(self):
         if HAVE_GUDEV:
             self._uc = GUdev.Client()
@@ -124,10 +137,16 @@
                     return HardwareSupported.YES
                 else:
                     return HardwareSupported.NO
+            # use ID_TYPE
+            if device.has_property("ID_TYPE"):
+                id_type = device.get_property("ID_TYPE")
+                if (tag in self.DEBTAG_TO_ID_TYPE and
+                    id_type == self.DEBTAG_TO_ID_TYPE[tag]):
+                    return HardwareSupported.YES
         return HardwareSupported.UNKNOWN
 
     def get_supported_tags(self):
-        return self.DEBTAG_TO_UDEV_PROPERTY.keys()
+        return self.SUPPORTED_TAGS
 
 class DetectorCmdline(Detector):
     """ detect hardware using cmdline helpers """
Binary files /tmp/jn4NPxbuN2/debtags-1.8.0+git20120213ubuntu1/tags-current.gz and /tmp/cCsC4NO1w9/debtags-1.9+git20120302/tags-current.gz differ
diff -Nru debtags-1.8.0+git20120213ubuntu1/update_files debtags-1.9+git20120302/update_files
--- debtags-1.8.0+git20120213ubuntu1/update_files	2012-01-20 12:56:09.000000000 +0000
+++ debtags-1.9+git20120302/update_files	2012-03-02 10:14:10.000000000 +0000
@@ -20,9 +20,26 @@
 
 trap commit_or_rollback EXIT
 
+cat_tags() {
+	if [ $USER = enrico ] && [ -f ../tagdb/tags ]
+	then
+		cat ../tagdb/tags
+	else
+		svn cat svn://svn.debian.org/debtags/tagdb/tags
+	fi
+}
+
+cat_voc() {
+	if [ $USER = enrico ] && [ -f ../vocabulary/debian-packages ]
+	then
+		cat ../vocabulary/debian-packages
+	else
+		svn cat svn://svn.debian.org/debtags/vocabulary/trunk/debian-packages
+	fi
+}
 
 echo -n "Exporting a new version of the reviewed tags from SVN... "
-if svn cat svn://svn.debian.org/debtags/tagdb/tags | tagcoll copy | gzip -9 > tags-current.gz.tmp
+if cat_tags | tagcoll copy | gzip -9 > tags-current.gz.tmp
 then
 	echo "ok."
 else
@@ -32,7 +49,7 @@
 fi
 
 echo -n "Exporting a new version of the vocabulary data from SVN... "
-if svn cat svn://svn.debian.org/debtags/vocabulary/trunk/debian-packages > vocabulary1.tmp
+if cat_voc > vocabulary1.tmp
 then
 	echo "ok."
 else