diff --git a/build/debian/README.howto b/build/debian/README.howto index 3c111f0a0ec..e2efcb6cf48 100644 --- a/build/debian/README.howto +++ b/build/debian/README.howto @@ -195,7 +195,7 @@ If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VER * Some files are removed from archive by the get-orig-source.sh * Staying into git root directory, run -> git-import-orig -vv ../tcpdf_x.y.z+dfsg.orig.tar.xz +> git-import-orig -vv ../tcpdf_x.y.z+dfsg.orig.tar.xz --debian-branch=[master|jessie] --upstream-branch=[upstream|upstream-3.5.x] Note: If there was errors solved manually, you may need to make a git commit @@ -208,11 +208,15 @@ 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). * We try to build package -> rm -fr ../build-area; git-buildpackage -us -uc +> rm -fr ../build-area; +> git-buildpackage -us -uc --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-3.5.x] +Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-3.5.x] 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: To compare 2 packages: debdiff package1.dsc package2.dsc + * 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 @@ -220,7 +224,7 @@ Note: If there was errors managed manually, you may need to make a git commit bu * If ok, you can tag. > Edit debian/changelog to replace "UNRELEASED" into "unstable", then push -> git-buildpackage --git-tag-only --git-retag +> git-buildpackage --git-tag-only --git-retag --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-3.5.x] > git push --tags * Compilation is then done by a debian developer and sent @@ -263,7 +267,7 @@ dolibarr-x.y.z+dfsgw.tgz (x.y.z = version, w start from 1 and is increased for each new git-import-orig already done) * Staying into git root directory, run -> git-import-orig -vv ../dolibarr-x.y.z+dfsgw.tgz +> git-import-orig -vv ../dolibarr-x.y.z+dfsgw.tgz --debian-branch=[master|jessie] --upstream-branch=[upstream|upstream-3.5.x] and enter version when requested with format x.y.z+dfsgw (x.y.z = version, w start from 1 and is increased for each new import) @@ -289,11 +293,14 @@ To update dolibarr debian package when only files into debian has changed Once files has been prepared, it's time to test: * Try to build package -> rm -fr ../build-area; git-buildpackage -us -uc +> rm -fr ../build-area; +> git-buildpackage -us -uc --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-3.5.x] +Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-3.5.x] 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: To compare 2 packages: debdiff package1.dsc package2.dsc * Test package (see dedicated chapter to test it with debian unstable env) @@ -303,7 +310,7 @@ Note: If there was errors managed manually, you may need to make a git commit bu * If ok, you can tag. > Edit debian/changelog to replace "UNRELEASED" into "unstable", then push -> git-buildpackage --git-tag-only --git-retag +> git-buildpackage --git-tag-only --git-retag --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-3.5.x] > git push --tags @@ -321,15 +328,32 @@ http://packages.qa.debian.org ##### Send an unblock request + Use this to move from unstable to testing. + reportbug -B debian Choose package "release.debian.org" Then "unblock" Then name of package "dolibarr" Fill message, for example: "Please unblock package dolibarr -A security error CVE-2014-7137 was reported and is fixed into package 3.5.5. -Note that package 3.5.5 was prepared before the CVE was reported and include other fixes, but they are all related to stability or security (other se$ +A security error CVE-2015-3935 was reported and is fixed into package 3.5.7. +Note that package 3.5.7 contains not only fixed for bugs reported to debian. It includes other fixes, but they are all related to stability or security, +so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935. +After discussion with ..., it appears that security holes are enough to request this unblock request." + + +Use this to request an update of a stable package + +reportbug -B debian +Choose package "release.debian.org" +Then "unblock" +Then name of package "dolibarr" +Fill message, for example: +"Please unblock package dolibarr +A security error CVE-2015-3935 was reported and is fixed into package 3.5.7. +Note that package 3.5.7 contains not only fixed for bugs reported to debian. It includes other fixes, but they are all related to stability or security, +so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935. After discussion with ..., it appears that security holes are enough to request this unblock request."