Hmm... I'm actually quite familiar with CVS (we use it extensively at work) So, the idea would be that I'd keep the pristine sources in a branch, apply my changes in a 'version' and maintain the debian/ stuff in another branch? Sounds good, but I've usually just made my changes, made a diff, and patched the source with the diff and the debian/ stuff. I suppose as I maintain more complex changes, it might be useful? Aubin On Wed, Feb 07, 2001 at 01:30:40AM -0600, ^chewie wrote: > Aubin Paul <aubin@punknews.org> wrote: > > 2) If I make a bug-fix, and submit it upstream, do I have to wait > > for the upstream version to apply my fix, or can I just apply it > > myself. (In one of my packages, there were some GTK warnings, so I > > fixed those, and sent a patch to the upstream guy, but can I just > > apply them now, as part of my .diff?) > > I would actually like to suggest a package that could help you manage > the changes you make locally while maintaining a prestine copy of the > upstream source (and subsequent upstream revisions): CVS. Manjo made > a great package that wrappers both cvs(1) and dpkg-buildpackage(8) > called cvs-buildpackage(8). > > Must get: > cvs - Concurrent Versions System > cvs-buildpackage - Debian package scripts for CVS source trees. > > Good idea: > tkcvs - A graphical front-end to CVS > cvs-doc - Documentation for CVS > cvsbook - Open Source Development with CVS, an online book > > It took me a while to really understand the "magic" that happens in > CVS, but now that I've used it extensively for a while, I could never > see my life without it. Granted, I still do a lot of my CVS > management w/o wrappers, but manjo's package will help out immensly. > > See the info on CVS and building Debian packages on the Developer's > Corner. > > -- > Chad Walstrom <chewie@wookimus.net> | a.k.a. ^chewie > http://www.wookimus.net/ | s.k.a. gunnarr > Key fingerprint = B4AB D627 9CBD 687E 7A31 1950 0CC7 0B18 206C 5AFD > -- "PUNK IS: a belief that this world is what we make of it, truth comes from our understanding of the way things are, not from the blind adherence to prescriptions about the way things should be. " - Greg Graffin
Attachment:
pgp5UNM_ImMft.pgp
Description: PGP signature