Conflicts: resources/install/build-debian.xml resources/install/debian/copyright resources/install/debian/patches/sdes4j.patch