Package: expat
Version: 1.95.8-3
Severity: wishlist
Tags: patch, d-i

Let's call this an important wishlist bug (important for Debian Installer 
anyway :-)

Please add the following line to your shlibs file:
udeb: libfreetype 6 libfreetype6-udeb (>= 2.1.5-1)

This will allow dpkg/debhelper to properly set the dependencies for udebs 
that depend on libfreetype6.
Please see #345472 and #345475 for further info on this.

It would be very much appreciated if this change could be implemented
soon.


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: libfreetype6

I've also taken the liberty of reducing the complexity of your rules file 
a little. debhelper knows how to package a udeb if you include 
"XC-Package-Type: udeb" in the control file.

I've also added a debian/compat file instead of the export DH_COMPAT=4 in 
debian/rules, which is prefered. Because of the dep on debhelper 5.0.22, 
I've set compat level to 5.

I've checked the debdiff for the libfreetype6 deb and udeb against current 
versions and there were no unexpected changes.

TIA,
Frans Pop
diff -u freetype-2.1.10/debian/rules freetype-2.1.10/debian/rules
--- freetype-2.1.10/debian/rules
+++ freetype-2.1.10/debian/rules
@@ -16,15 +16,10 @@
 
 UPACKAGE = $(shell dh_listpackages | grep -- -udeb$$)
 VERSION = $(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
-ARCH = $(shell dpkg --print-architecture)
-UFILENAME = $(UPACKAGE)_$(VERSION)_$(ARCH).udeb
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
@@ -230,7 +225,7 @@
 	dh_link
 	dh_compress
 	dh_fixperms
-	dh_makeshlibs -V '$(dependency)'
+	dh_makeshlibs -V '$(dependency)' --add-udeb '$(udebpkg)'
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
@@ -301,9 +296,8 @@
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol -- -fdebian/files~
-	dpkg-distaddfile $(UFILENAME) debian-installer extra
-	dh_builddeb --filename=$(UFILENAME)
+	dh_gencontrol
+	dh_builddeb
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary \
diff -u freetype-2.1.10/debian/control freetype-2.1.10/debian/control
--- freetype-2.1.10/debian/control
+++ freetype-2.1.10/debian/control
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Will Newton <[EMAIL PROTECTED]>
-Build-Depends: bzip2, debhelper (>= 4.0.0), docbook-to-man, gettext (>= 0.10.36-2), x-dev, libx11-dev, libz-dev
+Build-Depends: bzip2, debhelper (>= 5.0.22), docbook-to-man, gettext (>= 0.10.36-2), x-dev, libx11-dev, libz-dev
 Standards-Version: 3.6.1
 
 Package: libfreetype6
@@ -71,10 +71,10 @@
  which showcase the features of the FreeType 2 font engine.
 
 Package: libfreetype6-udeb
+XC-Package-Type: udeb
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}
-Provides: libfreetype6
 Section: debian-installer
 Description: FreeType 2 font engine for the debian-installer
  The FreeType project is a team of volunteers who develop free,
diff -u freetype-2.1.10/debian/changelog freetype-2.1.10/debian/changelog
--- freetype-2.1.10/debian/changelog
+++ freetype-2.1.10/debian/changelog
@@ -1,3 +1,9 @@
+freetype (2.1.10-1.1a) unstable; urgency=low
+
+  * shlibs test
+
+ -- Frans Pop <[EMAIL PROTECTED]>  Wed,  8 Mar 2006 21:37:40 +0100
+
 freetype (2.1.10-1.1) unstable; urgency=low
 
   * NMU
only in patch2:
unchanged:
--- freetype-2.1.10.orig/debian/compat
+++ freetype-2.1.10/debian/compat
@@ -0,0 +1 @@
+5

Attachment: pgp5ugUMNpfZH.pgp
Description: PGP signature

Reply via email to