I've taken the liberty of preparing an NMU and uploading that to the 5-day delayed queue. If you disagree with this upload then please let me know.
Reason for the upload is that we need this patch (the shlibs udeb support) to be able to integrate the graphical installer into the main build infrastructure for Debian Installer which is a goal for the next Beta release. The full patch for the NMU, including the changelog entry, is attached. Cheers, Frans Pop
diff -u glib2.0-2.10.2/debian/control.in glib2.0-2.10.2/debian/control.in
--- glib2.0-2.10.2/debian/control.in
+++ glib2.0-2.10.2/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.2/debian/changelog glib2.0-2.10.2/debian/changelog
--- glib2.0-2.10.2/debian/changelog
+++ glib2.0-2.10.2/debian/changelog
@@ -1,3 +1,11 @@
+glib2.0 (2.10.2-1.1) unstable; urgency=low
+
+ * Non-Maintainer Upload (closes: #361697).
+ - Add support for udeb dependency resolution in shlibs file.
+ - Simplify debian/rules by making use of udeb support in debhelper.
+
+ -- Frans Pop <[EMAIL PROTECTED]> Sat, 22 Apr 2006 21:26:25 +0200
+
glib2.0 (2.10.2-1) unstable; urgency=low
* New upstream version:
diff -u glib2.0-2.10.2/debian/rules glib2.0-2.10.2/debian/rules
--- glib2.0-2.10.2/debian/rules
+++ glib2.0-2.10.2/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
pgpkITwtk2Cnq.pgp
Description: PGP signature
