Summary: | Patches required to make the packages know about the 3.6 release | ||
---|---|---|---|
Product: | Koha | Reporter: | Robin Sheat <robin> |
Component: | Packaging | Assignee: | Robin Sheat <robin> |
Status: | CLOSED FIXED | QA Contact: | Bugs List <koha-bugs> |
Severity: | enhancement | ||
Priority: | PATCH-Sent (DO NOT USE) | CC: | koha.sekjal, mtj, paul.poulain |
Version: | 3.6 | ||
Hardware: | All | ||
OS: | All | ||
GIT URL: | Change sponsored?: | --- | |
Patch complexity: | --- | Documentation contact: | |
Documentation submission: | Text to go in the release notes: | ||
Version(s) released in: | Circulation function: | ||
Attachments: |
Bug 7091 - [MASTER] - update the build version for packages from master
Bug 7091 - [MASTER/3.6.x/3.4.x] - update the changelogs for the 3.4 series Bug 7091 - [3.6.x] - update the build script for 3.6 stable series Bug 7091 - [3.6.x] - update the build script for 3.6 stable series Bug 7091 - [MASTER] - update the build version for packages from master Bug 7091 - [MASTER/3.6.x/3.4.x] - update the changelogs for the 3.4 series |
Description
Robin Sheat
2011-10-26 02:01:53 UTC
Created attachment 6059 [details] [review] Bug 7091 - [MASTER] - update the build version for packages from master This updates the default version number that packages are build with to be 3.7. This should be applied to master only. Created attachment 6060 [details] [review] Bug 7091 - [MASTER/3.6.x/3.4.x] - update the changelogs for the 3.4 series This brings all the changelog entries for releases up to what has been included in the packages Created attachment 6061 [details] [review] Bug 7091 - [3.6.x] - update the build script for 3.6 stable series Note: these are all very small patches that are really only changing version numbers and internal documentation, they can probably get away with being less diligently checked than usual. Created attachment 6191 [details] [review] Bug 7091 - [3.6.x] - update the build script for 3.6 stable series Signed-off-by: Mason James <mtj@kohaaloha.com> Created attachment 6192 [details] [review] Bug 7091 - [MASTER] - update the build version for packages from master This updates the default version number that packages are build with to be 3.7. This should be applied to master only. Signed-off-by: Mason James <mtj@kohaaloha.com> Created attachment 6193 [details] [review] Bug 7091 - [MASTER/3.6.x/3.4.x] - update the changelogs for the 3.4 series This brings all the changelog entries for releases up to what has been included in the packages Signed-off-by: Mason James <mtj@kohaaloha.com> All patches are easy to read, and update numeric or textual values. Marking as Passed QA Sorry guys, does not apply anymore because of a small glitch in debian/build-git-snapshot I'm totally unable to decide how it should be fixed, so I let you fix it. The master patch set applies: robin@zarathud:~/catalyst/koha$ git bz apply 7091 Bug 7091 - Patches required to make the packages know about the 3.6 release Bug 7091 - [3.6.x] - update the build script for 3.6 stable series Apply? [yn] n Bug 7091 - [MASTER] - update the build version for packages from master Apply? [yn] y Applying: Bug 7091 - [MASTER] - update the build version for packages from master Bug 7091 - [MASTER/3.6.x/3.4.x] - update the changelogs for the 3.4 series Apply? [yn] y Applying: Bug 7091 - [MASTER/3.6.x/3.4.x] - update the changelogs for the 3.4 series /home/robin/catalyst/koha/.git/rebase-apply/patch:12: trailing whitespace. * New upstream release (3.04.05) /home/robin/catalyst/koha/.git/rebase-apply/patch:24: trailing whitespace. * New upstream release (3.04.03) warning: 2 lines add whitespace errors. ...checking the 3.6 ones now. The 3.6.x patch set also applies: robin@zarathud:~/catalyst/koha$ git checkout kc/3.6.x HEAD is now at 16189ed... Joy nelson was already in history.txt, removing the entry (cherry picked from commit 9c5d3ea3aa28b71f0fb4148b8fdf9f2a002f79f5) robin@zarathud:~/catalyst/koha$ git bz apply 7091 Bug 7091 - Patches required to make the packages know about the 3.6 release Bug 7091 - [3.6.x] - update the build script for 3.6 stable series Apply? [yn] y Applying: Bug 7091 - [3.6.x] - update the build script for 3.6 stable series Bug 7091 - [MASTER] - update the build version for packages from master Apply? [yn] n Bug 7091 - [MASTER/3.6.x/3.4.x] - update the changelogs for the 3.4 series Apply? [yn] y Applying: Bug 7091 - [MASTER/3.6.x/3.4.x] - update the changelogs for the 3.4 series /home/robin/catalyst/koha/.git/rebase-apply/patch:12: trailing whitespace. * New upstream release (3.04.05) /home/robin/catalyst/koha/.git/rebase-apply/patch:24: trailing whitespace. * New upstream release (3.04.03) warning: 2 lines add whitespace errors. ... I suspect you were trying to apply all the patches, not the ones for the particular branches? Patch pushed, please test chris_n = you'll have to apply the 3.6.x patches (not the [MASTER] one) Incorporated in both 3.6.x and 3.4.x. |