Fix launchpad conflicts

This commit is contained in:
Laurent Destailleur 2013-03-01 10:04:50 +01:00
parent 0b51eff562
commit bf0e4d73d0

View File

@ -96,11 +96,11 @@ https://launchpad.net/dolibarr/stable
lp:dolibarr
merge packaging lp:~yourlogin/+junk/debian-dev
For beta:
# bzr-builder format 0.3 deb-version {debupstream}-0~{revno}
# bzr-builder format 0.3 deb-version {debupstream}-1~{revno}
lp:dolibarr/beta
merge packaging lp:~yourlogin/+junk/debian-beta
For stable:
# bzr-builder format 0.3 deb-version {debupstream}-0~{revno}
# bzr-builder format 0.3 deb-version {debupstream}-2~{revno}
lp:dolibarr/stable
merge packaging lp:~yourlogin/+junk/debian-stable
- Run command