On Saturday 08 April 2006 19:11, Guillem Jover wrote: > I'll be uploading the new directfb after 2006-04-09 dinstall run. > As libsysfs2 has migrated to testing already, there should be no > problem related to this. In regard to dependent packages, Frans > reported that gtk+2.0-directfb does not build anymore, if you think > you need more time to fix this, I can delay the upload. We have discussed on d-boot how best to deal with this situation and the conclusion is that we're kind of caught between a rock and a hard place. We should really like to move to newer versions of the libraries, but that needs upstream releases of GDK and Cairo and having them packaged in Debian. Both should happen soon. Trying to adapt gtk+-directfb-2.0.9 to work with new directfb seems a lot of wasted effort as it is only a temporary situation we need to bridge. So our proposal is to rename current directfb to directfb-0.9-22, make those packages that conflict with new directfb and have both in the archive until we can make the transition to all new libraries. I've prepared a patch (attached) that creates directfb-0.9-22 packages. As I expect they will only be used by d-i, will not need maintenance and will never reach stable, I have set d-boot as maintainer (unless Guillem prefers to have them in his name of course). Comments on this suggestion and the patch welcome. Cheers, FJP
diff -urN directfb-0.9.22.sv/debian/changelog directfb-0.9.22/debian/changelog
--- directfb-0.9.22.sv/debian/changelog 2006-04-09 02:21:13.247275654 +0200
+++ directfb-0.9.22/debian/changelog 2006-04-09 04:09:44.922242942 +0200
@@ -1,3 +1,14 @@
+directfb-0.9-22 (0.9.22-10) unstable; urgency=low
+
+ * Re-release with modified package names and conflicting with the official
+ directfb packages (0.9-24). Reason for the re-release is that the
+ graphical version of Debian Installer needs this version until new
+ upstream versions of gdk and cairo are released and packaged for Debian.
+ * Include patch from #360211 to get proper udeb dependencies.
+ * Change maintainer to debian-boot list, with myself as uploader.
+
+ -- Frans Pop <fjp@debian.org> Sun, 9 Apr 2006 02:36:46 +0200
+
directfb (0.9.22-9) unstable; urgency=low
* Switch to libsysfs-dev >= 2.0. (Closes: #347627)
diff -urN directfb-0.9.22.sv/debian/control directfb-0.9.22/debian/control
--- directfb-0.9.22.sv/debian/control 2006-04-09 02:21:13.246275794 +0200
+++ directfb-0.9.22/debian/control 2006-04-09 04:09:44.922242942 +0200
@@ -1,8 +1,9 @@
-Source: directfb
+Source: directfb-0.9-22
Section: libs
Priority: optional
-Maintainer: Guillem Jover <guillem@debian.org>
-Build-Depends: debhelper (>= 4.2), autoconf, automake1.9, libtool, libfreetype6-dev, libjpeg62-dev, libpng12-dev, zlib1g-dev (>= 1:1.1.3), libmpeg3-dev, libsysfs-dev (>= 2.0) [alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 sh]
+Maintainer: Debian Installer team <debian-boot@lists.debian.org>
+Uploaders: Frans Pop <fjp@debian.org>
+Build-Depends: debhelper (>= 5.0.22), autoconf, automake1.9, libtool, libfreetype6-dev, libjpeg62-dev, libpng12-dev, zlib1g-dev (>= 1:1.1.3), libmpeg3-dev, libsysfs-dev (>= 2.0) [alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 sh]
Standards-Version: 3.6.2
Package: libdirectfb-0.9-22
@@ -19,7 +20,6 @@
Section: debian-installer
Architecture: any
Depends: ${shlibs:Depends}
-Provides: libdirectfb-0.9-22
Description: frame buffer graphics library
DirectFB is a graphics library which was designed with embedded systems
in mind. It offers maximum hardware accelerated performance at a minimum
@@ -28,10 +28,11 @@
This package contains the shared libraries for use with the debian
installer.
-Package: libdirectfb-bin
+Package: libdirectfb-0.9-22-bin
Section: libs
Architecture: any
Depends: libdirectfb-0.9-22 (= ${Source-Version}), ${shlibs:Depends}
+Conflicts: libdirectfb-bin
Description: binaries for libdirectfb
DirectFB is a graphics library which was designed with embedded systems
in mind. It offers maximum hardware accelerated performance at a minimum
@@ -40,10 +41,11 @@
This packages contains the DirectFB background configuration tool
and the directfbrc man page.
-Package: libdirectfb-extra
+Package: libdirectfb-0.9-22-extra
Section: libs
Architecture: any
Depends: libdirectfb-0.9-22 (= ${Source-Version}), ${shlibs:Depends}
+Conflicts: libdirectfb-extra
Description: extra image/video providers for libdirectfb
DirectFB is a graphics library which was designed with embedded systems
in mind. It offers maximum hardware accelerated performance at a minimum
@@ -55,10 +57,11 @@
* FreeType
* WM Unique
-Package: libdirectfb-dev
+Package: libdirectfb-0.9-22-dev
Section: libdevel
Architecture: any
Depends: libdirectfb-0.9-22 (= ${Source-Version}), libc6-dev | libc-dev, libpng12-dev
+Conflicts: libdirectfb-dev
Description: frame buffer graphics library, development files
DirectFB is a graphics library which was designed with embedded systems
in mind. It offers maximum hardware accelerated performance at a minimum
diff -urN directfb-0.9.22.sv/debian/libdirectfb-0.9-22-bin.files directfb-0.9.22/debian/libdirectfb-0.9-22-bin.files
--- directfb-0.9.22.sv/debian/libdirectfb-0.9-22-bin.files 1970-01-01 01:00:00.000000000 +0100
+++ directfb-0.9.22/debian/libdirectfb-0.9-22-bin.files 2006-04-09 04:06:05.128935013 +0200
@@ -0,0 +1,4 @@
+usr/bin/uw*
+usr/bin/dfb*
+usr/share/man/man1/dfb*
+usr/share/man/man5/*
diff -urN directfb-0.9.22.sv/debian/libdirectfb-0.9-22-dev.files directfb-0.9.22/debian/libdirectfb-0.9-22-dev.files
--- directfb-0.9.22.sv/debian/libdirectfb-0.9-22-dev.files 1970-01-01 01:00:00.000000000 +0100
+++ directfb-0.9.22/debian/libdirectfb-0.9-22-dev.files 2006-04-09 04:06:05.128935013 +0200
@@ -0,0 +1,8 @@
+usr/include/*
+usr/lib/lib*.a
+usr/lib/lib*.so
+usr/lib/lib*.la
+usr/bin/directfb-config
+usr/bin/directfb-csource
+usr/lib/pkgconfig
+usr/share/man/man1/directfb-csource*
diff -urN directfb-0.9.22.sv/debian/libdirectfb-0.9-22-dev.manpages directfb-0.9.22/debian/libdirectfb-0.9-22-dev.manpages
--- directfb-0.9.22.sv/debian/libdirectfb-0.9-22-dev.manpages 1970-01-01 01:00:00.000000000 +0100
+++ directfb-0.9.22/debian/libdirectfb-0.9-22-dev.manpages 2006-04-09 04:06:05.128935013 +0200
@@ -0,0 +1 @@
+debian/directfb-config.1
diff -urN directfb-0.9.22.sv/debian/libdirectfb-0.9-22-extra.files directfb-0.9.22/debian/libdirectfb-0.9-22-extra.files
--- directfb-0.9.22.sv/debian/libdirectfb-0.9-22-extra.files 1970-01-01 01:00:00.000000000 +0100
+++ directfb-0.9.22/debian/libdirectfb-0.9-22-extra.files 2006-04-09 04:06:05.128935013 +0200
@@ -0,0 +1,3 @@
+usr/lib/directfb*/wm/*unique*
+usr/lib/directfb*/interfaces/IDirectFBFont/*ft2*
+usr/lib/directfb*/interfaces/IDirectFBVideoProvider/*mpeg*
diff -urN directfb-0.9.22.sv/debian/libdirectfb-bin.files directfb-0.9.22/debian/libdirectfb-bin.files
--- directfb-0.9.22.sv/debian/libdirectfb-bin.files 2006-04-09 02:21:13.247275654 +0200
+++ directfb-0.9.22/debian/libdirectfb-bin.files 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-usr/bin/uw*
-usr/bin/dfb*
-usr/share/man/man1/dfb*
-usr/share/man/man5/*
diff -urN directfb-0.9.22.sv/debian/libdirectfb-dev.files directfb-0.9.22/debian/libdirectfb-dev.files
--- directfb-0.9.22.sv/debian/libdirectfb-dev.files 2006-04-09 02:21:13.247275654 +0200
+++ directfb-0.9.22/debian/libdirectfb-dev.files 1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/lib*.la
-usr/bin/directfb-config
-usr/bin/directfb-csource
-usr/lib/pkgconfig
-usr/share/man/man1/directfb-csource*
diff -urN directfb-0.9.22.sv/debian/libdirectfb-dev.manpages directfb-0.9.22/debian/libdirectfb-dev.manpages
--- directfb-0.9.22.sv/debian/libdirectfb-dev.manpages 2006-04-09 02:21:13.247275654 +0200
+++ directfb-0.9.22/debian/libdirectfb-dev.manpages 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/directfb-config.1
diff -urN directfb-0.9.22.sv/debian/libdirectfb-extra.files directfb-0.9.22/debian/libdirectfb-extra.files
--- directfb-0.9.22.sv/debian/libdirectfb-extra.files 2006-04-09 02:21:13.246275794 +0200
+++ directfb-0.9.22/debian/libdirectfb-extra.files 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-usr/lib/directfb*/wm/*unique*
-usr/lib/directfb*/interfaces/IDirectFBFont/*ft2*
-usr/lib/directfb*/interfaces/IDirectFBVideoProvider/*mpeg*
diff -urN directfb-0.9.22.sv/debian/rules directfb-0.9.22/debian/rules
--- directfb-0.9.22.sv/debian/rules 2006-04-09 02:21:13.248275513 +0200
+++ directfb-0.9.22/debian/rules 2006-04-09 04:09:44.923242798 +0200
@@ -115,26 +115,25 @@
dh_testdir
dh_testroot
- dh_movefiles -plibdirectfb-extra
- dh_movefiles -Nlibdirectfb-extra
+ dh_movefiles -plibdirectfb-0.9-22-extra
+ dh_movefiles -Nlibdirectfb-0.9-22-extra
for d in `dh_listpackages | tail -n+3`; do \
dh_link -p$$d usr/share/doc/$(package_lib) \
usr/share/doc/$$d; \
done
dh_installdocs -a
dh_installman -a
-# dh_installexamples -plibdirectfb-dev examples/*.c examples/*.png examples/*.jpg
+# dh_installexamples -plibdirectfb-0.9-22-dev examples/*.c examples/*.png examples/*.jpg
dh_installchangelogs ChangeLog
dh_link -a
dh_strip -a
dh_compress -a
dh_fixperms -a
- dh_makeshlibs -a
+ dh_makeshlibs -a --add-udeb="$(package_udeb)"
dh_installdeb -a
dh_shlibdeps -a -ldebian/$(package_lib)/usr/lib -L$(package_lib)
- # XXX: Nasty hack, this should be done in debhelper.
- sed -ie 's/, $(package_lib)//' \
- $(CURDIR)/debian/$(package_udeb).substvars
+ # XXX: Nasty hack to get rid of self-dependency, this should be done in debhelper.
+ sed -i 's/$(package_udeb), //' $(CURDIR)/debian/$(package_udeb).substvars
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
Attachment:
pgpTqIJAsaMP3.pgp
Description: PGP signature