[Indic-computing-devel] debian, revisions, and me

[Cherry G. M. <ber...@ya...>]

Hi All,

I'm about to make myself look like the biggest idiot
who ever used CVS. So brace yourself.

Here is what I've been trying to do.

To make the following directory structure rooted at:

src/package-definitions/doc-toolchain:

debian/
debian/bsdmake/
debian/bsdmake/bsdmake-1.0.orig/*
debian/bsdmake/bsdmake-1.0/*
debian/peps/
debian/peps/peps-1.0.orig/*
debian/peps/peps-1.0/*


All subdirectories with *.orig would have upstream
sources. The subdirectories without .orig extensions
would be "debianized" modifications.

The idea is to run:

make deb-src from , say within debian/bsdmake, and to
obtain a freshly laid out deb-src directory as
follows:

debian/bsdmake/
debian/bsdmake/bsdmake-1.0_1.diff.gz
debian/bsdmake/bsdmake-1.0_1.dsc
debian/bsdmake/bsdmake-1.0_1.orig.tar.gz
debian/bsdmake/bsdmake-1.0/*

From here, it would be a simple matter to build the
.deb files, make them into apt-get able trees etc.

All this would be automated with repective Makefiles,
in the above example:

debian/bsdmake/Makefile ( GNU Makefile, cause we're on
debian ) would have targets to automate everything
from compiling the package to installing the apt-get
deb archive via apt-get install ......


Now here's what I've done and botched up. CVS gurus
HEEEEEELPPPPPP!!!!!


I did a cvs import src/..../debian/bsdmake which was
all very nice and dandy except for two problems:

1) The head revision somehow got screwed to 1.1.1.1,
which pisses me off really badly, because the rest of
the tree is clean with 1.X revisions, and I've
unwittingly created a branch.

My idea was to pullup these 1.1.1.X revisions into the
1.X revisions on the Trunk, so that if a new version
of, say bsdmake were to be integrated on the Vendor
Branch, the new version would be 1.1.1.2, and the
pulled up version on the Trunk would be 1.2

How can I do the initial pullup. ie; pullup from
branch 1.1.1.1 to Main Trunk 1.1

Or, have I screwed up ?

2) I've screwed up the directory positions for peps.

peps should have been in:

debian/peps/peps-1.0.orig/*

Instead, I got it screwed up with a typo. Its now in:

debian/peps/*

Hmmm..... I'm sniffing already..... 

Can someone help with this ? I'd love to see the tree
back with 1.X revisions until we decide on TAG names.
I can see a JOSEPH_KOSHY tag already.

I would love to make a private CGM tag, and get the
branch on it, so as to keep other folks from getting
messed up with my commits,  but don't want to touch
anything until the level of damage has been assessed.


Thanks,

Cherry.



	
		
__________________________________
Do you Yahoo!?
New and Improved Yahoo! Mail - 100MB free storage!
http://promotions.yahoo.com/new_mail