gtk+2.0 (2.8.18-3) experimental; urgency=low

* 003_gtk+-2.8.17-directfb.patch: new patch, bringing a new directfb backend. * 004_reautoconf.patch: new patch, result of "libtoolize --force --copy; autoheader; automake -acf; autoconf; rm -rf autom4te.cache" with the previous patches applied. * Make 3 new packages: libgtk+2.0-directfb0-udeb, libgtk+2.0-directfb-dev and libgtk+2.0-directfb0. * Add a new build flavour for directfb (only the shared version). * Switch to debhelper compatibility mode 5 and require 5.0.22. * Standards-version is 3.7.2. -- Josselin Mouette <joss@debian.org> Sun, 25 Jun 2006 21:34:50 +0200
2006-06-25 19:39:51 +00:00
parent 7617969d1e 55c2c63dfd
commit 81071878f0
12 changed files with 70514 additions and 34 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,161 @@
+gtk+2.0 (2.8.18-3) experimental; urgency=low
+
+  * 003_gtk+-2.8.17-directfb.patch: new patch, bringing a new directfb
+    backend.
+  * 004_reautoconf.patch: new patch, result of "libtoolize --force
+    --copy; autoheader; automake -acf; autoconf; rm -rf autom4te.cache"
+    with the previous patches applied.
+  * Make 3 new packages: libgtk+2.0-directfb0-udeb,
+    libgtk+2.0-directfb-dev and  libgtk+2.0-directfb0.
+  * Add a new build flavour for directfb (only the shared version).
+  * Switch to debhelper compatibility mode 5 and require 5.0.22.
+  * Standards-version is 3.7.2.
+
+ -- Josselin Mouette <joss@debian.org>  Sun, 25 Jun 2006 21:34:50 +0200
+
+gtk+2.0 (2.8.18-2) UNRELEASED; urgency=low
+
+  * Bump libgtk2.0-dev dependency and build-dep on libx11-dev to >= 2:1.0.0-6
+    as it ships x11.pc which ends up in the Requires of gdk-x11-2.0.pc.
+    (Closes: #326199, #370693)
+    [debian/control, debian/control.in]
+
+ -- Loic Minier <lool@dooz.org>  Tue,  6 Jun 2006 15:18:28 +0200
+
+gtk+2.0 (2.8.18-1) unstable; urgency=low
+
+  * New upstream version:
+    Bugs fixed:
+    - search box positioning has some bugs
+    - Gdk does not translate VK_NUMPADx to GDK_KP_x  
+    - sanely handle late (re)setting of dnd image   
+    - Text is shifted off-by-one in Add to panel 
+    - gtk_widget_create_pango_layout docs typo
+    - GtkLayout In GtkScrolledWindow does not receive the scroll_event
+    - gtktreeview has RTL problems with toggle buttons if using gtktreestore 
+      as a model    
+    - Wrong drop location in GtkEntry     
+    - GtkImage animation CRITICALS on switching themes 
+    - DnD: Conditional jump or move depends on uninitialised value
+    - cursor blocked to dnd mode after using shift and dnd on a GtkCalendar
+    - Crashes while creating source code w/GtkFontSelection
+    - the right edge tab does not appear when switching tab
+    - Warning in gtk_paned_compute_position 
+    - gdk should set resolution on PangoCairoFontmap, not PangoCairoContext
+    - GtkTreeView does not resize correctly
+    - gtk_tree_view_get_cell_area() forgets depth-one expander
+    - expander animation not working in RTL mode
+    - Multiple issues discovered by Coverity  
+    - Make gtk_file_chooser_button_new() friendlier for language bindings
+
+ -- Sebastien Bacher <seb128@debian.org>  Tue, 30 May 2006 17:02:26 +0200
+
+gtk+2.0 (2.8.17-1) unstable; urgency=low
+
+  * New upstream version:
+    Bugs fixed:
+    - Expander disclosure button is too small
+    - gtk_image_clear doesn't cause redraw
+    - typo in configure.in yields suspicious warning
+    - gtk_icon_view_set_cursor causes Segmentation fault
+    - garbage output of --help in non UTF-8 locale
+    - GtkNotebook does not destroy its children on destroy()
+    - TreeView DnD between-row highlight colo
+    - Gtk-Criticals occur when scrolling a text_view that is not realized
+    - Hidden menubar still activates submenus with kbd
+    - GtkTreeItem broken 
+    -  Clean up button press handling (use one-grab-op-at-a-time pattern)   
+    - broken scrolling when selecting
+    - GTK+ File-chooser dialog crashes
+    - Nautilus crashes when dragging icons to another screen
+    - mixed line separators confuse gtk_text_iter_ends_line
+    - Textview child is covered by window border
+    - gdk_pixbuf_loader_new_with_type(): What image types are allowed? 
+    - Missing progress bar label
+    - Fix a problem which caused grab-notify signal to be missed in some cases
+  * debian/control.in:
+    - clear the Build-Depends on xlibs-static-pic | xlibs-pic, not required
+    - updated the Build-Depends on libpango1.0-dev so it build with 
+      the xorg transitioned version
+  * * debian/patches/001_default_fallback_icon_theme.patch:
+    - set the default fallback icon theme to "gnome", fixes the issues with
+      the moves of icons from hicolor to gnome
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun,  9 Apr 2006 21:54:11 +0200
+
+gtk+2.0 (2.8.16-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Sebastien Bacher <seb128@debian.org>  Wed, 15 Mar 2006 19:26:46 +0100
+
+gtk+2.0 (2.8.15-1) unstable; urgency=low
+
+  * New upstream version:
+    * Bugs fixed:
+      - Keys P and N in "open file" dialog have special meaning
+      - MS-Windows theme (GTK-Wimp) shows all funky characters
+      - Optimize gdk on win32 
+      - Hollow polygons have wrong linecaps 
+      - panel crash with a11y enabled
+    * Updated translations (bg,bn,cs,eu,ro)
+
+ -- Sebastien Bacher <seb128@debian.org>  Tue, 14 Mar 2006 15:41:56 +0100
+
+gtk+2.0 (2.8.13-1) unstable; urgency=low
+
+  * New upstream version:
+    * Bugs fixed:
+    - Can't select some items in GtkIconView 
+    - gtk_icon_theme_list_icons: example contexts don't work
+    - gnopernicus crashes on changing display screen source for magnifier
+    - evince crashes in gdk_region_union_with_rect 
+    - Small error in _gdk_gc_update_context 
+    - gtk.Notebook.get_current_page() returns incorrect page number 
+      when pages hidden
+    - GtkAboutDialog not responsive to Escape key
+    - GtkNotebook popup menu not keynavigatable
+    - GtkRadioButton does not issue notify::active
+    - Make more use of G_DISABLE_ASSERT in TextView code  
+    * Updated translations 
+
+ -- Sebastien Bacher <seb128@debian.org>  Sat, 25 Feb 2006 23:56:58 +0100
+
+gtk+2.0 (2.8.12-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * [debian/copyright] Updated FSF's address.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Sun, 12 Feb 2006 14:11:11 +0100
+
+gtk+2.0 (2.8.11-1) unstable; urgency=low
+
+  * New upstream version
+    * Avoid memory overruns in the pixbuf theme engine with nonsensical 
+      gradient specifications.  [Matthias]
+    * Bugs fixed:
+    - Cursor doesn't move as expected
+    - Segfault from combination of gtk_container_set_resize_mode() 
+      and GtkComboBox
+    - segfault in update_cursor on amd64
+    - eog crashes at launch under AIX 
+    - "~" should bring up the location dialog
+    - gtk_text_layout_get_cursor_locations() chokes on layout=0x0
+    * Documentation improvements [Federico Mena Quintero]
+    * Translation updates (es,pt_BR,zh_HK,zh_TW)
+
+ -- Sebastien Bacher <seb128@debian.org>  Fri, 27 Jan 2006 22:28:05 +0100
+
+gtk+2.0 (2.8.10-1) unstable; urgency=low
+
+  * New upstream version
+  * debian/control.in:
+    - updated the glib requirement
+  * debian/patches/001_fs_documents.patch:
+    - dropped, stick with upstream behaviour rather
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu, 12 Jan 2006 13:34:37 +0100
+
 gtk+2.0 (2.8.9-2) unstable; urgency=low

  * Upload to unstable
--- a/debian/compat
+++ b/debian/compat
@ -1 +1 @@
-4
+5
--- a/debian/control
+++ b/debian/control
@ -2,10 +2,10 @@ Source: gtk+2.0
 Section: libs
 Priority: optional
 Maintainer: Sebastien Bacher <seb128@debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Akira TAGOH <tagoh@debian.org>, Andreas Rottmann <rotty@debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, Carlos Perelló Marín <carlos@pemas.net>, Clément Stenac <zorglub@debian.org>, Ed Boraas <ed@debian.org>, Edd Dumbill <ejad@debian.org>, Emil Soleyman-Zomalan <emil@nishra.com>, Guilherme de S. Pastore <guilherme.pastore@terra.com.br>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Joe Drew <drew@debian.org>, Johannes Rohr <jr.debian@rohr.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>, Marc HE Brockschmidt <he@debian.org>, Ondřej Surý <ondrej@debian.org>, Rob Bradford <rob@debianplanet.org>, Robert McQueen <robot101@debian.org>, Ross Burton <ross@debian.org>, Sjoerd Simons <sjoerd@debian.org>, Takuo KITAME <kitame@debian.org>
-Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.7.1), libpango1.0-dev (>= 1.10.0-2), libatk1.0-dev (>= 1.6.1-2), xlibs-static-pic | xlibs-pic (>= 4.2.1-6), libx11-dev, libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Akira TAGOH <tagoh@debian.org>, Andreas Rottmann <rotty@debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, Clément Stenac <zorglub@debian.org>, Dafydd Harries <daf@debian.org>, Guilherme de S. Pastore <gpastore@debian.org>, Gustavo Franco <stratus@debian.org>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>, Marc HE Brockschmidt <he@debian.org>, Marco Cabizza <marco87@gmail.com>, Ondřej Surý <ondrej@debian.org>, Ross Burton <ross@debian.org>, Sjoerd Simons <sjoerd@debian.org>, Takuo KITAME <kitame@debian.org>
+Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.6.1-2), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev, libcairo-directfb2-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools
 Build-Depends-Indep: gtk-doc-tools, docbook-xml
-Standards-Version: 3.6.1.0
+Standards-Version: 3.7.2

 Package: libgtk2.0-0
 Section: libs
@ -22,6 +22,34 @@ Description: The GTK+ graphical user interface library
 .
 This package contains the shared libraries.

+Package: libgtk+2.0-directfb0
+Section: libs
+Architecture: any
+Depends: libgtk2.0-0 (= ${Source-Version}), ${shlibs:Depends}
+Description: The GTK+ graphical user interface library - DirectFB runtime
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This version uses DirectFB, a thin library providing an integrated 
+ windowing system and hardware acceleration on top of the Linux 
+ framebuffer.
+
+Package: libgtk+2.0-directfb0-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: The GTK+ graphical user interface library - minimal runtime
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This package contains the minimal runtime library using DirectFB needed
+ by the Debian installer.
+
 Package: libgtk2.0-common
 Section: misc
 Architecture: all
@ -54,7 +82,7 @@ Description: The programs for the GTK+ graphical user interface library
 Package: libgtk2.0-dev
 Section: libdevel
 Architecture: any
-Depends: libgtk2.0-0 (= ${Source-Version}), libglib2.0-dev (>= 2.7.1), libpango1.0-dev (>= 1.10.0-2), libatk1.0-dev (>= 1.6.1-2), libcairo2-dev, libx11-dev, libxext-dev, libxinerama-dev, libxi-dev, libxrandr-dev, libxcursor-dev, libxfixes-dev, pkg-config
+Depends: libgtk2.0-0 (= ${Source-Version}), libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.10.0-2), libatk1.0-dev (>= 1.6.1-2), libcairo2-dev, libx11-dev (>= 2:1.0.0-6), libxext-dev, libxinerama-dev, libxi-dev, libxrandr-dev, libxcursor-dev, libxfixes-dev, pkg-config
 Suggests: libgtk2.0-doc
 Replaces: libgtk1.3-dev
 Conflicts: libgtk1.3-dev
