diff -Nru scli-0.4.0/debian/changelog scli-0.4.0/debian/changelog --- scli-0.4.0/debian/changelog 2011-03-11 07:23:16.000000000 +0000 +++ scli-0.4.0/debian/changelog 2011-07-02 18:09:12.000000000 +0000 @@ -1,3 +1,9 @@ +scli (0.4.0-2ubuntu1) oneiric; urgency=low + + * glib-includes.patch: fix FTBFS (LP: #756098). + + -- Ilya Barygin Sat, 02 Jul 2011 22:08:45 +0400 + scli (0.4.0-2) unstable; urgency=low * Move to quilt 3.0 source format diff -Nru scli-0.4.0/debian/control scli-0.4.0/debian/control --- scli-0.4.0/debian/control 2011-03-11 07:23:16.000000000 +0000 +++ scli-0.4.0/debian/control 2011-07-02 17:40:44.000000000 +0000 @@ -1,7 +1,8 @@ Source: scli Section: net Priority: optional -Maintainer: Stefan Bauer +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Stefan Bauer Build-Depends: debhelper (>= 7.0.50~), libgsnmp0-dev (>= 0.3.0), libreadline-dev, libglib2.0-dev, libncurses-dev, libsmi2-dev, libtool, automake1.9, libxml2-dev, libgnet-dev, texinfo Standards-Version: 3.9.1 DM-Upload-Allowed: yes diff -Nru scli-0.4.0/debian/patches/glib-includes.patch scli-0.4.0/debian/patches/glib-includes.patch --- scli-0.4.0/debian/patches/glib-includes.patch 1970-01-01 00:00:00.000000000 +0000 +++ scli-0.4.0/debian/patches/glib-includes.patch 2011-07-02 18:08:20.000000000 +0000 @@ -0,0 +1,87 @@ +Description: Add GLIB_CFLAGS where they're needed. It is necessary because + include path for glib may differ from paths for other headers. +Author: Ilya Barygin +Bug-Ubuntu: https://launchpad.net/bugs/756098 +--- scli-0.4.0.orig/configure ++++ scli-0.4.0/configure +@@ -4161,8 +4161,8 @@ echo $ECHO_N "checking for GNET - versio + if test "x$enable_gnettest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" +- CFLAGS="$CFLAGS $GNET_CFLAGS" +- LIBS="$GNET_LIBS $LIBS" ++ CFLAGS="$CFLAGS $GLIB_CFLAGS $GNET_CFLAGS" ++ LIBS="$GNET_LIBS $GLIB_LIBS $LIBS" + rm -f conf.gnettest + if test "$cross_compiling" = yes; then + echo $ac_n "cross compiling; assumed OK... $ac_c" +--- scli-0.4.0.orig/aclocal.m4 ++++ scli-0.4.0/aclocal.m4 +@@ -284,8 +284,8 @@ AC_ARG_ENABLE(gnettest, [ --disable-gne + if test "x$enable_gnettest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" +- CFLAGS="$CFLAGS $GNET_CFLAGS" +- LIBS="$GNET_LIBS $LIBS" ++ CFLAGS="$CFLAGS $GLIB_CFLAGS $GNET_CFLAGS" ++ LIBS="$GNET_LIBS $GLIB_LIBS $LIBS" + dnl + dnl Now check if the installed GNET is sufficiently new. (Also sanity + dnl checks the results of pkg-config to some extent) +--- scli-0.4.0.orig/stub/Makefile.am ++++ scli-0.4.0/stub/Makefile.am +@@ -1,4 +1,4 @@ +-AM_CPPFLAGS = $(GSNMP_CFLAGS) $(GNET_CFLAGS) ++AM_CPPFLAGS = $(GSNMP_CFLAGS) $(GNET_CFLAGS) $(GLIB_CFLAGS) + + MIBS = IF-MIB \ + IANAifType-MIB \ +--- scli-0.4.0.orig/stub/Makefile.in ++++ scli-0.4.0/stub/Makefile.in +@@ -189,7 +189,7 @@ sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-AM_CPPFLAGS = $(GSNMP_CFLAGS) $(GNET_CFLAGS) ++AM_CPPFLAGS = $(GSNMP_CFLAGS) $(GNET_CFLAGS) $(GLIB_CFLAGS) + MIBS = IF-MIB \ + IANAifType-MIB \ + IP-MIB \ +--- scli-0.4.0.orig/proc/Makefile.am ++++ scli-0.4.0/proc/Makefile.am +@@ -1,4 +1,4 @@ +-AM_CPPFLAGS = $(GSNMP_CFLAGS) $(GNET_CFLAGS) -I$(top_srcdir)/stub ++AM_CPPFLAGS = $(GSNMP_CFLAGS) $(GNET_CFLAGS) $(GLIB_CFLAGS) -I$(top_srcdir)/stub + + PROCS = if-mib-proc.h if-mib-proc.c \ + rapid-city-proc.h rapid-city-proc.c \ +--- scli-0.4.0.orig/proc/Makefile.in ++++ scli-0.4.0/proc/Makefile.in +@@ -172,7 +172,7 @@ sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-AM_CPPFLAGS = $(GSNMP_CFLAGS) $(GNET_CFLAGS) -I$(top_srcdir)/stub ++AM_CPPFLAGS = $(GSNMP_CFLAGS) $(GNET_CFLAGS) $(GLIB_CFLAGS) -I$(top_srcdir)/stub + PROCS = if-mib-proc.h if-mib-proc.c \ + rapid-city-proc.h rapid-city-proc.c \ + productmib-proc.h productmib-proc.c \ +--- scli-0.4.0.orig/scli/Makefile.am ++++ scli-0.4.0/scli/Makefile.am +@@ -1,4 +1,4 @@ +-AM_CPPFLAGS = -I$(top_srcdir)/stub -I$(top_srcdir)/proc $(GSNMP_CFLAGS) $(GNET_CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) $(XML_CPPFLAGS) ++AM_CPPFLAGS = -I$(top_srcdir)/stub -I$(top_srcdir)/proc $(GSNMP_CFLAGS) $(GNET_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) $(XML_CPPFLAGS) + + EXTRA_DIST = oui.c + +--- scli-0.4.0.orig/scli/Makefile.in ++++ scli-0.4.0/scli/Makefile.in +@@ -181,7 +181,7 @@ sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-AM_CPPFLAGS = -I$(top_srcdir)/stub -I$(top_srcdir)/proc $(GSNMP_CFLAGS) $(GNET_CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) $(XML_CPPFLAGS) ++AM_CPPFLAGS = -I$(top_srcdir)/stub -I$(top_srcdir)/proc $(GSNMP_CFLAGS) $(GNET_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) $(XML_CPPFLAGS) + EXTRA_DIST = oui.c + scli_SOURCES = scli.c scli.h scli.1 vendors.c \ + basic.c monitor.c cmds.c thread.c \ diff -Nru scli-0.4.0/debian/patches/series scli-0.4.0/debian/patches/series --- scli-0.4.0/debian/patches/series 2011-03-11 07:23:16.000000000 +0000 +++ scli-0.4.0/debian/patches/series 2011-07-02 18:06:26.000000000 +0000 @@ -1 +1,2 @@ debian-changes-0.4.0-2 +glib-includes.patch