[pkg-php-pear] php-psr-log package

[David Prévot]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Hi François-Régis,

Le 07/02/2014 12:40, François-Régis a écrit :

> Something like this :
> 
> http://anonscm.debian.org/gitweb/?p=pkg-php/php-psr-log.git ?

It doesn’t work, since you you merged back the upstream branch into the
upstream’s master branch, that you then use for the debian packaging.

Maybe gitk could help us see what’s wrong here.

> I've done :
> 
> gbp clone git at github.com:php-fig/log.git php-psr-log

Another idea to start fresh:

# Start a new empty repository
mkdir php-psr-log && cd php-psr-log && git init
# Track upstream repository (remote name: upstream)
git remote add upstream https://github.com/php-fig/log.git
# Fetch it (and all its friends if they were some)
git fetch --all

And now, you’re ready to start as you did:

> gbp import-orig ../build-area/php-psr-log_1.0.0.orig.tar.gz\
> --upstream-vcs-tag=1.0.0 --pristine-tar --no-interactive --sign-tag

Assuming your ../build-area/php-psr-log_1.0.0.orig.tar.gz is identical
to https://github.com/php-fig/log/archive/1.0.0.tar.gz, you now have
both master and upstream one (empty) commit ahead of the upstream 1.0.0,
tagged as upstream/1.0.0, and you’re ready for debian work in your own
local master branch:

$ git status
Sur la branche master
rien à valider, la copie de travail est propre

Now you can add the debian repository, commit your stuff, etc.

On upstream upgrade, you’ll just have to restart from the “git fetch
- --all” step.

Regards

David


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQEcBAEBCAAGBQJS9n4JAAoJEAWMHPlE9r08PRcH/2D4118jq0v4FG5oua3MD991
gsk07lV45Lf5YO/1pOqgJFCaf1rpnfKDvEcmqUe2Xu0hoeaM/fA3B7yttUey7wSp
R79jdHXIg5JFz6YJxKRpZX5z/eywMUz+0vAmATJElRBWP+kACiOkVCv4X56c2ZvN
DjDAXbUqV+u6TN20M+Y+EnXmXtGLkAtypjmO1UurzL8EyELO9+BlhWZy4sVrd08O
Uqw231beg3Nho6400Xm3az575ZQSCDPp4hyBCm+BSdsNBG8i3orWFbpKILe1/ppg
0CtmjUQQX4GU9LOeoksW4kdS+eVj5g3eh9d05vR55mynJtkZ6jD5oWuzuT/RoDg=
=Z6Ui
-----END PGP SIGNATURE-----