@ -67,6 +95,20 @@ Description: Development files for the GTK+ library
 This package contains the header files and static libraries which is
 needed for developing the GTK+ applications.

+Package: libgtk+2.0-directfb-dev
+Section: libdevel
+Architecture: any
+Depends: libgtk+2.0-directfb0 (= ${Source-Version}), libgtk2.0-dev (= ${Source-Version}), libcairo-directfb2-dev
+Description: Development files for the GTK+ library - DirectFB version
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This package contains the header files and static libraries which is
+ needed for developing the GTK+ applications on top of the DirectFB
+ library.
+
 Package: libgtk2.0-0-dbg
 Section: libdevel
 Priority: extra
--- a/debian/control.in
+++ b/debian/control.in
@ -3,9 +3,9 @@ Section: libs
 Priority: optional
 Maintainer: Sebastien Bacher <seb128@debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.7.1), libpango1.0-dev (>= 1.10.0-2), libatk1.0-dev (>= 1.6.1-2), xlibs-static-pic | xlibs-pic (>= 4.2.1-6), libx11-dev, libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools
+Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.6.1-2), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev, libcairo-directfb2-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools
 Build-Depends-Indep: gtk-doc-tools, docbook-xml
-Standards-Version: 3.6.1.0
+Standards-Version: 3.7.2

 Package: libgtk2.0-@SONAME@
 Section: libs
