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

Thanks a lot for your work. It seems to fail to build for me:

interfaces/gtk/libec_gtk.a(libec_gtk_a-ec_gtk_hosts.o): In function `gtkui_load_hosts':
/tmp/buildd/ettercap-0.7.3/src/interfaces/gtk/ec_gtk_hosts.c:80: undefined reference to `gtk_file_selection_new'
/tmp/buildd/ettercap-0.7.3/src/interfaces/gtk/ec_gtk_hosts.c:82: undefined reference to `gtk_dialog_get_type'
/tmp/buildd/ettercap-0.7.3/src/interfaces/gtk/ec_gtk_hosts.c:82: undefined reference to `g_type_check_instance_cast'
/tmp/buildd/ettercap-0.7.3/src/interfaces/gtk/ec_gtk_hosts.c:82: undefined reference to `gtk_dialog_run'
/tmp/buildd/ettercap-0.7.3/src/interfaces/gtk/ec_gtk_hosts.c:91: undefined reference to `gtk_widget_destroy'
/tmp/buildd/ettercap-0.7.3/src/interfaces/gtk/ec_gtk_hosts.c:85: undefined reference to `gtk_widget_hide'
/tmp/buildd/ettercap-0.7.3/src/interfaces/gtk/ec_gtk_hosts.c:86: undefined reference to `gtk_file_selection_get_type'
/tmp/buildd/ettercap-0.7.3/src/interfaces/gtk/ec_gtk_hosts.c:86: undefined reference to `g_type_check_instance_cast'
/tmp/buildd/ettercap-0.7.3/src/interfaces/gtk/ec_gtk_hosts.c:86: undefined reference to `gtk_file_selection_get_filename'
/tmp/buildd/ettercap-0.7.3/src/interfaces/gtk/ec_gtk_hosts.c:91: undefined reference to `gtk_widget_destroy'
interfaces/gtk/libec_gtk.a(libec_gtk_a-ec_gtk_hosts.o): In function `gtkui_hosts_detach':
/tmp/buildd/ettercap-0.7.3/src/interfaces/gtk/ec_gtk_hosts.c:256: undefined reference to `gtk_window_present'
collect2: ld returned 1 exit status
make[3]: *** [ettercap] Error 1
make[3]: Leaving directory `/tmp/buildd/ettercap-0.7.3/src'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/tmp/buildd/ettercap-0.7.3/src'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/tmp/buildd/ettercap-0.7.3'
make: *** [build-stamp] Error 2
dpkg-buildpackage: error: debian/rules build gave error exit status 2
E: Failed autobuilding of package
I: unmounting /var/cache/pbuilder/ccache filesystem
I: unmounting dev/pts filesystem
I: unmounting proc filesystem
I: cleaning the build env

Maybe the newer version in Debian builds after a merge?

Thank you for your work, setting to work in progress until the build issue Daniel raised is sorted, can you put it back to Needs Review if you get an update ready for review?

@Sebastien and @Daniel
the patch 04 in ettercap fixes the problem.
http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/oneiric/ettercap/oneiric/view/head:/debian/patches/04_as-needed.diff

daniel@daydream:~$ bzr branch lp:ubuntu/oneiric/ettercap
Most recent Ubuntu Oneiric version: 1:0.7.3-2.1ubuntu2
Packaging branch status: CURRENT
Most recent Ubuntu Precise version: 1:0.7.4.2-1
Packaging branch status: CURRENT
Branched 16 revisions.
daniel@daydream:~$ cd ettercap/
daniel@daydream:~/ettercap$ bzr merge-package lp:~wibblymat/ubuntu/oneiric/ettercap/merge-debian-0.7.3-2.2
Most recent Ubuntu Precise version: 1:0.7.4.2-1
Packaging branch status: CURRENT
Conflict adding file debian/patches/03_fix_ltmain_check.diff. Moved existing file to debian/patches/03_fix_ltmain_check.diff.moved.
Text conflict in debian/patches/series
2 conflicts encountered.
The merge resulted in 2 conflicts. Please resolve these and commit the changes with "bzr commit".
daniel@daydream:~/ettercap$ bzr conflicts
Conflict adding file debian/patches/03_fix_ltmain_check.diff. Moved existing file to debian/patches/03_fix_ltmain_check.diff.moved.
Text conflict in debian/patches/series
daniel@daydream:~/ettercap$

@Daniel, are you trying to merge with the precise ettercap version?
This wouldn't work since in the new release 03_fix_ltmain_check.diff isn't needed anymore

No, check out the first line of my earlier comment. I tried to merge the branches listed in this merge proposal.

I think you should look or append here the 03_fix_ltmain_check.diff but I think the patch is already applied in the official branch, so just remove it

I uploaded the merge http://bazaar.launchpad.net/~costamagnagianfranco/+junk/ettercap/changes

just type
bzr resolve debian/patches/03_fix_ltmain_check.diff
bzr resolve debian/patches/series
bzr del debian/patches/03_fix_ltmain_check.diff.moved
bzr commit

to fix the problem.

<dholbach> can somebody please reject https://code.launchpad.net/~wibblymat/ubuntu/oneiric/ettercap/merge-debian-0.7.3-2.2/+merge/71435? we synced a newer version into Ubuntu already