Merge branch 'master' into fixes

* master:
  bee-remove: Remove --noop option..
  bee-remove: Use BEE_VERSION in usage
  bee-remove: Add bee-query wrapper function
  bee-remove: Cleanup: move bee-cache wrapper function to the top
  bee-remove: Add bee-list wrapper function
  bee-remove: Define BEE_LIBEXECDIR if not set
  bee-remove: Use function keyword for functions
  bee-remove: rerun bee-cache update after metadir was removed
  bee-cache-update: cleanup cachedir if metadir does not exist
  bee-cache: Fix print-conflicts
  bee-install: deprecate DEPENDENCIES file
  bee-cache/bee-dep: Remove old bee-dep
  bee-install: Change conflict output
  beesh: Show conflicts with installed packages
  bee-install: Print conflicts after installing/updating a package
  bee-cache: Add new command 'print-conflicts'
  bee-cache: Introduce new --fields option
  bee-cache: Add new command 'print-conflicting-files'
  bee-cache: Add new tool to manage inventory
  bee-cache-update: Preserve uniqueness of inventory entries..
  bee-cache-update: reverse sort INVENTORY
  bee-cache-update: Use CONTENT.bee-remove to create .bcr file
  bee-remove: Change suffix of renamed CONTENT file
  bee-remove: Only remove packages that have a CONTENT file
  devel: Bump version to 1.1.99
  bee-cache-inventory: set size of directories to zero
  Revert "gitignore: add bee-cache-inventory"
  bee-cache-inventory: Rewrite I/O file verification
  bee-cache-inventory: Always match va_start with va_end
  bee-cache-inventory: Minor cleanup
  bee-cache-inventory: Minor cleanup usage of goto
  bee-cache-inventory: Cleanup variable reuses
  bee-cache-inventory: Fix memory leak
  bee-install/bee-remove: Add INVENTORY support
  Revert "bci: Ignore ENOTDIR for regular files while scanning directories"
  bee-cache-update: rename pkg-inventory file instead of removing it
  Makefile: remove compiler and linker debug options
  bci: speed up filename creation
  bci: remove debug output
  bci: add sync
  bci: merge fopen_*fname(...) finctions to single fopenf(...) function
  bci: fix memory leak
  bci: fix error messages
  gitignore: add bee-cache-inventory
  bee-cache-inventory: output will bee stored in temporary files
  bee-cache-inventory: rewrite opening process
  bci: Ignore ENOTDIR for regular files while scanning directories
  bee-cache-update: Output more information about progress
  bee-cache-update: Remove missing packages from INVENTORY
  bee-cache-update: new helper to manage inventory
  Makefile: install bee-cache-inventory as helper in libexec dir
  bci: remove trailing slashes from pathname
  bci: cleanup 3 error messages
  bci: minor syntax cleanup
  bci: Detect corrupt CONTENT files bug
  bee-cache-inventory: Assert newline
  bee-cache-inventory: Save one alloc/free per input line
  bee-cache-inventory: Fix unchecked strdup()
  bee-cache-inventory: Minor syntax cleanup
  bee-cache-inventory: Optimize skipping special directories
  bee-cache-inventory: Add missing 'mode' in output
  bee-cache-inventory: Replace extract macro with inline function
  bee-cache-inventory: new tool to convert CONTENT file to inventory structure
bee-cache-update: Fix missing return after cachedir cleanup
Merge branch 'fixes'

* fixes:
  bee-cache-update: Fix missing return after cachedir cleanup