[Pkg-shadow-devel] CVS sid: debian/patches do not unapply cleanly

[Martin Quinson]

--0vzXIDBeUiKkjNJl
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Wed, Apr 27, 2005 at 06:55:14AM +0200, Christian Perrier wrote:
> Quoting Martin Quinson (martin.quinson@loria.fr):
>=20
> > I still don't understand why you use dpatch instead of quilt. It's not
>=20
> Because I am a non standard geek and first try to get the job done
> without really nitpicking about the bleeding-edge tool which allows to
> get it done smarter..:-)
>=20
> This is what made me use OpenOffice spreadsheets to track down French
> l10n until someone wrote us a very nice tool to do it better and
> convinced me to use it..Remember?

Yeah, I remember. I keep cleaning up your hacks since years ;)
And actually, it makes much more fun than working, explaining that I'll
do this mail today :-D

> But, well, any contribution to make us switch to a smarter tool is
> welcomed, as long as the switch is easy.
>=20
> But, this should not interfere with Nicolas work on 0xx patches to
> sort them out between "things already applied upstream", "things that
> should be applied upstream" and "things which should remain Debian specif=
i".
>=20
> At this very moment, we have something that works. Indeed, it didn't
> work well mostly because I first misused dpatch...
>=20
> So, feel free to switch our sid directory to quilt in a parellel
> debian/patches-quilt directory....and keep it synced with
> debian/patches until we completely decide to switch over to quilt and
> drop dpatch. Next working topic for your next rainy holidays, my
> friend?=A0:-)

Well, you'll have to search another toy for me to play with. Switching to
quilt is as easy as:

ln -s debian/patches .
cd patches
ln -s 00list series

Another approach is to export QUILT_PATCHES=3Ddebian/patches and then rename
00list to series, but you'll have to export this in all your terminals (or
change your ~/.quiltrc)

Afterward, you may want to read the quilt pdf introduction for a gentle
introduction or its man page for a quite comprehensive reference.


[Your game with 0xx patches would be easier if the patching tools had an
 include feature for within the series (or 00list) file. I'll think about it
 for quilt... You may have found my next toy. Too bad that my vacations are
 done]=20


It's enough to get the comfort of quilt for patch editing, but if you want
to rip dpatch out completelly, you need to change=20
   include /usr/share/dpatch/dpatch.make
in debian/rules to something else which does not exist yet. There is a
/usr/share/cdbs/1/rules/patchsys-quilt.mk, but it's a bit cdbs dependent.
Switching to cdbs would be good too, but it's not very high in my TODO...
I'll write a simple makefile not depending on cdbs, I guess.


Bye, Mt.

--0vzXIDBeUiKkjNJl
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)

iD8DBQFCb1miIiC/MeFF8zQRApmfAJ9+FOhk4Dbuu3D5XudJJerLfrnpAQCgqvBy
LO4Wk0cAajvRccuiNlvP+6s=
=3Rbk
-----END PGP SIGNATURE-----

--0vzXIDBeUiKkjNJl--