Source: cairo
Version: 1.12.14-4
Severity: important
Tags: d-i patch jessie sid

Hi,

currently, libgtk-3-0-udeb isn't installable, since it depends on a
deb package: libcairo-gobject2; this went unnoticed until now, since
nobody tried to use that udeb. Since that's not a practical issue, I'm
keeping the severity to just important in src:cairo, release-tagging
accordingly in case we raise it later, since it's not going to affect
wheezy.

I did some research, comparing the gtk2 and gtk3 udebs. Unpacked them,
listed the libraries listed as NEEDED, and diffed them:
| $ diff -u 2.needed 3.needed|grep '^[-+]'|tail -n +3
| +  NEEDED               libcairo-gobject.so.2
| +  NEEDED               libgdk-3.so.0
| -  NEEDED               libgdk-x11-2.0.so.0
| -  NEEDED               libXrender.so.1

A quick chat on IRC with Emilio confirmed my initial thoughts:
 - libgdk-x11 is now shipped as part of libgtk itself, so lines 2 and 3
   are normal.
 - rendering moved to cairo, so lines 1 and 4 are probably expected as
   well. libXrender is still used by cairo, which libcairo-gobject uses.

So it looks expected to have an extra udeb now, so here's an attached
patch. I've tested it locally, rebuilding both src:gtk+3.0 and
src:debconf (patched to use gtk3), and src:debian-installer is buildable
and runnable.

Here's the changelog entry:
| * New udeb, needed for libgtk-3-0-udeb: libcairo-gobject2-udeb
|   + Add new stanza to debian/control.
|   + Add --add-udeb=libcairo-gobject2-udeb to the libcairo-gobject2
|     dh_makeshlibs call.
| * Misc fixes:
|   + Update libcairo2-udeb's description (one line is sufficient).
|   + Use the official field for udebs: Package-Type.

Thanks for considering.

Mraw,
KiBi.
--- cairo-1.12.14/debian/changelog	2013-05-08 15:26:58.000000000 +0200
+++ cairo-1.12.14/debian/changelog	2013-05-15 22:58:17.000000000 +0200
@@ -1,3 +1,16 @@
+cairo (1.12.14-4.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * New udeb, needed for libgtk-3-0-udeb: libcairo-gobject2-udeb
+    + Add new stanza to debian/control.
+    + Add --add-udeb=libcairo-gobject2-udeb to the libcairo-gobject2
+      dh_makeshlibs call.
+  * Misc fixes:
+    + Update libcairo2-udeb's description (one line is sufficient).
+    + Use the official field for udebs: Package-Type.
+
+ -- Cyril Brulebois <k...@debian.org>  Wed, 15 May 2013 22:51:40 +0200
+
 cairo (1.12.14-4) unstable; urgency=low
 
   * debian/control:
--- cairo-1.12.14/debian/control	2013-05-08 15:26:58.000000000 +0200
+++ cairo-1.12.14/debian/control	2013-05-15 22:58:44.000000000 +0200
@@ -151,14 +151,17 @@
  performance of cairo for real-world applications in a reproducible way.
 
 Package: libcairo2-udeb
-XC-Package-Type: udeb
+Package-Type: udeb
 Section: debian-installer
 Architecture: any
 Depends: ${shlibs:Depends}
-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 Xlib backend, intended
- primarily for use in the graphical Debian installer.
+Description: The Cairo 2D vector graphics library
+ This is a udeb, or a microdeb, for the debian-installer.
 
+Package: libcairo-gobject2-udeb
+Package-Type: udeb
+Section: debian-installer
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: The Cairo 2D vector graphics library (GObject library)
+ This is a udeb, or a microdeb, for the debian-installer.
--- cairo-1.12.14/debian/rules	2013-05-08 15:26:58.000000000 +0200
+++ cairo-1.12.14/debian/rules	2013-05-15 22:54:50.000000000 +0200
@@ -168,7 +168,7 @@
 	dh_compress -s
 	dh_fixperms -s
 	dh_makeshlibs -plibcairo2 --add-udeb=libcairo2-udeb -V 'libcairo2 (>= 1.12.0)' -- -c4
-	dh_makeshlibs -plibcairo-gobject2 -V 'libcairo-gobject2 (>= 1.10.0)' -- -c4
+	dh_makeshlibs -plibcairo-gobject2 --add-udeb=libcairo-gobject2-udeb -V 'libcairo-gobject2 (>= 1.10.0)' -- -c4
 	dh_makeshlibs -plibcairo-script-interpreter2 -V 'libcairo-script-interpreter2 (>= 1.10.0)' -- -c4
 	dh_installdeb -s
 	dh_shlibdeps -s

Reply via email to