[svn-inject] Applying Debian modifications to trunk