[velocity/f21] (2 commits) ...Update to current packaging guidelines

[Peter Robinson]

Summary of changes:

  0e0a82b... Require hsqldb-lib instead of hsqldb (*)
  b46342c... Update to current packaging guidelines (*)

(*) This commit already existed in another branch; no separate mail sent