[Pkg-fonts-devel] [Pkg-fonts-commits] r2063 - packages/ttf-breip/trunk

Christian PERRIER bubulle at debian.org
Wed Jan 13 18:12:01 UTC 2010

(I'mm CC'ing you, but maybe you're subscribed, aren't you?)

Quoting Mauro Lizaur (debian at cacavoladora.org):

> BTW, I have a few doubts about the method described in packages/README.source,
> the steps to follow would be:
> $ svn copy trunk/ tag/upstrea_{$version}
> $ svn ci -m "Tagging ${version} for ${package}"
> $ svn-load -t packages/${package}/tags/upstream_${version} \
> svn+ssh://svn.debian.org/svn/pkg-fonts packages/${package}/branches/upstream .
> $ svn merge \
> svn+ssh://svn.debian.org/svn/pkg-fonts/packages/${package}/tags/upstream_${version}
> $ svn diff # (to make sure the diff makes sense)
> $ svn commit -m "merge upstream $version for ${package}"

This is not exactly the right sequence. Let me try explaining another

- unpack upstream source in an empty directory (the upstream source alone,
without debian/)

- go to that directory

- use svn-load as explained in README.source:

$ svn-load -t tags/<package>/upstream_${version} \
svn+ssh://svn.debian.org/svn/pkg-fonts branches/<package>/upstream .

  The above is the simplest use of svn-load to merge a new upstream
version into the "upstream" branch and copy it to a per-version tag
directory; please see "svn-load --help" for a list of other options
that are of interest.

  Note that this only imports the new upstream version into the
  branch, it doesn't merge it onto the trunk.  

Let's assume that your trunk currently only contains debian/

Go to your clean copy of the trunk and run:

$ svn merge \
svn+ssh://svn.debian.org/svn/pkg-fonts/<package>/tags/upstream_{new_version} \

This will bring your upstream source in the trunk and "svn add"
it. "svn status" will show you upstream files as added.

Then you can commit back the merge source:

$ svn commit -m "merge upstream $version"

When a new upstream release happens, you do the very same svn-load,
then go to your clean copy of the trunk (which contains the previous
version of upstream) and run:

$ svn merge \

That will merge the difference between your two tag directories where
you are, ie in the trunk.

Then you commit back, etc.

When you release a new package version from the trunk, you take care
to commit everything you changed, in your ttrunk copy, then you tag
the whole thing:

svn copy svn+ssh://svn.debian.org/svn/pkg-fonts/<package>/trunk

PS: there are many things here that are maybe doable with tools
included in svn-buildpackage. I actually never succeeded in
understanding the "right" way to use svn-buildpackage, actually..:-)

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-fonts-devel/attachments/20100113/6eaeb70f/attachment.pgp>

More information about the Pkg-fonts-devel mailing list