Source: cairo
Version: 1.8.10-2
Severity: wishlist
Tags: patch d-i
Hi,
we got a green light from the d-i team. Please find attached a patch to
switch the cairo udeb from DirectFB to Xlib. As I write, a few packages
are still in NEW, namely: libxcb, libx11, libxrender. Hopefully they're
going to be processed soon. It'd be nice to have some feedback quickly,
so that we can fix anything if needed; and take care of pango1.0 and
gtk+2.0 afterwards.
The dependencies between the resulting udebs can be seen there (warning,
big images):
http://people.debian.org/~kibi/di-x11/2010-02-27/intra-deps.png
http://people.debian.org/~kibi/di-x11/2010-02-27/intra-deps.svg
Thanks for considering, and please let me know if you need anything.
Mraw,
KiBi.
diff -Nru cairo-1.8.10/debian/changelog cairo-1.8.10/debian/changelog
--- cairo-1.8.10/debian/changelog 2010-02-25 12:19:52.000000000 +0000
+++ cairo-1.8.10/debian/changelog 2010-02-26 16:57:08.000000000 +0000
@@ -1,3 +1,22 @@
+cairo (1.8.10-3) UNRELEASED; urgency=low
+
+ * Switch udeb from DirectFB to Xlib to prepare the move to an X11-based
+ graphical installer:
+ - Ship libcairo2-udeb instead of libcairo-directfb2-udeb.
+ - Update package description accordingly.
+ - Rename udeb’s .install file accordingly.
+ - Adapt package name for various dh_* calls accordingly.
+ - Switch --enable-directfb and --enable-xlib in *configure_flags
+ variables, and get rid of --program-suffix=-directfb, no longer
+ needed.
+ * Version/Bump some B-D to make sure the udeb gets its dependencies on
+ the (recently-added) udebs rather than on the libraries:
+ - libx11-dev
+ - libxrender-dev
+ * Thanks to Julien Cristau for his initial patch.
+
+ -- Cyril Brulebois <k...@debian.org> Fri, 26 Feb 2010 17:57:01 +0100
+
cairo (1.8.10-2) unstable; urgency=low
* debian/rules:
diff -Nru cairo-1.8.10/debian/control cairo-1.8.10/debian/control
--- cairo-1.8.10/debian/control 2010-02-25 10:34:11.000000000 +0000
+++ cairo-1.8.10/debian/control 2010-02-26 17:56:42.000000000 +0000
@@ -8,8 +8,8 @@
pkg-config (>= 0.19),
libfontconfig1-dev,
libfreetype6-dev (>= 2.1.10),
- libxrender-dev (>= 0.6.0),
- libx11-dev,
+ libxrender-dev (>= 1:0.9.5-2),
+ libx11-dev (>= 2:1.3.3-2),
libpng12-dev,
libdirectfb-dev (>= 0.9.25),
libsm-dev,
@@ -111,16 +111,16 @@
This package contains the HTML documentation for the Cairo library
in /usr/share/gtk-doc/html/cairo/.
-Package: libcairo-directfb2-udeb
+Package: libcairo2-udeb
XC-Package-Type: udeb
Section: debian-installer
Architecture: any
Depends: ${shlibs:Depends}
-Description: The Cairo 2D vector graphics library DirectFB build
+Description: The Cairo 2D vector graphics library Xlib backend
Cairo is a multi-platform library providing anti-aliased
vector-based rendering for multiple target backends.
.
- This is version of cairo with only the DirectFB backend, intended
+ This is version of cairo with only the Xlib backend, intended
primarily for use in the graphical Debian installer.
Package: libcairo-directfb2
diff -Nru cairo-1.8.10/debian/libcairo2-udeb.install cairo-1.8.10/debian/libcairo2-udeb.install
--- cairo-1.8.10/debian/libcairo2-udeb.install 1970-01-01 00:00:00.000000000 +0000
+++ cairo-1.8.10/debian/libcairo2-udeb.install 2010-02-26 16:55:08.000000000 +0000
@@ -0,0 +1 @@
+debian/install/udeb/usr/lib/libcairo.so.* /usr/lib
diff -Nru cairo-1.8.10/debian/libcairo-directfb2-udeb.install cairo-1.8.10/debian/libcairo-directfb2-udeb.install
--- cairo-1.8.10/debian/libcairo-directfb2-udeb.install 2010-02-23 08:28:05.000000000 +0000
+++ cairo-1.8.10/debian/libcairo-directfb2-udeb.install 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian/install/udeb/usr/lib/libcairo.so.* /usr/lib
diff -Nru cairo-1.8.10/debian/rules cairo-1.8.10/debian/rules
--- cairo-1.8.10/debian/rules 2010-02-25 10:32:46.000000000 +0000
+++ cairo-1.8.10/debian/rules 2010-02-26 16:55:08.000000000 +0000
@@ -40,7 +40,7 @@
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--enable-pdf --enable-ps \
---enable-directfb --disable-glitz \
+--enable-xlib --disable-glitz \
--enable-png \
--build=$(DEB_BUILD_GNU_TYPE)
@@ -50,14 +50,13 @@
main_configure_flags += \
$(configure_flags) \
---enable-xlib --enable-svg \
+--enable-directfb --enable-svg \
--enable-xcb
udeb_configure_flags += \
$(configure_flags) \
---disable-xlib --disable-svg \
+--disable-svg \
--disable-xcb \
---program-suffix=-directfb
builddir = $(buildbasedir)/$(current_flavor)
buildbasedir = $(CURDIR)/debian/build
@@ -144,11 +143,11 @@
dh_installman -s
dh_installexamples -s
dh_link -s
- dh_strip -s --dbg-package=libcairo2-dbg -Nlibcairo-directfb2-udeb
- dh_strip -plibcairo-directfb2-udeb
+ dh_strip -s --dbg-package=libcairo2-dbg -Nlibcairo2-udeb
+ dh_strip -plibcairo2-udeb
dh_compress -s
dh_fixperms -s
- dh_makeshlibs -plibcairo2 --add-udeb=libcairo-directfb2-udeb -V 'libcairo2 (>= 1.8.0-2)' -- -c4
+ dh_makeshlibs -plibcairo2 --add-udeb=libcairo2-udeb -V 'libcairo2 (>= 1.8.0-2)' -- -c4
dh_installdeb -s
dh_shlibdeps -s
dh_perl -s