@ -22,6 +22,34 @@ Description: The GTK+ graphical user interface library
 .
 This package contains the shared libraries.

+Package: libgtk+2.0-directfb@SONAME@
+Section: libs
+Architecture: any
+Depends: libgtk2.0-@SONAME@ (= ${Source-Version}), ${shlibs:Depends}
+Description: The GTK+ graphical user interface library - DirectFB runtime
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This version uses DirectFB, a thin library providing an integrated 
+ windowing system and hardware acceleration on top of the Linux 
+ framebuffer.
+
+Package: libgtk+2.0-directfb@SONAME@-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: The GTK+ graphical user interface library - minimal runtime
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This package contains the minimal runtime library using DirectFB needed
+ by the Debian installer.
+
 Package: libgtk2.0-common
 Section: misc
 Architecture: all
@ -54,7 +82,7 @@ Description: The programs for the GTK+ graphical user interface library
 Package: libgtk2.0-dev
 Section: libdevel
 Architecture: any
-Depends: libgtk2.0-@SONAME@ (= ${Source-Version}), libglib2.0-dev (>= 2.7.1), libpango1.0-dev (>= 1.10.0-2), libatk1.0-dev (>= 1.6.1-2), libcairo2-dev, libx11-dev, libxext-dev, libxinerama-dev, libxi-dev, libxrandr-dev, libxcursor-dev, libxfixes-dev, pkg-config
+Depends: libgtk2.0-@SONAME@ (= ${Source-Version}), libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.10.0-2), libatk1.0-dev (>= 1.6.1-2), libcairo2-dev, libx11-dev (>= 2:1.0.0-6), libxext-dev, libxinerama-dev, libxi-dev, libxrandr-dev, libxcursor-dev, libxfixes-dev, pkg-config
 Suggests: libgtk2.0-doc
 Replaces: libgtk1.3-dev
 Conflicts: libgtk1.3-dev
