diff arguments for building diff for dpkg-source
I am trying to build my own version of a package and I am trying to
reuse the existing package files since I don't know how to create them
myself.
Currently I am trying to build the diff for the source trio
(orig.tar.gz/diff.gz/.dsc). The problem is that using the standard diff
arguments diff -ruN doesn't work. dpkg-source -x returns an error for
the diff line (the first one in the file) and for the file dates that
diff adds.
What are the arguments for diff to build a diff file that dpkg-source -x
accepts?
The lines that cause the problem (example for one of the file in the
diff, each accurance causes an error):
diff -ruN dri-mach64-sid-2003.09.29.orig/debian/XF86Config-4.radeon
dri-mach64-sid-2003.09.29/debian/XF86Config-4.radeon
--- dri-mach64-sid-2003.09.29.orig/debian/XF86Config-4.radeon 1970-01-01
02:00:00.000000000 +0200
+++ dri-mach64-sid-2003.09.29/debian/XF86Config-4.radeon 2003-09-29
23:24:29.000000000 +0300
What dpkg-source expects is:
--- dri-mach64-sid-2003.09.29.orig/debian/XF86Config-4.radeon
+++ dri-mach64-sid-2003.09.29/debian/XF86Config-4.radeon
--
Micha Feigin
michf@math.tau.ac.il
Reply to: