Package: pango1.0 Version: 1.12.1-2 Severity: important Tags: patch, d-i Please add the following lines to your shlibs file: udeb: libpango-1.0 0 libpango1.0-udeb (>= 1.12.1) udeb: libpangox-1.0 0 libpango1.0-udeb (>= 1.12.1) udeb: libpangoft2-1.0 0 libpango1.0-udeb (>= 1.12.1) udeb: libpangoxft-1.0 0 libpango1.0-udeb (>= 1.12.1) udeb: libpangocairo-1.0 0 libpango1.0-udeb (>= 1.12.1)
This will allow dpkg/debhelper to properly set the dependencies for udebs that depend on libpango1.0. Please see #345472 and #345475 for further info on this. It would be very much appreciated if this change could be implemented ASAP as this is the very last package to be updated before we can integrate the graphical installer in the main d-i build system. That's why severity is set to important. The attached patch implements the necessary changes: - add --add-udeb option for dh_makeshlibs which autogenerates the udeb: lines for the shlibs file - this requires debhelper 5.0.22 - drop the Provides: [EMAIL PROTECTED]@ - add a temporary hack in debian/rules to create a correct dependency on libcairo2-directfb-udeb [1] I've not updated debian/compat to level 5 as your package has a -dbg binary and there was a change in behavior in debhelper for those. I have also taken the liberty of simplifying your debian/rules file a bit. As debhelper knows how to package udebs, the separate binary-arch-udeb target is no longer needed. I've checked the debdiff for the debs and udeb against current versions and there were no unexpected changes. TIA, Frans Pop [1] This is needed because the current cairo package cannot be built for a directfb frontend and therefore the udeb is build from a separate source package. A patch for directfb support has been committed upstream and will be included in the next upstream release. So we should be able to drop this hack after the new cairo upstream has been packaged to produce a udeb. Having the correct dependency (and thus the hack) is essential for integration of the graphical installer.
diff -u pango1.0-1.12.1/debian/control.in pango1.0-1.12.1/debian/control.in
--- pango1.0-1.12.1/debian/control.in
+++ pango1.0-1.12.1/debian/control.in
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Sebastien Bacher <[EMAIL PROTECTED]>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 4.9.12), libfreetype6-dev (>= 2.1.7), libx11-dev (>= 2:1.0.0), libxrender-dev (>= 1:0.9.0.2-2), libxt-dev, libglib2.0-dev (>= 2.10.0), pkg-config, defoma (>= 0.11.1), libxft-dev, libfontconfig1-dev (>= 2.1.91), autotools-dev, po-debconf, gnome-pkg-tools, libcairo2-dev (>= 1.0.0)
+Build-Depends: debhelper (>= 5.0.22), libfreetype6-dev (>= 2.1.7), libx11-dev (>= 2:1.0.0), libxrender-dev (>= 1:0.9.0.2-2), libxt-dev, libglib2.0-dev (>= 2.10.0), pkg-config, defoma (>= 0.11.1), libxft-dev, libfontconfig1-dev (>= 2.1.91), autotools-dev, po-debconf, gnome-pkg-tools, libcairo2-dev (>= 1.0.0)
Standards-Version: 3.6.2
Package: [EMAIL PROTECTED]@
@@ -32,7 +32,6 @@
Priority: optional
Architecture: any
Depends: ${shlibs:Depends}
-Provides: [EMAIL PROTECTED]@
Description: Layout and rendering of internationalized text
This is a udeb, or a microdeb, for the debian-installer.
.
diff -u pango1.0-1.12.1/debian/rules pango1.0-1.12.1/debian/rules
--- pango1.0-1.12.1/debian/rules
+++ pango1.0-1.12.1/debian/rules
@@ -47,7 +47,6 @@
modver=1.5.0
libpath=$(CURDIR)/$(BUILD_SHARED_DIR)/pango/.libs
udeblibpath=$(CURDIR)/$(BUILD_UDEB_DIR)/pango/.libs
-udebname=libpango$(apiver)-udeb_$(debversion)_$(shell dpkg-architecture -qDEB_BUILD_ARCH).udeb
debian/control:
@@ -296,7 +295,7 @@
dh_builddeb -i
# Build architecture-dependent files here.
-binary-arch: build install binary-arch-udeb
+binary-arch: build build-udeb install install-udeb
dh_testdir -a
dh_testroot -a
@@ -323,32 +322,16 @@
- dh_makeshlibs -plibpango$(apiver)-$(soname) -X usr/lib/pango/$(modver)/modules -V "libpango${apiver}-${soname} (>= ${version})"
+ dh_makeshlibs -plibpango$(apiver)-$(soname) -X usr/lib/pango/$(modver)/modules -V "libpango${apiver}-${soname} (>= ${version})" --add-udeb="libpango$(apiver)-udeb"
dh_makeshlibs -n -plibpango$(apiver)-common
dh_makeshlibs -plibpango$(apiver)-dev
dh_installdeb -a
dh_shlibdeps -l$(libpath) -a
- cat debian/*/DEBIAN/shlibs > debian/shlibs.local
- dh_gencontrol -a -Nlibpango$(apiver)-udeb
- dh_md5sums -a -Nlibpango$(apiver)-udeb
- dh_builddeb -a -Nlibpango$(apiver)-udeb
-
-binary-arch-udeb: build-udeb install-udeb
- dh_testdir -a -plibpango$(apiver)-udeb
- dh_testroot -a -plibpango$(apiver)-udeb
-
- dh_installdebconf -a -plibpango$(apiver)-udeb
- dh_strip -plibpango$(apiver)-udeb
- dh_compress -a -plibpango$(apiver)-udeb
- dh_fixperms -a -plibpango$(apiver)-udeb
- dh_installdeb -a -plibpango$(apiver)-udeb
- -rm -f $(CURDIR)/debian/shlibs.local
- dh_shlibdeps -l$(udeblibpath) -plibpango$(apiver)-udeb
- # hmm, I don't know but need to fix the self dependency.
- sed -e 's/, libpango$(apiver)-$(soname) (>= [.0-9]*)//' $(CURDIR)/debian/libpango$(apiver)-udeb.substvars > $(CURDIR)/debian/libpango$(apiver)-udeb.substvars.new
- mv $(CURDIR)/debian/libpango$(apiver)-udeb.substvars.new \
- $(CURDIR)/debian/libpango$(apiver)-udeb.substvars
- dh_gencontrol -a -plibpango$(apiver)-udeb -- -fdebian/files~
- dpkg-distaddfile $(udebname) debian-installer optional
+ # Hmm, I don't know but need to fix the self dependency for the udeb
+ sed -i 's/, libpango$(apiver)-udeb (>= [.0-9]*)//' $(CURDIR)/debian/libpango$(apiver)-udeb.substvars
+ # As the libcairo udeb is not produced by the libcairo package,
+ # we temporarily have to hack that dependency
+ sed -i 's/libcairo2 (>= [-.0-9]*)/libcairo2-directfb-udeb (>= 1.0.4)/' $(CURDIR)/debian/libpango$(apiver)-udeb.substvars
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
- dh_builddeb -plibpango$(apiver)-udeb --filename=$(udebname)
-
-binary: binary-indep binary-arch binary-arch-udeb
-.PHONY: build build-shared build-static build-udeb clean binary-indep binary-arch binary-arch-udeb binary install install-shared install-static install-udeb configure configure-shared configure-static configure-udeb debian/control update-po debian/po/templates.pot
+binary: binary-indep binary-arch
+.PHONY: build build-shared build-static build-udeb clean binary-indep binary-arch binary install install-shared install-static install-udeb configure configure-shared configure-static configure-udeb debian/control update-po debian/po/templates.pot
pgpWBImmYnO7g.pgp
Description: PGP signature