@ -67,6 +95,20 @@ Description: Development files for the GTK+ library
 This package contains the header files and static libraries which is
 needed for developing the GTK+ applications.

+Package: libgtk+2.0-directfb-dev
+Section: libdevel
+Architecture: any
+Depends: libgtk+2.0-directfb@SONAME@ (= ${Source-Version}), libgtk2.0-dev (= ${Source-Version}), libcairo-directfb2-dev
+Description: Development files for the GTK+ library - DirectFB version
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This package contains the header files and static libraries which is
+ needed for developing the GTK+ applications on top of the DirectFB
+ library.
+
 Package: libgtk2.0-@SONAME@-dbg
 Section: libdevel
 Priority: extra
--- a/debian/copyright
+++ b/debian/copyright
@ -38,20 +38,19 @@ Owen Taylor       <otaylor@gtk.org>

 License:

- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.

- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
+ This library is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ for more details.

 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301  USA.

 See /usr/share/common-licenses/LGPL-2 on your debian system.
-
--- a/debian/libgtk2.0-directfb-dev.files
+++ b/debian/libgtk2.0-directfb-dev.files
@ -0,0 +1,3 @@
+usr/include
+usr/lib/lib*.{so,a}
+usr/lib/pkgconfig
--- a/debian/patches/001_default_fallback_icon_theme.patch
+++ b/debian/patches/001_default_fallback_icon_theme.patch
@ -0,0 +1,12 @@
+diff -Nur gtk+-2.8.13.orig/gtk/gtkicontheme.c gtk+-2.8.13/gtk/gtkicontheme.c
+--- gtk+-2.8.13.orig/gtk/gtkicontheme.c	2006-02-13 03:33:31.000000000 +0100
+++ gtk+-2.8.13/gtk/gtkicontheme.c	2006-02-26 00:09:20.000000000 +0100
+@@ -421,6 +421,8 @@
+ 			"gtk-fallback-icon-theme", &fallback_theme, NULL);
+ 	}
+ 
+      if (!fallback_theme)
+	fallback_theme = g_strdup ("gnome");
+       if (!theme)
+ 	theme = g_strdup (DEFAULT_THEME_NAME);
+ 
--- a/debian/patches/003_gtk+-2.8.17-directfb.patch
+++ b/debian/patches/003_gtk+-2.8.17-directfb.patch
--- a/debian/patches/004_reautoconf.patch
+++ b/debian/patches/004_reautoconf.patch
--- a/debian/rules
+++ b/debian/rules
@ -7,6 +7,7 @@ include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 BUILD_DIR=$(SOURCE_DIR)/$(TAR_DIR)
 BUILD_SHARED_DIR=$(SOURCE_DIR)/$(TAR_DIR)-shared
 BUILD_STATIC_DIR=$(SOURCE_DIR)/$(TAR_DIR)-static
