diff -Nru synaptic-0.63.1ubuntu13/debian/changelog synaptic-0.63.1ubuntu14/debian/changelog --- synaptic-0.63.1ubuntu13/debian/changelog 2010-07-30 13:03:01.000000000 +0100 +++ synaptic-0.63.1ubuntu14/debian/changelog 2010-09-18 17:46:19.000000000 +0100 @@ -1,3 +1,12 @@ +synaptic (0.63.1ubuntu14) maverick; urgency=low + + * 15_vte-terminal-seals-enabled-fix.dpatch: + - Replace direct access to adjustment variable in VteTerminal's to allow + for newer vte versions with VTE_SEAL_ENABLE defined and fix FTBFS in + this case (LP: #642121) + + -- Niall Creech Sat, 18 Sep 2010 17:45:06 +0100 + synaptic (0.63.1ubuntu13) maverick; urgency=low [ Michael Vogt ] diff -Nru synaptic-0.63.1ubuntu13/debian/patches/00list synaptic-0.63.1ubuntu14/debian/patches/00list --- synaptic-0.63.1ubuntu13/debian/patches/00list 2010-07-30 13:03:22.000000000 +0100 +++ synaptic-0.63.1ubuntu14/debian/patches/00list 2010-09-18 17:46:48.000000000 +0100 @@ -4,3 +4,4 @@ 04_ubuntu_lpi 06_ubuntu_su_to_root 10_ubuntu_maintenance_gui +15_vte-terminal-seals-enabled-fix.dpatch diff -Nru synaptic-0.63.1ubuntu13/debian/patches/00list.Ubuntu synaptic-0.63.1ubuntu14/debian/patches/00list.Ubuntu --- synaptic-0.63.1ubuntu13/debian/patches/00list.Ubuntu 2010-07-30 13:03:01.000000000 +0100 +++ synaptic-0.63.1ubuntu14/debian/patches/00list.Ubuntu 2010-09-18 17:46:32.000000000 +0100 @@ -4,3 +4,4 @@ 04_ubuntu_lpi 06_ubuntu_su_to_root 10_ubuntu_maintenance_gui +15_vte-terminal-seals-enabled-fix.dpatch diff -Nru synaptic-0.63.1ubuntu13/debian/patches/15_vte-terminal-seals-enabled-fix.dpatch synaptic-0.63.1ubuntu14/debian/patches/15_vte-terminal-seals-enabled-fix.dpatch --- synaptic-0.63.1ubuntu13/debian/patches/15_vte-terminal-seals-enabled-fix.dpatch 1970-01-01 01:00:00.000000000 +0100 +++ synaptic-0.63.1ubuntu14/debian/patches/15_vte-terminal-seals-enabled-fix.dpatch 2010-09-18 17:45:01.000000000 +0100 @@ -0,0 +1,41 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 15_vte-terminal-seals-enabled-fix.dpatch by Niall Creech +## Author: Niall Creech +## Description: Replace direct access to adjustment variable in VteTerminal's to allow for newer +## vte versions with VTE_SEAL_ENABLE defined and fix FTBFS in this case +## Ubuntu-Bug: https://bugs.edge.launchpad.net/ubuntu/+source/synaptic/+bug/642121 + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' synaptic-0.63.1ubuntu13~/gtk/rgdebinstallprogress.cc synaptic-0.63.1ubuntu13/gtk/rgdebinstallprogress.cc +--- synaptic-0.63.1ubuntu13~/gtk/rgdebinstallprogress.cc 2010-07-30 13:03:02.000000000 +0100 ++++ synaptic-0.63.1ubuntu13/gtk/rgdebinstallprogress.cc 2010-09-18 17:43:32.893607740 +0100 +@@ -334,7 +334,7 @@ + // it when run hidden. this workaround will scroll to the end of + // the current buffer + gtk_widget_realize(GTK_WIDGET(me->_term)); +- GtkAdjustment *a = GTK_ADJUSTMENT (VTE_TERMINAL(me->_term)->adjustment); ++ GtkAdjustment *a = GTK_ADJUSTMENT (vte_terminal_get_adjustment (VTE_TERMINAL(me->_term))); + gtk_adjustment_set_value(a, a->upper - a->page_size); + gtk_adjustment_value_changed(a); + +@@ -394,7 +394,7 @@ + _term = vte_terminal_new(); + vte_terminal_set_size(VTE_TERMINAL(_term),80,23); + GtkWidget *scrollbar = +- gtk_vscrollbar_new (GTK_ADJUSTMENT (VTE_TERMINAL(_term)->adjustment)); ++ gtk_vscrollbar_new (GTK_ADJUSTMENT (vte_terminal_get_adjustment (VTE_TERMINAL(_term)))); + GTK_WIDGET_UNSET_FLAGS (scrollbar, GTK_CAN_FOCUS); + vte_terminal_set_scrollback_lines(VTE_TERMINAL(_term), 10000); + if(_config->FindB("Synaptic::useUserTerminalFont")) { +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' synaptic-0.63.1ubuntu13~/gtk/rgterminstallprogress.cc synaptic-0.63.1ubuntu13/gtk/rgterminstallprogress.cc +--- synaptic-0.63.1ubuntu13~/gtk/rgterminstallprogress.cc 2010-07-30 13:03:02.000000000 +0100 ++++ synaptic-0.63.1ubuntu13/gtk/rgterminstallprogress.cc 2010-09-18 17:43:32.893607740 +0100 +@@ -62,7 +62,7 @@ + setTitle(_("Applying Changes")); + + _term = vte_terminal_new(); +- _scrollbar = gtk_vscrollbar_new (GTK_ADJUSTMENT (VTE_TERMINAL(_term)->adjustment)); ++ _scrollbar = gtk_vscrollbar_new (GTK_ADJUSTMENT (vte_terminal_get_adjustment (VTE_TERMINAL(_term)))); + GTK_WIDGET_UNSET_FLAGS (_scrollbar, GTK_CAN_FOCUS); + vte_terminal_set_scrollback_lines(VTE_TERMINAL(_term), 10000); + if(_config->FindB("Synaptic::useUserTerminalFont")) {