[pkg-horde] patch system for pkg-horde team

[Gregory Colpart]

Hi,

On Mon, Jul 24, 2006 at 06:51:23AM +0200, Ola Lundqvist wrote:
> 
> On Mon, Jul 24, 2006 at 01:21:08AM +0200, Gregory Colpart wrote:
> > On Sun, Jul 23, 2006 at 06:08:43PM +0200, Ola Lundqvist wrote:
> > > > 
> > > > It would be nice that all horde packages use same patch
> > > > maintenance system. I think it could be useful to import CVS
> > > > patches in last stable release or hack little debian patches.
> > > > For this little patches, I prefer dpatch. And you ? 
> > > 
> > > We have a superb patching system in tla itself.
> > 
> > I misunderstand you (or you misunderstand me).
> It seems like you have misunderstood me (or?), or maybe more correct,
> what the merge in tla can do for you.
> 
> > For example, if we want fix #379190 in Horde3 3.1.2-1 to have a
> > clean version for Etch and not waiting next upstream release, we
> > could add patch in "debianization". We can use different methods:
> > patch in debian/rules, dpatch, cdbs, quilt...
> Yes, we could use any of these, but it is much more simple to just
> patch the upstream tree and build with that. Tla can manage to
> handle that kind of merges.
> 
> > See package "horde-sam", there are two patches in
> > "debian/patches/".
> 
> The method that I describe is just as simple as the normal
> diff file in the source packages. You can patch any file, not just
> the ones in the debian/ dir.
> 
> I know that many people prefer to use dpatch, cdbs, etc, etc but
> personally I find it much easier to siply use the built in
> mechanism in dpkg, and in this case with merge support from tla.

I reactive this thread to be sure to understand.

Here is what I understand:

- If I want hack/import a patch for Horde:
  $ tla get *--sid--* foo
  $ cd foo
  <hack/import the patch>
  $ tla commit
  And then, when I build package, patch is in .diff.gz

- When I import new upstream sources, "tla star-merge" could fail
  and patch must be adapted/removed.


Say me if this is your recommended method for patch system
or if I misunderstand you.

Regards,
-- 
Gregory Colpart <reg at evolix.fr>  GnuPG:1024D/C1027A0E
Evolix - Informatique et Logiciels Libres http://www.evolix.fr/