From bf0e4d73d0c28fb4f25dc18015244a6bea2574db Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Mar 2013 10:04:50 +0100
Subject: [PATCH] Fix launchpad conflicts
---
build/launchpad/README | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build/launchpad/README b/build/launchpad/README
index 489712e91f8..2334b01f1d7 100644
--- a/build/launchpad/README
+++ b/build/launchpad/README
@@ -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
--
GitLab