[Bug 7091] New: Patches required to make the packages know about the 3.6 release
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7091 Bug #: 7091 Summary: Patches required to make the packages know about the 3.6 release Classification: Unclassified Change sponsored?: --- Product: Koha Version: master Platform: All OS/Version: All Status: NEW Severity: enhancement Priority: P5 Component: Packaging AssignedTo: robin@catalyst.net.nz ReportedBy: robin@catalyst.net.nz QAContact: koha-bugs@lists.koha-community.org This is going to be a couple of patches to ensure that the packages build nicely. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7091 --- Comment #1 from Robin Sheat <robin@catalyst.net.nz> 2011-10-26 02:05:15 UTC --- Created attachment 6059 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=6059 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. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7091 --- Comment #2 from Robin Sheat <robin@catalyst.net.nz> 2011-10-26 02:12:09 UTC --- Created attachment 6060 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=6060 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 -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7091 --- Comment #3 from Robin Sheat <robin@catalyst.net.nz> 2011-10-26 02:14:35 UTC --- Created attachment 6061 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=6061 Bug 7091 - [3.6.x] - update the build script for 3.6 stable series -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7091 Robin Sheat <robin@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Priority|P5 |PATCH-Sent Status|NEW |ASSIGNED Patch Status|--- |Needs Signoff --- Comment #4 from Robin Sheat <robin@catalyst.net.nz> 2011-10-26 02:22:14 UTC --- 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. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7091 --- Comment #5 from Mason James <mtj@kohaaloha.com> 2011-11-04 10:17:52 UTC --- Created attachment 6191 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=6191 Bug 7091 - [3.6.x] - update the build script for 3.6 stable series Signed-off-by: Mason James <mtj@kohaaloha.com> -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug. You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7091 Mason James <mtj@kohaaloha.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #6061|0 |1 is obsolete| | -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug. You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7091 --- Comment #6 from Mason James <mtj@kohaaloha.com> 2011-11-04 10:23:35 UTC --- Created attachment 6192 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=6192 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> -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug. You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7091 Mason James <mtj@kohaaloha.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #6059|0 |1 is obsolete| | -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug. You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7091 Mason James <mtj@kohaaloha.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #6060|0 |1 is obsolete| | --- Comment #7 from Mason James <mtj@kohaaloha.com> 2011-11-04 10:26:55 UTC --- Created attachment 6193 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=6193 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> -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug. You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7091 Mason James <mtj@kohaaloha.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |mtj@kohaaloha.com Patch Status|Needs Signoff |Signed Off -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug. You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7091 Ian Walls <ian.walls@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ian.walls@bywatersolutions. | |com Patch Status|Signed Off |Passed QA --- Comment #8 from Ian Walls <ian.walls@bywatersolutions.com> 2011-11-04 17:57:51 UTC --- All patches are easy to read, and update numeric or textual values. Marking as Passed QA -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug. You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7091 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |paul.poulain@biblibre.com Patch Status|Passed QA |Does not apply --- Comment #9 from Paul Poulain <paul.poulain@biblibre.com> 2011-11-06 10:53:01 UTC --- 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. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug. You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7091 --- Comment #10 from Robin Sheat <robin@catalyst.net.nz> 2011-11-23 05:11:12 UTC --- 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. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug. You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7091 Robin Sheat <robin@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch Status|Does not apply |Passed QA --- Comment #11 from Robin Sheat <robin@catalyst.net.nz> 2011-11-23 05:13:44 UTC --- 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? -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug. You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7091 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Version|master |rel_3_6 --- Comment #12 from Paul Poulain <paul.poulain@biblibre.com> 2011-11-24 10:49:16 UTC --- Patch pushed, please test chris_n = you'll have to apply the 3.6.x patches (not the [MASTER] one) -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug. You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7091 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch Status|Passed QA |Patch Pushed -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug. You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7091 Jared Camins-Esakov <jcamins@cpbibliography.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to Master |RESOLVED Resolution|--- |FIXED --- Comment #13 from Jared Camins-Esakov <jcamins@cpbibliography.com> --- Incorporated in both 3.6.x and 3.4.x. -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org