On 1/10/06, Steffen Moeller <[EMAIL PROTECTED]> wrote: > Am Mittwoch 14 Dezember 2005 05:02 schrieb Justin Pryzby: > > On Wed, Dec 14, 2005 at 04:11:04AM +0200, Radu Corlan wrote: > > > On 12/14/05, Justin Pryzby <[EMAIL PROTECTED]> wrote: > > > > Some will critique your inclusion of the ./debian/ directory in the > > > > upstream source. Personally, I'm okay with it; and it probably helps > > > > reduce the overhead of the project. > > > > Well, i definitely want to keep the debian dir in the cvs source tree. > > > i have it in the upstream source because my procedure is to do a make > > > dist in the upstream, then copy the tar to .orig, detar it and just > > > run dpkg-buildpackage and pbuilder. > > > > > > I can of course remove it from there if it's objectionable. > > > > FYI, the "official" recommendation is to keep the Debian dir (and > > other patches, if you're not using eg dpatch) in a separate CVS > > repository. > > > > I would recommend to create a "make deb" rule that does what you > > need, to avoid the hastle of remembering to copy the orig tarball :) > > > See my sextractor diff for an example of how to keep the diff > > readable. Of course, you case is a bit different, since ./debian/ is > > in upstream tarball. > > Hm. Even if you as an upstream developer find somebody to maintain the Debian > package for you, then this person could use the source as it is, from my > understanding. The changes this person would perform would then spawn the > creation of a novel diff.gz. It would be a bit unusual but not a native > package or anything against the idea behind the Debian policy from my > understanding.
Steffen, i've since come to realize the wisdom of not including the debian files in the upsteam tarball - they just lead to too many upstream revisions, and they make the debian changelog read funny (for instance, if i do a debian-related change i have to make a new upstream release; but that would have to be noted as such in the changelog, which makes it confusing). so the compromise i reached is to keep the debian files in the same CVS repository, but under a "debfiles" dir; the debfiles dir is not included in the upstream tarball (make dist excludes these files). a debian-only change would get into cvs, but not trigger an upstream release, which is actually nice ;-). radu > > Many greetings > > Steffen > > > -- > To UNSUBSCRIBE, email to [EMAIL PROTECTED] > with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED] > >
