Comment 21 for bug 694413

Here is attached a new debdiff

1. Removed unnecessary changes in debian/changelog
2. Separate patch 23 and 24 from merge fields
3. updated description in d/changelog about d/control changes
4. updated description in d/changelog about adding d/watch
5. using patch from debian
6. used dep3 in patch as example files given by Ari
7. adding Closes: XXXX to d/changelog as a bug forwarded to debian