Package: mac-fdisk
Version: 0.1-15
Severity: serious
Tags: patch d-i

The udebs do not get a correct dependency on libc6-udeb, but instead 
depend on the regular libc6 package. We've ignored this for previous 
releases, but for Squeeze it's RC because of britney support for udebs.

I originally thought this could be solved with a binNMU, but that turned 
out not to be enough.
The basic reason is that the control file does not set the correct package 
type for the udeb. Doing that also allows to simplify debian/rules a bit as 
the package type triggers all the necessary magic for udebs in debhelper.

I've build tested the attached patch on a porter box and to me the result 
looks good.

diff -u mac-fdisk-0.1/debian/rules mac-fdisk-0.1/debian/rules
--- mac-fdisk-0.1/debian/rules
+++ mac-fdisk-0.1/debian/rules
@@ -164,9 +164,8 @@
 		dh_strip -p$(packudeb); \
 		dh_installdeb -p$(packudeb); \
 		dh_shlibdeps -p$(packudeb); \
-		dh_gencontrol -p$(packudeb) -- -isp "-DSubarchitecture=$(mac_subarches)" -fdebian/files~; \
-		dpkg-distaddfile $(packudeb)_$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)_$(BUILDARCH).udeb debian-installer standard; \
-		dh_builddeb -p$(packudeb) --filename=$(packudeb)_$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)_$(BUILDARCH).udeb; \
+		dh_gencontrol -p$(packudeb); \
+		dh_builddeb -p$(packudeb); \
 	fi
 
 	# build pmac-fdisk-udeb on powerpc
@@ -174,9 +173,8 @@
 		dh_strip -p$(packpudeb); \
 		dh_installdeb -p$(packpudeb); \
 		dh_shlibdeps -p$(packpudeb); \
-		dh_gencontrol -p$(packpudeb) -- -isp "-DSubarchitecture=$(pmac_subarches)" -fdebian/files~; \
-		dpkg-distaddfile $(packpudeb)_$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)_$(BUILDARCH).udeb debian-installer standard; \
-		dh_builddeb -p$(packpudeb) --filename=$(packpudeb)_$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)_$(BUILDARCH).udeb; \
+		dh_gencontrol -p$(packpudeb); \
+		dh_builddeb -p$(packpudeb); \
 	fi
 
 define checkdir
diff -u mac-fdisk-0.1/debian/control mac-fdisk-0.1/debian/control
--- mac-fdisk-0.1/debian/control
+++ mac-fdisk-0.1/debian/control
@@ -38,6 +38,7 @@
  interactive tool similar to PC fdisk. 
 
 Package: mac-fdisk-udeb
+XC-Package-Type: udeb
 Architecture: powerpc ppc64 m68k
 Priority: standard
 Section: debian-installer
@@ -54,6 +55,7 @@
  This is a minimal mac-fdisk package used by the debian-installer.
 
 Package: pmac-fdisk-udeb
+XC-Package-Type: udeb
 Architecture: powerpc ppc64
 Priority: standard
 Section: debian-installer

Reply via email to