lp:~ubuntu-branches/ubuntu/karmic/elinks/karmic-201103250156

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:ubuntu/karmic/elinks

Ubuntu Development Team: Pending requested 2011-03-26

Diff: 0 lines api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

20. By Michael Vogt on 2009-06-25

* Merge from debian unstable, remaining changes:
  - drop libfsplib-dev, libtre-dev, libmozjs-dev from build-depends
    (all universe)
  - debian/rules: remove --enable-fsp

19. By Steve Kowalik on 2008-11-04

* Merge from Debian unstable.
* Remaining Ubuntu changes:
  - Disable FSP for now, libfsplib-dev is in universe.
* Ubuntu changes dropped:
  - debian/patches/13_fix_strings.diff: contrib/elinks.conf is no longer
    shipped.
* Remove <> from the Build-Depends, they're in universe.

18. By Steve Kowalik on 2008-07-22

Rebuild for libgpmg1 -> libgpm2 transistion.

17. By Chuck Short on 2008-06-20

* debian/patches/13_fix_strings.diff:
  - Fix spelling mistakes in contib/elinks.conf. Thanks to
    Andy Matteson <email address hidden> (LP: #64590)

16. By Martin Pitt on 2008-06-04

Disable FSP for now, libfsplib-dev is in universe.

15. By Y Giridhar Appaji Nag on 2008-05-21

* Fix bash-ism in debian/rules get-orig-source target. Thanks Raphael
  Geissert <email address hidden> (Closes: #477976)
* Update 13_fsp-display-dir.diff to workaround fsplib ABI dependency on
  _FILE_OFFSET_BITS. Thanks Kalle Olavi Niemitalo <email address hidden>
* Remove perl from Build-Depends, it is build-essential

14. By Colin Watson on 2008-04-11

Use << versioning for Conflicts/Replaces rather than <=, to account for
Ubuntu versions (LP: #215611).

13. By Siegfried Gevatter on 2008-02-01

* Merge from Debian unstable (LP: #187936); remaining changes:
  - Add X-Ubuntu-Gettext-Domain to .desktop files.
  - debian/control: Maintainer field update.
* Improve the text in the .desktop file and add some translations.

12. By Michael Bienia on 2007-09-25

* Merge to Debian unstable: remaining Ubuntu changes:
  - debian/rules: Add X-Ubuntu-Gettext-Domain to .desktop files.
  - debian/control: Maintainer field updates.

11. By Kees Cook on 2007-05-03

* Merge to Debian unstable: remaining Ubuntu changes:
  - debian/rules: Add X-Ubuntu-Gettext-Domain to .desktop files.
  - debian/control: Maintainer field updates.