I was thinking something similar to what Frank proposed. In Frank's example, you could make debugtype a record and make it really easy to add signals to the record as needed. You could then at the top level include a generate statement based on a boolean in the package file to compile with or without the debug logic. This would allow you to not have to strip out the debug code when you get it working. In the package file, you would just have to change a generic to compile with or without the added debug logic. The generate for debug would drive the outputs based on the desired signals, and the generate without debug would drive those outputs to '0' or '1' and the logic would get optimized away.