lp:~noskcaj/ubuntu/vivid/dhelp/merge

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:ubuntu/vivid/dhelp

Daniel Holbach (community): Approve on 2015-01-07

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1283061: block packages failing to build and depending on ruby1.8 for trusty

Undecided

Fix Released

Link a bug report

Related blueprints

27. By Jackson Doak on 2015-01-05

Merge from Debian unstable. (LP: #1283061) Remaining changes:

26. By Jackson Doak on 2015-01-05

* 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

25. By Jackson Doak on 2013-09-28

* Merge from Debian unstable. (LP: #1208523) Remaining changes:
  - lib/dhelp.rb: Exit and return zero code if bdb isn't available; this
    usually indicates that dhelp is not configured yet.

24. By Logan Rosen on 2013-05-19

* 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.

23. By Charlie_Smotherman on 2012-11-05

* 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
* Dropped the declaration of dependence on ruby-commandline, which was
  already done on the code
* New maintainer: Georgios M. Zarkadas <email address hidden> (Closes: #650441).
* Support other web servers in addition to apache2 (Closes: #669041).
* Support apache2 packaging transition for version 2.4 (Closes: #669758).
* Support new ruby packaging policy transition for Wheezy.
* Use OptionParser instead Commandline::Application (Closes: #678055).
  Thanks Gunnar Wolf.
* Support new layout of man2html cgi scripts for Wheezy.
* Keep supporting previous policies/layouts, either during build time or
  during runtime, to aid backporting.
* Man and info pages links are activated only if associated packages are
  installed on the system.
* Subsections now show in the sections list only if section is selected.
* New color, styles and icons themes.
* Package installation now does not fail if cache data cannot be generated
  during install.
* Fix some minor lintian warnings.
* Bump Standards-Version to 3.9.3.

22. By Leo Iannacone on 2011-12-02

* Merge with debian unstable (LP: #898773), remaining changes:
  - lib/dhelp.rb:
    + Exit and return zero code if bdb isn't available; this usually
      indicates that dhelp is not configured yet.
* Drop changes:
  - debian/control:
    + Packages that Depend/Recommend/Suggest firefox (metapackages) must
      alternatively Depend/Recommend/Suggest abrowser.

21. By Alessio Treglia on 2010-06-04

* Merge with debian unstable, remaining changes:
  - debian/control:
    + Packages that Depend/Recommend/Suggest firefox (metapackages) must
      alternatively Depend/Recommend/Suggest abrowser.
  - lib/dhelp.rb:
    + Exit and return zero code if bdb isn't available; this usually
      indicates that dhelp is not configured yet.

20. By Alessio Treglia on 2009-11-26

* Merge with debian testing, remaining changes:
  - debian/control:
    + Packages that Depend/Recommend/Suggest firefox (metapackages) must
      alternatively Depend/Recommend/Suggest abrowser.
  - lib/dhelp.rb:
    + Exit and return zero code if bdb isn't available; this usually
      indicates that dhelp is not configured yet.

19. By Alessio Treglia on 2009-05-04

* Merge from debian unstable, Ubuntu remaining changes:
  - Packages that Depend/Recommend/Suggest firefox (metapackages) must
    alternatively Depend/Recommend/Suggest abrowser.
  - Exit and return zero code if the bdb module is not available; this
    usually indicates that dhelp isn't configured yet.

18. By Alessio Treglia on 2009-04-08

* Merge from debian unstable, remaining changes:
  - Exit and return zero code if the bdb module is not available; this
    usually indicates that dhelp is not configured yet.
  - debian/control: Packages that Depend/Recommend/Suggest firefox
    (metapackage) must alternatively Depend/Recommend/Suggest abrowser.