Package: gtkglextmm Version: 1.2.0-4 Severity: normal Tags: patch pending Dear maintainer,
I've prepared an NMU for gtkglextmm (versioned as 1.2.0-4.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Cheers Luk
diff -u gtkglextmm-1.2.0/debian/rules gtkglextmm-1.2.0/debian/rules --- gtkglextmm-1.2.0/debian/rules +++ gtkglextmm-1.2.0/debian/rules @@ -39,6 +39,9 @@ dh_testroot dh_prep $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + for file in debian/tmp/usr/lib/*.la; do \ + sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \ + done binary-indep: build install diff -u gtkglextmm-1.2.0/debian/changelog gtkglextmm-1.2.0/debian/changelog --- gtkglextmm-1.2.0/debian/changelog +++ gtkglextmm-1.2.0/debian/changelog @@ -1,3 +1,12 @@ +gtkglextmm (1.2.0-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove references to other libraries from dependency_libs field + (Closes: #620633). + * Define GdkSpanFunc (Closes: #621976). + + -- Luk Claes <l...@debian.org> Mon, 27 Jun 2011 08:17:17 +0200 + gtkglextmm (1.2.0-4) unstable; urgency=low * Switch libgtkglextmm-x11-1.2-doc to arch all. Closes: #517606. diff -u gtkglextmm-1.2.0/debian/patches/series gtkglextmm-1.2.0/debian/patches/series --- gtkglextmm-1.2.0/debian/patches/series +++ gtkglextmm-1.2.0/debian/patches/series @@ -1,0 +2 @@ +fix_ftbfs_gtk_2_20 only in patch2: unchanged: --- gtkglextmm-1.2.0.orig/gtkglext/gtkmm/gl/widget.loT +++ gtkglextmm-1.2.0/gtkglext/gtkmm/gl/widget.loT @@ -0,0 +1,7 @@ +# widget.lo - a libtool object file +# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06) +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. only in patch2: unchanged: --- gtkglextmm-1.2.0.orig/debian/patches/fix_ftbfs_gtk_2_20 +++ gtkglextmm-1.2.0/debian/patches/fix_ftbfs_gtk_2_20 @@ -0,0 +1,28 @@ +Description: Fix FTBFS due to missing GdkSpanFunc definition + . + The sequence of #include directives is important - if gtk/gtkglwidget.h + is included first, before widget.h, it includes gdk.h without undefing + GDK_DISABLE_DEPRECATED - this leads to GdkSpanFunc not being defined + and compilation errors. + The fix is to first include widget.h which includes the right gdkmm header + which defines GDK_DISABLE_DEPRECATED before including gdk.h. +Forwarded: no +Bug-Ubuntu: http://launchpad.net/bugs/662572 + +Index: gtkglextmm-1.2.0/gtkglext/gtkmm/gl/widget.cc +=================================================================== +--- gtkglextmm-1.2.0.orig/gtkglext/gtkmm/gl/widget.cc 2010-12-08 13:31:59.651270000 +0100 ++++ gtkglextmm-1.2.0/gtkglext/gtkmm/gl/widget.cc 2010-12-08 13:32:10.871270000 +0100 +@@ -17,10 +17,10 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + +-#include <gtk/gtkglwidget.h> +- + #include "widget.h" + ++#include <gtk/gtkglwidget.h> ++ + namespace Gtk + { + namespace GL