+BUILD_DFB_DIR=$(SOURCE_DIR)/$(TAR_DIR)-dfb

 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@ -40,7 +41,6 @@ glibver=2.0
 atkver=1.0
 pangover=1.0
 shver=2.8.0
-libpath=$(CURDIR)/$(BUILD_SHARED_DIR)/gdk-pixbuf/.libs:$(CURDIR)/$(BUILD_SHARED_DIR)/gdk/.libs:$(CURDIR)/$(BUILD_SHARED_DIR)/gtk/.libs


 debian/control:
@ -118,7 +118,36 @@ $(STAMP_DIR)/configure-static-stamp:

 	touch $@

-configure: configure-static configure-shared
+configure-dfb: extract $(STAMP_DIR)/configure-dfb-stamp
+$(STAMP_DIR)/configure-dfb-stamp:
+	dh_testdir
+
+	cp -ar $(BUILD_DIR) $(BUILD_DFB_DIR)
+
+	# Add here commands to configure the package.
+	cd $(BUILD_DFB_DIR) && \
+	./configure	--host=$(DEB_HOST_GNU_TYPE) \
+			--build=$(DEB_BUILD_GNU_TYPE) \
+			--prefix=/usr \
+			--mandir=\$${prefix}/share/man \
+			--infodir=\$${prefix}/share/info \
+			--sysconfdir=/etc \
+			--with-html-dir=\$${prefix}/share/doc/libgtk$(apiver)-doc \
+			--with-xinput=no \
+			--enable-shared \
+			--disable-static \
+			--with-gdktarget=directfb \
+			--enable-explicit-deps=yes
+
+	cd $(BUILD_DFB_DIR) && \
+	sed < libtool > libtool-2 \
+	 -e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' \
+	 -e '/^archive_cmds="/s/"$$/ \\$$deplibs"/' && \
+	mv libtool-2 libtool
+
+	touch $@
+
+configure: configure-static configure-shared configure-dfb

 build-shared: debian/control configure-shared $(STAMP_DIR)/build-shared-stamp
 $(STAMP_DIR)/build-shared-stamp:
@ -127,8 +156,7 @@ $(STAMP_DIR)/build-shared-stamp:
 	-rm -f $(STAMP_DIR)/install-test-stamp

 	# Add here commands to compile the package.
-	$(MAKE) -C $(BUILD_SHARED_DIR) \
-		LD_LIBRARY_PATH=$(libpath):$(LD_LIBRARY_PATH)
+	$(MAKE) -C $(BUILD_SHARED_DIR)

 	touch $@

@ -144,7 +172,18 @@ $(STAMP_DIR)/build-static-stamp:

 	touch $@

