On 2012-04-29 19:46, Colin Tuckley wrote: | On 29/04/12 18:11, [email protected] wrote: | | > The dpatch patch management system has been deprecated for some time. The | > Lintian currently flags use of dpatch packages as an error. The new 3.0 | > packaging format is an improved version which, among other things, contains | > patch management built-in. For more information, see: | > | > http://wiki.debian.org/Projects/DebSrc3.0 | > | > I had some free time; see attached patch to migrate to new package | > format. Note that all files in debian/patches/* are canocalized to | > *.patch. | | This is good! | | > Note: | > | > In-line chnages to original sources were moved to path 05. | > Sources were restored to their original state. | | No! Please revert this - the upstream author does fixes by replacing | files, not by patching them so the package does the same resulting in | changed sources.
I think you misunderstood; let me epxlain. The 3.0 format requires that sources are in pristine state, then the debian/patches are applied on top of it. In this case at some point, the original files had been modified "in-place" an not made them separate patches. See [1]. I just moved the changes to patch 03. Everything is still as they were; sources will be in the state they were as in pevious release; they are just "patched cleanly". | > Let me know if there is anything that needs adjusting or if it is ok | > to upload this version in a NMU in case you are working on other | > issues needing attention. | | I will be working on this soon, but your changes to the 3.0 format | are good. So, yes, subject to my comment above please upload a NMU. Have a look at listing below. These were restoed and chnages put to patch 03. Thanks for quick reply, Jari [1] git diff upstream/2.6.1 debian/2.6.1-1.1 | lsdiff | grep -v debian a/Makefile.in a/client/Makefile.in a/client/gfx/AbsoluteB/Makefile.in a/client/gfx/Classic/Makefile.in a/client/gfx/Makefile.in a/client/gfx/Moiree/Makefile.in a/client/gfx/Oz/Makefile.in a/client/gui_theme/Makefile.in a/client/levels/Makefile.in a/client/sounds/Makefile.in a/common/Makefile.in a/config.h.in a/configure a/docs/Makefile.in a/game/Makefile.in a/gui/Makefile.in a/m4/Makefile.in a/server/Makefile.in a/server/levels/Makefile.in -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
