[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Patching the upstream sources, and the debian diff



Hi.

I've been working this days in Debian packaging, and it was the first time I 
needed to patch the upstream sources, more especifically, the Makefile.am.

I studied the patching stuff from other packages, and then, added the relevant 
lines to my debian/rules, and the patches to debian/patches/. I've been 
always building the source and the binary with dpkg-buildpackage, and I was 
happy with that. But this time, since before the dpkg-source -b, the clean 
target is called, the patches are unapplied, and automake is called again.

This generates different Makefile.in's from the ones that upstream provides, 
because upstream used automake 1.7.6 and unstable now haves 1.7.9 (in 
automake1.7). This differences are now added to the diff.gz, but this doesn't 
sounds to me the proper way.

What I did to create this package, was to add stuff inside debian/, so I tried 
to: extract the original sources, add the debian directory, and inmediately, 
run dpkg-source -b, before doing anything that calls the clean target of 
debian/rules. This created a diff with the contents I expected, and instead 
of 15K, it was just 5K.

However, looking at other packages, I see huge diffs with more than 300K, and 
including lots of generated stuff. So here are my questions:

- Is there a preferred way of generating the source and/or the binary package?
- Are not correct the packages that include generated files in the diff?

Thanks a lot.

PS: Grrr, and linda says it's a warning to Build-Depend on automake*, when 
clearly many packages have to regenerate their Makefile.in.

-- 
Alex (a.k.a. suy) - GPG ID 0x0B8B0BC2
http://darkshines.net/ - Jabber ID: suy@bulmalug.net



Reply to: