fjp pointed out that it might be difficult to find a good way to drop the libdiscover1 from the udeb's deps without hardcoding the deps or a similar hack, so I went ahead and finished my patch to produce a nice clean libdiscover1-udeb and make discover1-udeb depend on that. Note that this patch removes debian/libdiscover1.shlibs; the presense of that file makes your existing call to dh_makeshlibs do nothing, and I need to let dh_makeshlibs do its magic.. Also, note that this patch fixes the description of discover1-udeb (which amoung other changes means removing the long description). And also, it redoes your rules file to take advantage of debhelper's udeb support. -- see shy jo
diff --new-file -ur old/discover1-1.7.17/debian/control discover1-1.7.17/debian/control
--- old/discover1-1.7.17/debian/control 2005-10-01 14:28:19.000000000 -0400
+++ discover1-1.7.17/debian/control 2006-03-27 16:45:21.000000000 -0500
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Gaudenz Steinlin <gaudenz@debian.org>, Petter Reinholdtsen <pere@debian.org>, Joshua Kwan <joshk@triplehelix.org>, Otavio Salvador <otavio@debian.org>
-Build-Depends: debhelper (>= 4.1.16), gettext
+Build-Depends: debhelper (>= 5.0.22), gettext
Standards-Version: 3.6.2
Package: discover1
@@ -61,13 +61,13 @@
XC-Package-Type: udeb
Provides: discover
Depends: ${shlibs:Depends}, discover1-data-udeb (>= 1.2004.09.24)
-Description: hardware identification library (udeb)
- Discover is a hardware identification system based on the libdiscover1
- library. Discover provides a flexible interface that programs can use to
- report a wide range of information about the hardware that is installed on a
- Linux system. It functions at boot-time by probing the available system
- busses and loading the appropriate drivers based on data provided in the
- discover1-data package.
- .
- This contains the udeb, which is used for the debian-installer
- installation system. It won't work well on a normal debian system.
+Description: hardware identification system (udeb)
+
+Package: libdiscover1-udeb
+Section: debian-installer
+Priority: extra
+Architecture: any
+XC-Package-Type: udeb
+Provides: libdiscover1
+Depends: ${shlibs:Depends}, discover1-data-udeb (>= 1.2004.09.24)
+Description: hardware identification library (udeb)
diff --new-file -ur old/discover1-1.7.17/debian/discover1-udeb.dirs discover1-1.7.17/debian/discover1-udeb.dirs
--- old/discover1-1.7.17/debian/discover1-udeb.dirs 2004-03-21 03:12:58.000000000 -0500
+++ discover1-1.7.17/debian/discover1-udeb.dirs 2006-03-27 16:54:41.000000000 -0500
@@ -1,2 +1 @@
-lib
sbin
diff --new-file -ur old/discover1-1.7.17/debian/libdiscover1-udeb.dirs discover1-1.7.17/debian/libdiscover1-udeb.dirs
--- old/discover1-1.7.17/debian/libdiscover1-udeb.dirs 1969-12-31 19:00:00.000000000 -0500
+++ discover1-1.7.17/debian/libdiscover1-udeb.dirs 2006-03-27 16:54:49.000000000 -0500
@@ -0,0 +1 @@
+lib
diff --new-file -ur old/discover1-1.7.17/debian/libdiscover1-udeb.files discover1-1.7.17/debian/libdiscover1-udeb.files
--- old/discover1-1.7.17/debian/libdiscover1-udeb.files 1969-12-31 19:00:00.000000000 -0500
+++ discover1-1.7.17/debian/libdiscover1-udeb.files 2006-03-27 16:29:49.000000000 -0500
@@ -0,0 +1,2 @@
+lib/lib*.so.*
+usr/share/locale
diff --new-file -ur old/discover1-1.7.17/debian/libdiscover1.shlibs discover1-1.7.17/debian/libdiscover1.shlibs
--- old/discover1-1.7.17/debian/libdiscover1.shlibs 2005-11-09 20:17:09.000000000 -0500
+++ discover1-1.7.17/debian/libdiscover1.shlibs 1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-libdiscover 1 libdiscover1 (>= 1.7.10)
diff --new-file -ur old/discover1-1.7.17/debian/rules discover1-1.7.17/debian/rules
--- old/discover1-1.7.17/debian/rules 2005-10-01 14:28:19.000000000 -0400
+++ discover1-1.7.17/debian/rules 2006-03-27 16:47:55.000000000 -0500
@@ -1,9 +1,7 @@
#!/usr/bin/make -f
-PACKAGE=$(shell dh_listpackages | grep -- -udeb$$)
VERSION=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
ARCH=$(shell dpkg --print-architecture)
-UFILENAME=$(PACKAGE)_$(VERSION)_$(ARCH).udeb
buildtype := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
hosttype := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -69,9 +67,9 @@
# reportbug helper script
install -m 755 debian/discover1.bug debian/discover1/usr/share/bug/discover1
-# discover1-udeb
- cp -a lib/.libs/*.so* $(CURDIR)/debian/discover1-udeb/lib
- rm -f $(CURDIR)/debian/discover1-udeb/lib/*.so
+ # udebs
+ cp -a lib/.libs/*.so* $(CURDIR)/debian/libdiscover1-udeb/lib
+ rm -f $(CURDIR)/debian/libdiscover1-udeb/lib/*.so
cp -a $(CURDIR)/debian/tmp/sbin/discover \
$(CURDIR)/debian/discover1-udeb/sbin
@@ -79,9 +77,7 @@
# Ye olde no-op.
# Build architecture-dependent files here.
-binary-arch: build install non-discover1-udeb discover1-udeb
-
-non-discover1-udeb:
+binary-arch: build install
dh_testdir
dh_testroot
dh_movefiles
@@ -89,29 +85,15 @@
dh_installdocs
dh_installchangelogs
dh_installinit --name=discover --no-start --update-rcd-params="start 36 S ."
- dh_strip -Ndiscover1-udeb
- dh_compress -Ndiscover1-udeb
- dh_fixperms -Ndiscover1-udeb
- dh_makeshlibs -plibdiscover1
- dh_installdeb -Ndiscover1-udeb
- dh_shlibdeps -ldebian/libdiscover1/usr/lib -Ndiscover1-udeb
- dh_gencontrol -Ndiscover1-udeb
- dh_md5sums -Ndiscover1-udeb
- dh_builddeb -Ndiscover1-udeb
-
-discover1-udeb: build install
- dh_testdir
- dh_testroot
-
- dh_strip -pdiscover1-udeb
- dh_fixperms -pdiscover1-udeb
- dh_installdeb -pdiscover1-udeb --filename=discover1-udeb.udeb
- dh_shlibdeps -ldebian/libdiscover1/usr/lib -pdiscover1-udeb
- # Don't write your stupid guesses to debian/files.
- dh_gencontrol -pdiscover1-udeb -- -fdebian/files~
- # Register file manually.
- dpkg-distaddfile $(UFILENAME) debian-installer extra
- dh_builddeb -pdiscover1-udeb --filename=$(UFILENAME)
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_makeshlibs -plibdiscover1 --add-udeb=libdiscover1-udeb
+ dh_installdeb
+ dh_shlibdeps -ldebian/libdiscover1/usr/lib
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install discover1-udeb non-discover1-udeb
Attachment:
signature.asc
Description: Digital signature