Handle inclusion properly

Handle inclusion properly

Make sure we handle the case of a filter similar to:

+/usr/share/doc/pkg-config/changelog.Debian.gz
-/usr/share/doc/pkg-config*

correctly, where /usr/share/doc/pkg-config needs to be reincluded as a
file below it will be included.

Note that you can end up with empty directories this way if you have a
filter like:

+/usr/share/doc/pkg-config/NoSuchFileOrDirectory
-/usr/share/doc/pkg-config*

even though the deb does not ship
/usr/share/doc/pkg-config/NoSuchFileOrDirectory.  I believe this is
not easily fixable without at least a performance hit.