Package: glib2.0 Version: 2.10.1-2 Severity: wishlist Tags: patch, d-i Let's call this an important wishlist bug (important for Debian Installer anyway :-)
Please add the following lines to your shlibs file: udeb: libglib-2.0 0 libglib2.0-udeb (>= 2.10.0) udeb: libgobject-2.0 0 libglib2.0-udeb (>= 2.10.0) udeb: libgmodule-2.0 0 libglib2.0-udeb (>= 2.10.0) udeb: libgthread-2.0 0 libglib2.0-udeb (>= 2.10.0) This will allow dpkg/debhelper to properly set the dependencies for udebs that depend on libglib2.0. Please see #345472 and #345475 for further info on this. It would be very much appreciated if this change could be implemented soon as this is blocking the integration of the graphical installer in the main d-i build system. 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]@ 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
diff -u glib2.0-2.10.1/debian/control.in glib2.0-2.10.1/debian/control.in
--- glib2.0-2.10.1/debian/control.in
+++ glib2.0-2.10.1/debian/control.in
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Sebastien Bacher <[EMAIL PROTECTED]>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>> 4.0.0), pkg-config (>= 0.14.0), gettext, autotools-dev, gnome-pkg-tools
+Build-Depends: debhelper (>> 5.0.22), pkg-config (>= 0.14.0), gettext, autotools-dev, gnome-pkg-tools
Standards-Version: 3.6.2
Package: [EMAIL PROTECTED]@
@@ -25,7 +25,6 @@
Priority: extra
Architecture: any
Depends: ${shlibs:Depends}
-Provides: [EMAIL PROTECTED]@
Description: The GLib library of C routines
This is a udeb, or a microdeb, for the debian-installer.
.
diff -u glib2.0-2.10.1/debian/rules glib2.0-2.10.1/debian/rules
--- glib2.0-2.10.1/debian/rules
+++ glib2.0-2.10.1/debian/rules
@@ -46,7 +46,6 @@
shver=2.10.0
libpath=$(CURDIR)/$(BUILD_DEB_DIR)/glib/.libs:$(CURDIR)/$(BUILD_DEB_DIR)/gmodule/.libs:$(CURDIR)/$(BUILD_DEB_DIR)/gobject/.libs:$(CURDIR)/$(BUILD_DEB_DIR)/gthread/.libs
udeblibpath=$(CURDIR)/$(BUILD_UDEB_DIR)/glib/.libs:$(CURDIR)/$(BUILD_UDEB_DIR)/gmodule/.libs:$(CURDIR)/$(BUILD_UDEB_DIR)/gobject/.libs:$(CURDIR)/$(BUILD_UDEB_DIR)/gthread/.libs
-udebname=libglib$(apiver)-udeb_$(debversion)_$(shell dpkg-architecture -qDEB_BUILD_ARCH).udeb
_echo_cfiles = for f in ${1}; do if [ -f $$f ]; then echo $$f; fi; done
cfiles := $(shell $(call _echo_cfiles, $(wildcard debian/libglib$(apiver)[EMAIL PROTECTED]@.*)))
@@ -227,7 +226,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
@@ -254,29 +253,12 @@
- -V "libglib${apiver}-${soname} (>= ${shver})"
+ -V "libglib${apiver}-${soname} (>= ${shver})" \
+ --add-udeb="libglib${apiver}-udeb"
dh_installdeb -a
dh_shlibdeps -a -ldebian/libglib$(apiver)-$(soname)/usr/lib -Llibglib$(apiver)-$(soname)
- dh_gencontrol -a -Nlibglib$(apiver)-udeb
- dh_md5sums -a -Nlibglib$(apiver)-udeb
- dh_builddeb -a -Nlibglib$(apiver)-udeb
-
-binary-arch-udeb: build-udeb install-udeb
- dh_testdir -plibglib$(apiver)-udeb
- dh_testroot -plibglib$(apiver)-udeb
-
- dh_installdebconf -plibglib$(apiver)-udeb
- dh_strip -plibglib$(apiver)-udeb
- dh_compress -plibglib$(apiver)-udeb
- dh_fixperms -plibglib$(apiver)-udeb
- dh_installdeb -plibglib$(apiver)-udeb
- -rm -f $(CURDIR)/debian/shlibs.local
- dh_shlibdeps -l$(udeblibpath) -plibglib$(apiver)-udeb
- # hmm, I don't know but need to fix the self dependency.
- sed -e 's/, libglib$(apiver)-$(soname) (>= [.0-9]*)//' $(CURDIR)/debian/libglib$(apiver)-udeb.substvars > $(CURDIR)/debian/libglib$(apiver)-udeb.substvars.new
- mv $(CURDIR)/debian/libglib$(apiver)-udeb.substvars.new \
- $(CURDIR)/debian/libglib$(apiver)-udeb.substvars
- dh_gencontrol -plibglib$(apiver)-udeb -- -fdebian/files~
- dpkg-distaddfile $(udebname) debian-installer extra
+ # hmm, I don't know but need to fix the self dependency for the udeb.
+ sed -i 's/, libglib$(apiver)-udeb (>= [.0-9]*)//' $(CURDIR)/debian/libglib$(apiver)-udeb.substvars
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
- dh_builddeb -plibglib$(apiver)-udeb --filename=$(udebname)
-
-binary: binary-indep binary-arch binary-arch-udeb
-.PHONY: build build-deb build-udeb clean binary-indep binary-arch binary-arch-udeb binary install install-deb install-udeb install-test configure configure-deb configure-udeb extract debian/control
+binary: binary-indep binary-arch
+.PHONY: build build-deb build-udeb clean binary-indep binary-arch binary install install-deb install-udeb install-test configure configure-deb configure-udeb extract debian/control
pgpz0Rk86bmMs.pgp
Description: PGP signature
