Package: gtk+2.0-directfb
Version: 2.0.9.2-14
Tags: patch
Several changes are needed in gtk+2.0-directfb at the moment.
I will NMU a new version with the changes described below as soon as I get
a bugnumber back for this report. Patch attached.
The first change is that gtk+2.0-directfb now needs to depend on
directfb-0.9-22 because it will not build anymore against the recently
uploaded new directfb (0.9-24).
This was discussed on the debian-boot mailinglist [1] and agreed with the
directfb maintainer as the best solution until gtk+2.0-directfb can be
dropped altogether after the release of new upstream cairo and gdk.
The second change is for the udeb dependency transition [2] that we have
been working on which will allow integration of the graphical installer
into the main d-i buildsystem.
These changes include:
- build depend on debhelper 5.0.28
- add --add-udeb option to dh_makeshlibs to generate udeb: lines in shlibs
control file in the library package
- use proper Depends: ${shlibs:Depends} for the udeb
- drop the Provides: libgtk-directfb-2.0-0 for the udeb
I've added a few temporary hacks to work around the few library packages
that do not have correct shlib files yet (or have an error in them).
Hopefully these can be removed on the next upload.
[1] http://lists.debian.org/debian-boot/2006/04/msg00338.html
[2] http://wiki.debian.org/DebianInstaller/LibraryUdebs
diff -u gtk+2.0-directfb-2.0.9.2/debian/control gtk+2.0-directfb-2.0.9.2/debian/control
--- gtk+2.0-directfb-2.0.9.2/debian/control
+++ gtk+2.0-directfb-2.0.9.2/debian/control
@@ -3,15 +3,14 @@
Priority: optional
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Uploaders: Alastair McKinstry <mckinstry@debian.org>
-Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev, libdirectfb-dev (>= 0.9.22), autoconf, dbs, automake1.4, libtool
+Build-Depends: debhelper (>= 5.0.28), libgtk2.0-dev, libdirectfb-0.9-22-dev, autoconf, dbs, automake1.4, libtool
Standards-Version: 3.6.2
Package: libgtk+2.0-directfb0-udeb
Priority: extra
Section: debian-installer
-Provides: libgtk-directfb-2.0-0
Architecture: any
-Depends: libc-udeb, libdirectfb-0.9-22
+Depends: ${shlibs:Depends}
XC-Package-Type: udeb
Description: gtk+2.0 implementation for the frame buffer
DirectFB is a thin library that provides hardware graphics acceleration, input
@@ -24,7 +23,7 @@
Section: libdevel
Priority: optional
Architecture: i386 ia64 arm alpha hppa mips mipsel sparc powerpc s390 m68k amd64 kfreebsd-i386
-Depends: libdirectfb-dev, libgtk+2.0-directfb0, pkg-config, libatk1.0-dev, libgtk2.0-dev, libpango1.0-dev
+Depends: libdirectfb-0.9-22-dev, libgtk+2.0-directfb0, pkg-config, libatk1.0-dev, libgtk2.0-dev, libpango1.0-dev
Description: gtk+2.0 implementation for the frame buffer, development files
DirectFB is a thin library that provides hardware graphics acceleration, input
device handling and abstraction, integrated windowing system with support for
diff -u gtk+2.0-directfb-2.0.9.2/debian/rules gtk+2.0-directfb-2.0.9.2/debian/rules
--- gtk+2.0-directfb-2.0.9.2/debian/rules
+++ gtk+2.0-directfb-2.0.9.2/debian/rules
@@ -4,7 +4,7 @@
# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
-export DH_COMPAT=4
+export DH_COMPAT=5
DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -84,17 +84,24 @@
dh_compress -a
dh_strip -a
dh_link -a
- dh_makeshlibs -n -X/usr/lib/directfb/gtk-2.0
+ dh_makeshlibs -n -X/usr/lib/directfb/gtk-2.0 --add-udeb="libgtk+2.0-directfb0-udeb"
dh_fixperms -a
# Should have been fixed by dh_fixperms?
chmod 0644 debian/libgtk+2.0-directfb0/usr/lib/directfb/libgdk_pixbuf-2.0.so.0.0.9
chmod 0644 debian/libgtk+2.0-directfb0-udeb/usr/lib/libgdk_pixbuf-2.0.so.0.0.9
dh_installdeb -a
- dh_shlibdeps -a
# Remove unnecessary and zero-byte files
rm -f debian/libgtk+2.0-directfb-dev/usr/share/doc/libgtk+2.0-directfb-dev/reference/gdk/gdk.types
rm -f debian/libgtk+2.0-directfb-dev/usr/share/doc/libgtk+2.0-directfb-dev/reference/gdk-pixbuf/gdk-pixbuf-overrides.txt
rm -f debian/libgtk+2.0-directfb-dev/usr/share/doc/libgtk+2.0-directfb-dev/reference/COPYING
+ dh_shlibdeps -a
+ # Get rid of self-dependency for the udeb
+ sed -i "s/libgtk+2.0-directfb0-udeb, //" debian/libgtk+2.0-directfb0-udeb.substvars
+ # TEMPORARY: Fix dependency for two libs that have not yet been transitioned
+ sed -i "s/libpango1.0-0 /libpango1.0-udeb /" debian/libgtk+2.0-directfb0-udeb.substvars
+ sed -i "s/libglib2.0-0 /libglib2.0-udeb /" debian/libgtk+2.0-directfb0-udeb.substvars
+ # TEMPORARY: Fix dependency error due to stipid typo for atk
+ sed -i "s/libtak/libatk/" debian/libgtk+2.0-directfb0-udeb.substvars
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
Attachment:
pgpQg3yDITDVH.pgp
Description: PGP signature