-build: build-static build-shared
+build-dfb: debian/control configure-dfb $(STAMP_DIR)/build-dfb-stamp
+$(STAMP_DIR)/build-dfb-stamp:
+	dh_testdir
+
+	-rm -f $(STAMP_DIR)/install-test-stamp
+
+	# Add here commands to compile the package.
+	$(MAKE) -C $(BUILD_DFB_DIR)
+
+	touch $@
+
+build: build-static build-shared build-dfb

 clean:: debian/control
 	dh_testdir
@ -154,6 +193,7 @@ clean:: debian/control
 	$(MAKE) -f debian/sys-build.mk source.clean
 	-rm -rf $(BUILD_SHARED_DIR)
 	-rm -rf $(BUILD_STATIC_DIR)
+	-rm -rf $(BUILD_DFB_DIR)
 	-rm -rf $(STAMP_DIR)

 	dh_clean
@ -179,12 +219,35 @@ install-static: build-static install-test
 		RUN_QUERY_IMMODULES_TEST=false \
 		RUN_QUERY_LOADER_TEST=false

-install: install-static install-shared
+install-dfb: build-shared install-test
+	# Add here commands to install the package into debian/tmp
+	dest=$(CURDIR)/debian/libgtk+$(apiver)-directfb$(soname)$(suffix)
+	$(MAKE) -C $(BUILD_SHARED_DIR) install DESTDIR=$(dest)
+	find $(dest) -name \*.la -exec rm -f \{\} \;
+	mkdir -p $(dest)-udeb/etc/gtk-2.0
+	$(BUILD_SHARED_DIR)/gdk-pixbuf/gdk-pixbuf-query-loaders \
+		$(dest)/usr/lib/gtk-2.0/*/loaders | \
+		sed s,$(dest),, > $(dest)-udeb/etc/gtk-2.0/gdk-pixbuf.loaders
+
+install: install-static install-shared install-dfb
 	# generating debian files from .in
 	for f in `find debian/ -name "[^c]*.in"`; do \
 		sed -e "s/@VERSION@/${version}/g" -e "s/@MODVER@/${modver}/g" -e "s/@APIVER@/${apiver}/g" $$f > `echo $$f | sed -e "s/\.in//"`; \
 	done

+	# start with the udeb
+	mkdir -p debian/libgtk+$(apiver)-directfb$(soname)$(suffix)-udeb/usr/lib/gtk-2.0
+	cp debian/libgtk+$(apiver)-directfb$(soname)$(suffix)/usr/lib/*.so.? \
+		debian/libgtk+$(apiver)-directfb$(soname)$(suffix)-udeb/usr/lib/
+	cp -r debian/libgtk+$(apiver)-directfb$(soname)$(suffix)/usr/lib/gtk-2.0/[0-9]* \
+		debian/libgtk+$(apiver)-directfb$(soname)$(suffix)-udeb/usr/lib/gtk-2.0/
+	rm -rf debian/libgtk+$(apiver)-directfb$(soname)$(suffix)-udeb/usr/lib/gtk-2.0/*/{engines,immodules}
+
+	# remove files that are already here in the other build
+	cd debian/libgtk$(apiver)-$(soname)$(suffix) && \
+		find -type f -exec \
+		rm -f ../libgtk+$(apiver)-directfb$(soname)$(suffix)/\{\} \;
+
 	# for -doc
 	cp -a $(BUILD_SHARED_DIR)/docs/faq/html debian/libgtk$(apiver)-doc/usr/share/doc/libgtk$(apiver)-doc/gtk-faq
 	cp -a $(CURDIR)/debian/gtk-faq.devhelp debian/libgtk$(apiver)-doc/usr/share/doc/libgtk$(apiver)-doc/gtk-faq/
@ -209,7 +272,9 @@ install: install-static install-shared
 	# clean the unnecessary files up
 	rm -rf debian/libgtk$(apiver)-$(soname)$(suffix)/usr/share/gtk-doc

-	dh_movefiles --sourcedir=debian/libgtk$(apiver)-$(soname)$(suffix)
+	dh_movefiles -Nlibgtk+$(apiver)-directfb-dev --sourcedir=debian/libgtk$(apiver)-$(soname)$(suffix)
+	dh_movefiles -plibgtk+$(apiver)-directfb-dev --sourcedir=debian/libgtk+$(apiver)-directfb$(soname)$(suffix)
+
 	-find $(CURDIR)/debian/ -type d -empty | xargs rmdir -p > /dev/null 2>&1

 	# don't delete /etc/gtk-2.0
