quilt removed
conditional debian rules
merged changes from next