[php-maint] svn -> git, redux

sean finney seanius at debian.org
Wed Apr 8 22:49:38 UTC 2009

hey mark with a k,

On Wed, Apr 08, 2009 at 02:11:51PM -0400, Mark A. Hershberger wrote:
> > i'm going to take a look at marc's git repo again in the next few
> > days,
> FWIW: Mark with a K, not a c.

d'oh.  sorry about that :)

> > and see if i can add on the missing stuff (branches and tags for security
> > updates, mostly).  i'll also double-check some of the existing git tags
> > for correctness.  assuming there aren't any problems i can push into
> > our empty git repo shortly after that.
> Excellent.

unfortunately, it seems like some of the tags might not be matching up...
i hacked out a script (it was a bit in a hurry so i could be mistaken) which
runs against a branches/tags/trunk checkout of /svn/pkg-php/php5 and diff
seems to find differences on some of them.  i'll check back in on this
tomorrow with more substantial info (or a mea culpa for sounding the alarm
if it turns out my script was buggy).

also, some of the tags from svn aren't present, for the versions which
are off the main branch.  this is less of a big deal, and i'll manually
graft them together on to -etch/-lenny/etc branches.

> I did start work on 5.3.0 packaging in the git repo.  I modified Suhosin
> patch to get it to work in lieu of an official Suhosin patch and touched
> up a few other patches.

okay.  if you don't feel comfortable with any of the changes in the suhosin
patch you could also feel free to temporarily disable it (just remove it
from debian/patches/series), since this is an experimental package and
everything :)

> Is there a guide to updating patches somewhere?  I just found the
> problem and updated the patch but left the ones that worked alone.

generally after a new release i do something like:

while quilt push; do quilt refresh; done 

which massages all of the offsets/etc in the patches.  patches that fail
will break that loop, letting you fix it and then continue.  quilt pop -a
when you're done and you're back to where you started.

often the breakage is because they were backported patches later imported
upstream, and usually quilt will give you a hint about this (saying
something about patches being reverse-appliable).  in other cases... it
sucks a bit more and i typically end up editing files and running quilt
refresh, or sometimes just hacking the patches directly if i can tell
what's going on.

anyway, hope that's helpful!

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-php-maint/attachments/20090409/6dfa8b83/attachment.pgp>

More information about the pkg-php-maint mailing list