@ -267,6 +332,8 @@ binary-arch: build install

 	rm -rf $(CURDIR)/debian/libgtk$(apiver)-$(soname)-dbg/usr/share/doc/libgtk$(apiver)-$(soname)-dbg
 	rm -rf $(CURDIR)/debian/libgtk$(apiver)-dev/usr/share/doc/libgtk$(apiver)-dev
+	rm -rf $(CURDIR)/debian/libgtk+$(apiver)-directfb$(soname)/usr/share/doc/libgtk+$(apiver)-directfb$(soname)
+	rm -rf $(CURDIR)/debian/libgtk+$(apiver)-directfb-dev/usr/share/doc/libgtk+$(apiver)-directfb-dev
 	rm -rf $(CURDIR)/debian/libgtk$(apiver)-bin/usr/share/doc/libgtk$(apiver)-bin

 	dh_link -plibgtk$(apiver)-$(soname)-dbg \
@ -275,6 +342,12 @@ binary-arch: build install
 	dh_link -plibgtk$(apiver)-dev \
 		usr/share/doc/libgtk$(apiver)-$(soname)$(suffix) \
 		usr/share/doc/libgtk$(apiver)-dev
+	dh_link -plibgtk+$(apiver)-directfb$(soname) \
+		usr/share/doc/libgtk$(apiver)-$(soname)$(suffix) \
+		usr/share/doc/libgtk+$(apiver)-directfb$(soname)
+	dh_link -plibgtk+$(apiver)-directfb-dev \
+		usr/share/doc/libgtk$(apiver)-$(soname)$(suffix) \
+		usr/share/doc/libgtk+$(apiver)-directfb-dev
 	dh_link -plibgtk$(apiver)-bin \
 		usr/share/doc/libgtk$(apiver)-$(soname)$(suffix) \
 		usr/share/doc/libgtk$(apiver)-bin
@ -286,17 +359,15 @@ binary-arch: build install
 	dh_installman -a
 	dh_installinfo -a
 	dh_installchangelogs -a $(BUILD_DIR)/ChangeLog
-	dh_strip -a --dbg-package=libgtk$(apiver)-$(soname)
+	dh_strip -a --dbg-package=libgtk$(apiver)-$(soname)-dbg
 	dh_compress -a
 	dh_fixperms -a
-	dh_makeshlibs -a -Nlibgtk$(apiver)-$(soname)-dbg
-	dh_makeshlibs -n -X usr/lib/gtk-$(apiver) -plibgtk$(apiver)-$(soname)$(suffix) -V "libgtk${apiver}-${soname}${suffix} (>= ${shver})"
+	dh_makeshlibs -a -X usr/lib/gtk-$(apiver) -plibgtk$(apiver)-$(soname)$(suffix) -V "libgtk${apiver}-${soname}${suffix} (>= ${shver})" --add-udeb=libgtk+$(apiver)-directfb$(soname)-dbg
 	dh_installdeb -a
-	dh_shlibdeps -l$(libpath) -a
-	cat debian/*/DEBIAN/shlibs > debian/shlibs.local
+	dh_shlibdeps -a
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a

 binary: binary-indep binary-arch
-.PHONY: build build-shared build-static clean binary-indep binary-arch binary install install-shared install-static configure configure-shared configure-static debian/control
+.PHONY: build build-shared build-static build-dfb clean binary-indep binary-arch binary install install-shared install-static install-dfb configure configure-shared configure-static configure-dfb debian/control
--- a/debian/scripts/vars
+++ b/debian/scripts/vars
@ -8,7 +8,7 @@
 SOURCE_DIR=build-tree
 # For a single pkg, this is the directory that is embedded in the tarball.
 # For multiple pkgs, this is null.
-TAR_DIR=gtk+-2.8.9
+TAR_DIR=gtk+-2.8.18
 # Where to place all the stamp files.  This directory can be removed, and
 # all the targets will then be rerun.
 STAMP_DIR=debian/stampdir
--- a/debian/sources
+++ b/debian/sources
@ -1 +1 @@
-upstream tar ../gtk+-2.8.9.tar.gz
+upstream tar ../gtk+-2.8.18.tar.gz