tags 427326 patch
usertags 427326 patch-provided
thanks

The attached patch makes use of d-shlibs --override feature
(introduced in 0.30) to solve this problem.

I'm not certain if this override should be included by d-shlibs, since
it is different for each of the packages, depending on whether one is
using {xpm,no-xpm}.

----------------------------------------------------------------------
diff -r 9b17011c4e7e debian/control
--- a/debian/control    Mon Sep 03 14:20:02 2007 -0500
+++ b/debian/control    Mon Sep 03 16:55:21 2007 -0500
@@ -2,7 +2,7 @@ Section: libs
 Section: libs
 Priority: optional
 Maintainer: Jonas Smedegaard <[EMAIL PROTECTED]>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), dh-buildinfo, 
patchutils (>= 0.2.25), d-shlibs (>> 0.23), libgd2-noxpm-dev (>> 2.0.28), 
libxpm-dev | xlibs-dev (<< 4.3.0), libxt-dev | xlibs-dev (<< 4.3.0)
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), dh-buildinfo, 
patchutils (>= 0.2.25), d-shlibs (>> 0.30), libgd2-noxpm-dev (>> 2.0.28), 
libxpm-dev | xlibs-dev (<< 4.3.0), libxt-dev | xlibs-dev (<< 4.3.0)
 Standards-Version: 3.6.2
 
 Package: libgdchart-gd2-noxpm-dev
diff -r 9b17011c4e7e debian/rules
--- a/debian/rules      Mon Sep 03 14:20:02 2007 -0500
+++ b/debian/rules      Mon Sep 03 16:55:21 2007 -0500
@@ -118,12 +118,12 @@ binary-install/$(package)-noxpm-dev::
        ln -sf $(library).so.$(version) 
debian/$(package)-noxpm-dev/usr/lib/$(library).so
 
 binary-fixup/$(package)-xpm-dev::
-       d-devlibdeps debian/$(package)-xpm-dev.substvars 
$(package)-xpm/$(library).so.$(version)
+       d-devlibdeps --override 's/libgd2-dev/libgd2-xpm-dev/' 
debian/$(package)-xpm-dev.substvars $(package)-xpm/$(library).so.$(version)
 # We don't actually use the XPM calls, so noxpm version is ok
        perl -i -pne 's/libgd2-dev/libgd2-noxpm-dev \| libgd2-xpm-dev/g' 
debian/$(package)-xpm-dev.substvars
 
 binary-fixup/$(package)-noxpm-dev::
-       d-devlibdeps debian/$(package)-noxpm-dev.substvars 
$(package)-noxpm/$(library).so.$(version)
+       d-devlibdeps --override 's/libgd2-dev/libgd2-noxpm-dev/' 
debian/$(package)-noxpm-dev.substvars $(package)-noxpm/$(library).so.$(version)
 # We don't actually use the XPM calls, so noxpm version is ok
        perl -i -pne 's/libgd2-dev/libgd2-noxpm-dev \| libgd2-xpm-dev/g' 
debian/$(package)-noxpm-dev.substvars
 
----------------------------------------------------------------------

Attachment: signature.asc
Description: Digital signature

Reply via email to