[Pkg-dspam-misc] should we work on debian/ only
Kurt B. Kaiser
kbk@shore.net
Sun, 24 Apr 2005 00:25:07 -0400
Aurelien Labrosse <aurelien.labrosse@free.fr> writes:
> We have currently the full Dspam source code into the CVS tree,when
> I think that only maintain the debian/ dir is sufficient, and of
> course remove the need of upstream merge on each new release. I'm
> trying to merge my work onto the MAIN branch, but i'm not fond of
> spend a lot of time to resych our cvs with upstream, since
> directories has been moved.
I have updated the CVS to 3.4.4, so the file structure is now the
same as yours. I had been delaying the update as I expected dspam
to be a bit volatile after the change (and it was). The old
structure is tagged as r3_2_8-1 if for some reason we want to
create a branch (probably not :-), or you want to look at it.
I will handle the CVS updates when upstream does a new release, so
you don't need to be concerned about that.
Aurelien, I know you have done good work on the cgi and the man pages,
and it would be great to get to get that code into the pkg-dspam
project.
I've been spending time on debian/rules, getting the autotools part of
the project working. When we switched to a makefile build we lost
some of the automation associated with cdbs. This effort is now
essentially completed.
The project now follows the guidelines in autotools-dev. When you
build from a CVS checkout, a configure file will be generated by
autogen.sh (You do have to have autoconf-2.59 and automake-1.9
installed on your system.). Since that is done before the .diff.gz is
written out, the .diff.gz will contain a diff of the new configure
against upstream's configure. That way the configure and Makefiles
should be maximally compatible with the Debian buildds.
I don't see a need to convert the project to subversion, arch, or
something else at this time. pkg-dspam is a small project with
centralized development, we all know CVS, and it's adequate. The only
problem that I've found is that a bug in dpatch (it mungs the checked
out cvs tree instead of making changes to a working tree when building
the .debs) keeps us from using it easily, so I'm using
cvs-buildpackage. This works fine, and the .debs are building OK with
that tool.
--
KBK