I've NMU'ed a new version for this change with permission from Steve Langasek.
The full patch for the NMU, including the changelog entry, is attached. Cheers, 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,12 @@
+freetype (2.1.10-1.2) unstable; urgency=low
+
+ * Non Maintainer Upload (closes: #355939)
+ * Add support for udeb dependency resolution in shlibs file
+ * Simplify debian/rules by making use of udeb support in debhelper
+ * Update debhelper compatibility to level 5
+
+ -- Frans Pop <[EMAIL PROTECTED]> Sat, 18 Mar 2006 17:07:46 +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
pgp9jHW6Y5yy6.pgp
Description: PGP signature
