--- merge.old   2007-05-28 17:13:58.000000000 +0900
+++ merge       2007-05-28 17:15:53.000000000 +0900
@@ -95,7 +95,8 @@
 function genpatches ()
 {
     echo "Creating patches"
-    debdiff $package\_$baseversion.dsc $package\_$ubuntuversion.dsc > \
+    debdiff $package\_$baseversion.dsc $package\_$ubuntuversion.dsc | \
+       sed '/^Maintainer:/d s/^XSBC-Original-Maintainer/Maintainer/' > \
         $package\_$ubuntuversion.patch
     debdiff $package\_$baseversion.dsc $package\_$debianversion.dsc > \
         $package\_$debianversion.patch