Bug#356252: libpng: Please add add udeb: lines to shlibs file

[Frans Pop]

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 as freetype depends on libpng.

The full patch for the NMU, including the changelog entry, is attached.

I have left the debian/libpng12-0.shlibs in place but suggest you check if 
that is still actually needed.

Cheers,
Frans Pop


diff -u libpng-1.2.8rel/debian/control libpng-1.2.8rel/debian/control
--- libpng-1.2.8rel/debian/control
+++ libpng-1.2.8rel/debian/control
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Josselin Mouette <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.2), zlib1g-dev, cdbs, mawk
+Build-Depends: debhelper (>= 5.0.22), zlib1g-dev, cdbs, mawk
 Standards-Version: 3.6.2
 
 Package: libpng12-0
@@ -49,8 +49,7 @@
 XC-Package-Type: udeb
 Section: debian-installer
 Architecture: any
-Depends: zlib1g-udeb
-Provides: libpng12-0
+Depends: ${shlibs:Depends}
 Description: PNG library - minimal runtime library
  libpng is a library implementing an interface for reading and writing
  PNG (Portable Network Graphics) format files.
diff -u libpng-1.2.8rel/debian/libpng12-0.shlibs libpng-1.2.8rel/debian/libpng12-0.shlibs
--- libpng-1.2.8rel/debian/libpng12-0.shlibs
+++ libpng-1.2.8rel/debian/libpng12-0.shlibs
@@ -1,0 +2 @@
+udeb: libpng12 0 libpng12-0-udeb (>= 1.2.8rel)
diff -u libpng-1.2.8rel/debian/rules libpng-1.2.8rel/debian/rules
--- libpng-1.2.8rel/debian/rules
+++ libpng-1.2.8rel/debian/rules
@@ -29,6 +29,7 @@
 DEB_INSTALL_DOCS_libpng12-dev := --no-act
 DEB_INSTALL_CHANGELOGS_libpng3 := --no-act
 DEB_INSTALL_CHANGELOGS_libpng12-dev := --no-act
+DEB_DH_MAKESHLIBS_ARGS_libpng12-0 := --add-udeb="$(UPACKAGE)"
 
 binary-post-install/libpng12-dev::
 	dh_installdocs -plibpng12-dev -Xcopyright
diff -u libpng-1.2.8rel/debian/changelog libpng-1.2.8rel/debian/changelog
--- libpng-1.2.8rel/debian/changelog
+++ libpng-1.2.8rel/debian/changelog
@@ -1,3 +1,11 @@
+libpng (1.2.8rel-5.1) unstable; urgency=low
+
+  * Non Maintainer Upload (closes: #356252).
+  * Add support for udeb dependency resolution in shlibs file.
+  * Update debhelper compatibility to level 5.
+
+ -- Frans Pop <[EMAIL PROTECTED]>  Thu, 30 Mar 2006 11:46:39 +0200
+
 libpng (1.2.8rel-5) unstable; urgency=low
 
   * drop_pass_width.patch: don't export png_pass_width, it's absolutely 
diff -u libpng-1.2.8rel/debian/compat libpng-1.2.8rel/debian/compat
--- libpng-1.2.8rel/debian/compat
+++ libpng-1.2.8rel/debian/compat
@@ -1 +1 @@
-4
+5

pgprOscNH2YXo.pgp
Description: PGP signature