Merge lp:~gingerchris/endroid/package-version into lp:endroid
Status: | Merged |
---|---|
Approved by: | ChrisD |
Approved revision: | 119 |
Merged at revision: | 104 |
Proposed branch: | lp:~gingerchris/endroid/package-version |
Merge into: | lp:endroid |
Diff against target: |
297 lines (+130/-47) 13 files modified
README (+1/-1) debian/changelog (+12/-0) debian/conffiles (+0/-1) debian/control (+1/-1) debian/endroid.install (+0/-1) debian/postinst (+11/-0) etc/init/endroid.conf (+5/-0) gen_version.sh (+10/-0) makedeb (+52/-0) setup.py (+29/-29) src/endroid.sh (+2/-6) src/endroid/__init__.py (+1/-1) src/endroid/plugins/version.py (+6/-7) |
To merge this branch: | bzr merge lp:~gingerchris/endroid/package-version |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Matthew Hall | Approve | ||
Review via email: mp+282621@code.launchpad.net |
Commit message
1.4.8 release: Improvements to installation/
* Fix bug in DB update function
* Improve exception logging
* Add makedeb script to make it easier to build and install debs
* Remove need for manual service restart when upgrading
* Only list rooms that a user is allowed in
* Fix various bugs in plugins
* Fix up lintian errors/warnings
Description of the change
Collection of changes:
Make it easier to build a deb from the package:
- Added a makedeb script - which optionally installs the package if 'install' specified
- Added a gen_version.sh script that generates detailed version information (moved from src/endroid.sh)
- remove generation of version code from setup.py (it wasn't effective and is superseded by makedeb)
Make updating the version number easier:
- Make setup.py get its version from endroid.__version__ (so 1 fewer place to update)
Remove need to restart endroid when installed
- Add a postinst script that restarts the service
Fix up deb lintian warnings/errors:
- Increase debian/control Standards-Version
- Remove the empty endroid.db file (and references to it) that was being installed to /var/lib/
Other changes
- Improved information returned by the version plugin to capitalise on version number changes
- Added respawn to the default init config
- Typo
And finally; bump the version to 1.4.8.