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

[Mat Scales]

[Daniel Holbach (dholbach)]

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?

review: Needs Fixing

[Sebastien Bacher (seb128)]

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?

[LocutusOfBorg (costamagnagianfranco)]

@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

[LocutusOfBorg (costamagnagianfranco)]

review: Approve

[Daniel Holbach (dholbach)]

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$

review: Needs Fixing

[LocutusOfBorg (costamagnagianfranco)]

@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

review: Resubmit

[Daniel Holbach (dholbach)]

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

[LocutusOfBorg (costamagnagianfranco)]

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

review: Needs Information

[LocutusOfBorg (costamagnagianfranco)]

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

[LocutusOfBorg (costamagnagianfranco)]

review: Approve

[LocutusOfBorg (costamagnagianfranco)]

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.

review: Resubmit

[Colin Watson (cjwatson)]

<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

Unmerged revisions

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)

=== modified file 'debian/changelog'
--- debian/changelog	2010-10-22 15:03:32 +0000
+++ debian/changelog	2011-08-13 00:11:27 +0000
@@ -1,3 +1,26 @@
+ettercap (1:0.7.3-2.2ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable. (LP: #825584)
+  * 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
+
+ -- Mat Scales <[e-mail]>  Sat, 13 Aug 2011 01:08:23 +0100
+
+ettercap (1:0.7.3-2.2) unstable; urgency=low
+
+  * 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)
+
+ -- Tim Retout <[e-mail]>  Fri, 29 Jul 2011 19:15:22 +0100
+
 ettercap (1:0.7.3-2.1ubuntu1) natty; urgency=low
 
   * Merge from debian unstable, remaining changes:

=== modified file 'debian/control'
--- debian/control	2010-06-24 10:55:53 +0000
+++ debian/control	2011-08-13 00:11:27 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Murat Demirten <[e-mail]>
-Build-Depends: debhelper (>= 7), quilt (>= 0.46-7~), autotools-dev, autoconf, libncurses-dev, libgtk2.0-dev, libltdl7-dev, libssl0.9.8, libssl-dev, libpcap0.8-dev, libnet1-dev, libpcre3-dev 
+Build-Depends: debhelper (>= 7), quilt (>= 0.46-7~), autotools-dev, autoconf, libncurses-dev, libgtk2.0-dev, libltdl7-dev, libssl-dev, libpcap0.8-dev, libnet1-dev, libpcre3-dev 
 Standards-Version: 3.8.3
 
 Package: ettercap-common

=== added file 'debian/patches/03_fix_ltmain_check.diff'
--- debian/patches/03_fix_ltmain_check.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/03_fix_ltmain_check.diff	2011-08-13 00:11:27 +0000
@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -8346,7 +8346,7 @@
+   exit 1
+ fi
+ gentoo_lt_version="1.5.18"
+-gentoo_ltmain_version=`grep '^[:space:]*VERSION=' $ltmain | sed -e 's|^[:space:]*VERSION=||'`
++gentoo_ltmain_version=`grep '^[[:space:]]*VERSION=' $ltmain | sed -e 's|^[[:space:]]*VERSION=||'`
+ if test "$gentoo_lt_version" != "$gentoo_ltmain_version"; then
+   echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-06-24 10:55:53 +0000
+++ debian/patches/series	2011-08-13 00:11:27 +0000
@@ -1,3 +1,4 @@
 01_pointers_and_ints_dont_mix.diff
 02_configure_fix.diff
 02_file_permissions.diff
+03_fix_ltmain_check.diff