[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#476480: pixman: please add a udeb as it is required for current cairo in unstable



Package: pixman
Version: 0.10.0-1
Severity: wishlist
Tags: d-i patch

As discussed on IRC, attached a patch for pixman to add a udeb.
An upload ASAP would be very much appreciated as current daily builds of the 
installer are broken because the libcairo-directfb2-udeb in unstable 
already depends on it (though incorrectly, a rebuild of cairo against new 
pixmap will be required to fix that).

This patch is the most simple possible solution to adding the udeb, using 
the same version of the library as the regular package.

The change to debian/rules is needed to have dh_makeshlibs add a udeb: line 
to the shlibs file in the regular library package. That line ensures that 
other udebs built against libpixman will get the correct dependency if the 
shlibs file is generated automatically.
However, as you're using an explicit .shlibs file in the debian directory, 
the line has also been added there.

Cheers,
FJP

diff -u pixman-0.10.0/debian/control pixman-0.10.0/debian/control
--- pixman-0.10.0/debian/control
+++ pixman-0.10.0/debian/control
@@ -18,6 +18,15 @@
  and implicit mask generation for geometric primitives including
  trapezoids, triangles, and rectangles.
 
+Package: libpixman-1-0-udeb
+Section: debian-installer
+XC-Package-Type: udeb
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: pixel-manipulation library for X and cairo
+ This package contains a minimal set of libraries needed for the Debian
+ installer.  Do not install it on a normal system.
+
 Package: libpixman-1-0-dbg
 Section: libdevel
 Priority: extra
diff -u pixman-0.10.0/debian/libpixman-1-0.shlibs pixman-0.10.0/debian/libpixman-1-0.shlibs
--- pixman-0.10.0/debian/libpixman-1-0.shlibs
+++ pixman-0.10.0/debian/libpixman-1-0.shlibs
@@ -1,0 +2 @@
+udeb: libpixman-1 0 libpixman-1-0-udeb (>= 0.10.0)
diff -u pixman-0.10.0/debian/rules pixman-0.10.0/debian/rules
--- pixman-0.10.0/debian/rules
+++ pixman-0.10.0/debian/rules
@@ -83,7 +83,7 @@
 	dh_strip --dbg-package=$(PACKAGE)-dbg
 	dh_compress
 	dh_fixperms
-	dh_makeshlibs
+	dh_makeshlibs -p$(PACKAGE) --add-udeb $(PACKAGE)-udeb
 	dh_shlibdeps
 	dh_installdeb
 	dh_gencontrol
only in patch2:
unchanged:
--- pixman-0.10.0.orig/debian/libpixman-1-0-udeb.install
+++ pixman-0.10.0/debian/libpixman-1-0-udeb.install
@@ -0,0 +1 @@
+usr/lib/libpixman-1.so.*

Attachment: signature.asc
Description: This is a digitally signed message part.


Reply to: