lp:~wibblymat/ubuntu/oneiric/ettercap/merge-debian-0.7.3-2.2

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:ubuntu/oneiric/ettercap

Gianfranco Costamagna: Needs Resubmitting on 2012-01-11

Daniel Holbach (community): Needs Fixing on 2011-12-21

Ubuntu branches: Pending requested 2011-08-13

Diff: 68 lines (+36/-1)

4 files modified

debian/changelog (+23/-0)
debian/control (+1/-1)
debian/patches/03_fix_ltmain_check.diff (+11/-0)
debian/patches/series (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #825584: Please merge ettercap 1:0.7.3-2.2 (universe) from debian sid (main)

Undecided

Fix Released

Link a bug report

Related blueprints

17. By Mat Scales on 2011-08-13

* Merge from debian unstable. (LP: #825584)
* Remaining changes:

16. By Mat Scales on 2011-08-12

* Merge from debian unstable. Remaining changes:
  - debian/control: Build-depend on libltdl7-dev.
  - Add ettercap.xpm and ettercap.desktop.
  - debian/etercap-gtk.dirs: Added 'usr/share/applications' and
    'usr/share/pixmaps'.
  - debian/patches/01_file_permissions.diff: Specify file permission in
    open
* Non-maintainer upload.
* 03_fix_ltmain_check.diff: New patch to fix builds with newer
  grep. (Closes: #634576)
* debian/control: Build-Depends against libssl-dev instead of
  libssl0.9.8. (Closes: #621391)

15. By Lorenzo De Liso on 2010-10-22

* Merge from debian unstable, remaining changes:
  - debian/control: Build-depend on libltdl7-dev.
  - Add ettercap.xpm and ettercap.desktop.
  - debian/etercap-gtk.dirs: Added 'usr/share/applications' and
    'usr/share/pixmaps'.
  - debian/patches/01_file_permissions.diff: Specify file permission in
    open: the patch exists in the last merged ubuntu package as
    02_file_permissions.diff, adding this

14. By Lorenzo De Liso on 2010-06-24

* Merge from debian unstable (LP: #597882), remaining changes:
  - debian/control:
    + Build-depend on libltdl7-dev.
  - Add ettercap.xpm and ettercap.desktop.
  - debian/etercap-gtk.dirs: Added 'usr/share/applications' and
    'usr/share/pixmaps'.
  - debian/patches/01_file_permissions.diff: Specify file permission in
    open: the patch exists in the last merged ubuntu package as
    02_file_permissions.diff, adding this
* Dropped changes:
  - Bumped standards-version to 3.7.3, no changes required: superseded in
    debian with 3.8.3
  - Drop explicit openssl version dep: fixed in debian
  - debian/rules: Remove deprecated dh_desktop: fixed in debian

13. By Andres Rodriguez on 2009-07-10

* Merge from debian unstable (LP: #398006), remaining changes:
  - debian/control:
    + Build-depend on libltdl7-dev.
    + Bumped standards-version to 3.7.3, no changes required.
    + Drop explicit openssl version dep.
  - Add ettercap.xpm and ettercap.desktop.
  - debian/etercap-gtk.dirs: Added 'usr/share/applications' and
    'usr/share/pixmaps'.
* debian/patches/01_file_permissions.diff: Specify file permission in open
  call in 'src/ec_log.c'.
* debian/rules: Remove deprecated dh_desktop.

12. By Luca Falavigna on 2008-09-13

* Build-depend on libltdl7-dev.
* src/ec_log.c: specify file permission in open call, fix FTBFS.

11. By Iain Lane on 2008-03-11

* Run ettercap-gtk as root (gksu).
  Changed files: debian/ettercap.desktop (LP: #199206)
* Modify Maintainer value to match the DebianMaintainerField
  specification.
* Clean up some errors picked up by lintian.
  Changed files: debian/rules, debian/control, debian/compat
* Bumped standards-version to 3.7.3, no changes required.
  Changed files: debian/control

10. By Daniel T Chen on 2007-01-24

Fix Categories in .desktop. Thanks, Toni Heinonen!
(Closes Ubuntu: #81305).

9. By Kees Cook on 2006-11-28

* Merge from debian unstable.
* Remaining changes in Ubuntu:
  - debian/control: drop explicit openssl version dep
  - Add ettercap.xpm and ettercap.desktop.

8. By Kees Cook on 2006-10-14

debian/control: adjust libssl depends for OpenSSL 0.9.8.