lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2013-11-26 13:05:07 +01:00
commit 7ea595fa6d
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
build/debian/README.howto
View File

@ -155,8 +155,9 @@ from origin/upstream and origin/pristine.
Note: If there was errors solved manually, you may need to make a git commit Note: If there was errors solved manually, you may need to make a git commit
* Add an entry into debian/changelog * Add an entry into debian/changelog
> dch -v x.y.z-1 "My comment" will add entry. > dch -v x.y.z-dsfg-1 "My comment" will add entry.
For example: dch -v x.y.z-1 "New upstream release." for a new version For example: dch -v x.y.z-dsfg-1 "New upstream release." for a new version
Then modify changelog to replace "unstable" with "UNRELEASED".
Warning: Date must have format reported by "date -R" Warning: Date must have format reported by "date -R"
Warning: Name and email must match value into debian/control file (Entry added here is used by next step). Warning: Name and email must match value into debian/control file (Entry added here is used by next step).
@ -165,13 +166,17 @@ Warning: Name and email must match value into debian/control file (Entry added h
> rm -fr ../build-area > rm -fr ../build-area
> git-buildpackage -us -uc > git-buildpackage -us -uc
Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommited file Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommited file
Note: You can use git-buildpackage -us -uc -d if you want to test build when dependencies does not match
Note: Package is built into directory ../build-area Note: Package is built into directory ../build-area
* If package .deb is ok: * If package .deb is ok:
Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit
> git-buildpackage --git-tag-only --git-retag
> git push --all ou git push origin --all > git push --all ou git push origin --all
* If ok, you can tag.
> Edit debian/changelog to replace "UNRELEASED" into "unstable", then push
> git-buildpackage --git-tag-only --git-retag
> git push --tags > git push --tags
* Compilation is then done by a debian developer and sent * Compilation is then done by a debian developer and sent
@ -227,15 +232,19 @@ Warning: Name and email must match value into debian/control file (Entry added h
> rm -fr ../build-area > rm -fr ../build-area
> git-buildpackage -us -uc > git-buildpackage -us -uc
Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommited file Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommited file
Note: You can use git-buildpackage -us -uc -d if you want to test build when dependencies does not match
Note: Package is built into directory ../build-area Note: Package is built into directory ../build-area
* Test package (see dedicated chapter to test it with debian unstable env) * Test package (see dedicated chapter to test it with debian unstable env)
* If package .deb is ok: * If package .deb is ok:
Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit
> git-buildpackage --git-tag-only --git-retag
> git push --all ou git push origin --all > git push --all ou git push origin --all
* If ok, you can tag.
> Edit debian/changelog to replace "UNRELEASED" into "unstable", then push
> git-buildpackage --git-tag-only --git-retag
> git push --tags > git push --tags
* Compilation is then done by a debian developer and sent * Compilation is then done by a debian developer and sent