Merge lp://staging/~noskcaj/ubuntu/vivid/dhelp/merge into lp://staging/ubuntu/vivid/dhelp
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~noskcaj/ubuntu/vivid/dhelp/merge |
| Merge into: | lp://staging/ubuntu/vivid/dhelp |
| Diff against target: |
1103 lines (+620/-61) 19 files modified
Makefile (+7/-3) debian/changelog (+43/-0) debian/control (+4/-3) examples/index_package_doc.rb (+2/-2) lib/dhelp.rb (+4/-4) lib/dhelp/exporter/cgimap.rb (+7/-2) lib/dhelp/exporter/html.rb (+2/-2) po/da.po (+150/-0) po/de.po (+26/-12) po/fr.po (+20/-8) po/it.po (+153/-0) po/pt.po (+153/-0) po/ru.po (+30/-15) src/dhelp_fetcher.rb (+1/-1) src/dhelp_parse.rb (+14/-5) test/doc-base/pica-manual (+1/-1) test/tc_dhelpdocumentpool.rb (+1/-1) test/tc_docbasedocument.rb (+1/-1) test/ts_dhelp.rb (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~noskcaj/ubuntu/vivid/dhelp/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from debian. Makes package work again
Unmerged revisions
- 27. By Jackson Doak
-
Merge from Debian unstable. (LP: #1283061) Remaining changes:
- 26. By Jackson Doak
-
* Merge from Debian unstable. Remaining changes:
- lib/dhelp.rb: Exit and return zero code if bdb isn't available; this
usually indicates that dhelp is not configured yet.
* Non-maintainer upload.
* Fix "Fails to build the index when invalid UTF-8 is met":
apply patch from Daniel Getz:
+ Load files as UTF-8, regardless of $LANG
(Closes: #768127)
* Non-maintainer upload.
* Update French program translation (Closes: #684664)
* Update Russian program translation (Closes: #688667)
* Update German program translation (Closes: #689063)
* Add Danish program translation (Closes: #689644)
* Add Italian program translation (Closes: #689920)
* Add Portugese program translation (Closes: #724781)
* Non-maintainer upload.
* Add support for newer ruby versions (Closes: #734523, #732916)
* Cache 'Dpkg.status' calls to not affect performance on every system
upgrade (Closes: #712621)
* Handle correctly arguments passed to '-a' and '-d' options
* Fix error when 'dhelp_parse' is called without arguments
* Fix Ruby warnings
* Change the encoding of Ruby files to UTF-8
Thanks. Uploaded.