tag 499662 + patch thanks Le jeudi 02 octobre 2008 à 16:38 +0100, Neil Williams a écrit : > > This would really be the very same version of the library, with more > > symbols. Nothing can break more than when you simply upgrade the library > > to a new version. > > Except that the diversion can also be undone and the symbols removed - > akin to downgrading the library to the old version. Anyway, I'm not > sure we need the diversion.
Anyway, the diversion approach doesn’t work. As documented in dpkg-divert(1), ldconfig throws away any diversions made to shared libraries. So here is a patch for the simple approach, consisting of adding a hard dependency on libdirectfb. Note that it does not modify the size of the default desktop install, since it is already pulled by the following dependency chain: g-d-e -> ekiga -> libpt -> SDL -> directfb. I have checked these changes work at least for the runtime, I just have to check whether changes are required to the GTK+ build. (I don’t think there are, but you never know.) Cheers, -- .''`. : :' : We are debian.org. Lower your prices, surrender your code. `. `' We will add your hardware and software distinctiveness to `- our own. Resistance is futile.
reverted: --- cairo-1.6.4/debian/libcairo-directfb2.install +++ cairo-1.6.4.orig/debian/libcairo-directfb2.install @@ -1 +0,0 @@ -debian/dist-directfb/usr/lib/libcairo-directfb/lib/libcairo.so.* /usr/lib/libcairo-directfb/lib diff -u cairo-1.6.4/debian/libcairo2.symbols cairo-1.6.4/debian/libcairo2.symbols --- cairo-1.6.4/debian/libcairo2.symbols +++ cairo-1.6.4/debian/libcairo2.symbols @@ -17,6 +17,7 @@ [EMAIL PROTECTED] 1.2.4 [EMAIL PROTECTED] 1.2.4 [EMAIL PROTECTED] 1.2.4 + [EMAIL PROTECTED] 1.6.4-6.1~ [EMAIL PROTECTED] 1.2.4 [EMAIL PROTECTED] 1.2.4 [EMAIL PROTECTED] 1.2.4 @@ -240,10 +241,10 @@ [EMAIL PROTECTED] 1.2.4 [EMAIL PROTECTED] 1.2.4 [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.6.4-5 - [EMAIL PROTECTED] 1.6.4-5 - [EMAIL PROTECTED] 1.6.4-5 - [EMAIL PROTECTED] 1.6.4-5 + [EMAIL PROTECTED] 1.6.4-5~ + [EMAIL PROTECTED] 1.6.4-5~ + [EMAIL PROTECTED] 1.6.4-5~ + [EMAIL PROTECTED] 1.6.4-5~ [EMAIL PROTECTED] 1.2.4 [EMAIL PROTECTED] 1.2.4 [EMAIL PROTECTED] 1.2.4 diff -u cairo-1.6.4/debian/control cairo-1.6.4/debian/control --- cairo-1.6.4/debian/control +++ cairo-1.6.4/debian/control @@ -4,17 +4,17 @@ Maintainer: Dave Beckett <[EMAIL PROTECTED]> Uploaders: Sebastian Dröge <[EMAIL PROTECTED]> Build-Depends: debhelper (>= 5.0.22), dpkg-dev (>= 1.14.13), autotools-dev, pkg-config (>= 0.19), libfontconfig1-dev, libfreetype6-dev (>= 2.1.10), libxrender-dev (>= 0.6.0), libx11-dev, libpng12-dev, libdirectfb-dev (>= 0.9.25), libsm-dev, xutils-dev, libxt-dev, dpatch, libpixman-1-dev (>= 0.10.0), libxcb1-dev (>= 0.9.92), libxcb-render0-dev (>= 0.9.92), libxcb-render-util0-dev -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Homepage: http://cairographics.org/ Package: libcairo2-dev Provides: libcairo-dev -Conflicts: libcairo-dev, libcairo0.5.1-dev, libcairo0.6.0-dev, libcairo0.9.0-dev +Conflicts: libcairo-dev, libcairo0.5.1-dev, libcairo0.6.0-dev, libcairo0.9.0-dev, libcairo-directfb2-dev (<< 1.6.4-6.1) Replaces: libcairo0.5.1-dev, libcairo0.6.0-dev, libcairo0.9.0-dev Suggests: libcairo2-doc Section: libdevel Architecture: any -Depends: libcairo2 (= ${binary:Version}), libfontconfig1-dev, libfreetype6-dev (>= 2.1.10), libxrender-dev (>= 0.6.0), libpng12-dev, libsm-dev, libpixman-1-dev (>= 0.10.0), libxcb1-dev, libxcb-render0-dev, libxcb-render-util0-dev +Depends: libcairo2 (= ${binary:Version}), libfontconfig1-dev, libfreetype6-dev (>= 2.1.10), libxrender-dev (>= 0.6.0), libpng12-dev, libdirectfb-dev (>= 0.9.25), libsm-dev, libpixman-1-dev (>= 0.10.0), libxcb1-dev, libxcb-render0-dev, libxcb-render-util0-dev Description: Development files for the Cairo 2D graphics library Cairo is a multi-platform library providing anti-aliased vector-based rendering for multiple target backends. @@ -86,25 +86,25 @@ -Depends: ${shlibs:Depends} +Depends: libcairo2 (= ${binary:Version}) Provides: libcairo-directfb Conflicts: libcairo2-directfb Replaces: libcairo2-directfb -Description: The Cairo 2D vector graphics library DirectFB build +Description: The Cairo 2D vector graphics library DirectFB build (dummy package) Cairo is a multi-platform library providing anti-aliased vector-based rendering for multiple target backends. . - This is version of cairo with only the DirectFB backend enabled. - Use libcairo2 for the full backend choice. + This is a legacy compatibility package that provides files at locations + that are deprecated now. Anything required to run Cairo+DirectFB + binaries is in the libcairo2 package. Package: libcairo-directfb2-dev Section: libdevel Architecture: any Conflicts: libcairo2-directfb-dev Replaces: libcairo2-directfb-dev -Depends: libcairo-directfb2 (= ${binary:Version}), libfontconfig1-dev, libfreetype6-dev (>= 2.1.10), libpng12-dev, libdirectfb-dev (>= 0.9.25), libpixman-1-dev (>= 0.10.0) -Description: Development files for Cairo graphics library DirectFB build +Depends: libcairo-directfb2 (= ${binary:Version}), libcairo2-dev (= ${binary:Version}) +Description: Development files for Cairo graphics library DirectFB build (dummy package) Cairo is a multi-platform library providing anti-aliased vector-based rendering for multiple target backends. . - This package contains the development libraries, header files needed by - programs that want to compile with Cairo compiled only against the - DirectFB backend. Intended primarly for use in the graphical Debian - installer, other builds should be against libcairo2-dev + This is a legacy compatibility package that provides files at locations + that are deprecated now. Anything required to build Cairo+DirectFB + binaries is in the libcairo2-dev package. diff -u cairo-1.6.4/debian/libcairo2-doc.doc-base cairo-1.6.4/debian/libcairo2-doc.doc-base --- cairo-1.6.4/debian/libcairo2-doc.doc-base +++ cairo-1.6.4/debian/libcairo2-doc.doc-base @@ -4,7 +4,7 @@ Abstract: Cairo is a multi-platform library providing anti-aliased vector-based rendering for multiple target backends. This document covers programming using the Cairo library. -Section: graphics +Section: Programming/C Format: HTML Index: /usr/share/gtk-doc/html/cairo/index.html diff -u cairo-1.6.4/debian/rules cairo-1.6.4/debian/rules --- cairo-1.6.4/debian/rules +++ cairo-1.6.4/debian/rules @@ -21,7 +21,7 @@ # MAIN_CONFIGURE_FLAGS = \ --enable-xlib --enable-pdf --enable-ps --enable-svg \ ---disable-glitz --enable-xcb --disable-directfb \ +--disable-glitz --enable-xcb --enable-directfb \ --enable-png # udeb package flags @@ -33,8 +33,6 @@ --enable-png \ --program-suffix=-directfb -DIRECTFB_PREFIX=/usr/lib/libcairo-directfb - SRC_DIR=$(CURDIR) MAIN_BUILD_DIR=$(CURDIR)/debian/build-main DIRECTFB_BUILD_DIR=$(CURDIR)/debian/build-directfb @@ -111,7 +109,7 @@ $(SRC_DIR)/configure \ CFLAGS="$(CFLAGS_UDEB)" \ $(CONFFLAGS) \ - --prefix=$(DIRECTFB_PREFIX) \ + --prefix=$(prefix) \ --mandir=$(share)/man \ --infodir=$(share)/info \ $(DIRECTFB_CONFIGURE_FLAGS) @@ -124,13 +122,13 @@ build-main-stamp: configure-main-stamp dh_testdir cd $(MAIN_BUILD_DIR) && $(MAKE) - touch build-stamp + touch $@ build-udeb: build-udeb-stamp build-udeb-stamp: configure-udeb-stamp dh_testdir cd $(DIRECTFB_BUILD_DIR) && $(MAKE) - touch build-stamp + touch $@ clean: unpatch dh_testdir @@ -138,7 +136,6 @@ rm -f *-stamp libtool rm -rf debian/libcairo2 debian/libcairo2-dev debian/libcairo2-doc libcairo-directfb2-udeb debian/libcairo-directfb2-udeb-dev debian/libcairo-directfb2 rm -rf $(MAIN_BUILD_DIR) $(DIRECTFB_BUILD_DIR) $(MAIN_DIST_DIR) $(DIRECTFB_DIST_DIR) - rm -f debian/cairo-directfb.pc -rm -f config.h config.cache config.status config.log @@ -162,11 +159,7 @@ cd $(DIRECTFB_BUILD_DIR) && $(MAKE) install DESTDIR=$(DIRECTFB_DIST_DIR) - mkdir -p $(DIRECTFB_DIST_DIR)/usr/lib/pkgconfig - sed -e 's/Name: cairo/Name: cairo-directfb/' -e 's/^\(Libs: .*\)$$/\1 -Wl,-rpath,$${libdir}/' $(DIRECTFB_DIST_DIR)/$(DIRECTFB_PREFIX)/lib/pkgconfig/cairo.pc > $(DIRECTFB_DIST_DIR)/usr/lib/pkgconfig/cairo-directfb.pc - - sed -i 's:/usr/lib/lib\([^ ]*\).la:-l\1:g' $(MAIN_DIST_DIR)/usr/lib/*.la - sed -i 's:/usr/lib/lib\([^ ]*\).la:-l\1:g' $(DIRECTFB_DIST_DIR)/usr/lib/libcairo-directfb/lib/*.la + sed -i "/dependency_libs/ s/'.*'/''/" $(MAIN_DIST_DIR)/usr/lib/*.la # Build architecture-independent files here. binary-indep: build install @@ -195,11 +188,9 @@ dh_link -s dh_strip -s --dbg-package=libcairo2-dbg -Nlibcairo-directfb2-udeb -Nlibcairo-directfb2 dh_strip -plibcairo-directfb2-udeb -plibcairo-directfb2 - rm -rf debian/libcairo2-dbg/usr/lib/debug/usr/lib/libcairo-directfb dh_compress -s dh_fixperms -s - dh_makeshlibs -plibcairo2 -V 'libcairo2 (>= 1.6.4-5)' -- -c4 - dh_makeshlibs -plibcairo-directfb2 -V 'libcairo-directfb2 (>= 1.6.0)' --add-udeb 'libcairo-directfb2-udeb' -- -edebian/libcairo-directfb2/usr/lib/libcairo-directfb/lib/libcairo.so.2.* -c4 + dh_makeshlibs -plibcairo2 -V 'libcairo2 (>= 1.6.4-6.1)' -- -c4 dh_installdeb -s dh_shlibdeps -s dh_perl -s diff -u cairo-1.6.4/debian/libcairo-directfb2-udeb.install cairo-1.6.4/debian/libcairo-directfb2-udeb.install --- cairo-1.6.4/debian/libcairo-directfb2-udeb.install +++ cairo-1.6.4/debian/libcairo-directfb2-udeb.install @@ -1 +1 @@ -debian/dist-directfb/usr/lib/libcairo-directfb/lib/libcairo.so.* /usr/lib +debian/dist-directfb/usr/lib/libcairo.so.* /usr/lib diff -u cairo-1.6.4/debian/changelog cairo-1.6.4/debian/changelog --- cairo-1.6.4/debian/changelog +++ cairo-1.6.4/debian/changelog @@ -1,3 +1,23 @@ +cairo (1.6.4-6.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Remove the rpath stuff in /usr/lib/libcairo-directdb and only keep + it around for compatibility. Closes: #499662. + + Remove the rpath hack in the .pc file. + + Make the libcairo-directfb2{,dev} packages dummy, only keeping + symbolic links from the former locations. + + Update package descriptions accordingly. + + libcairo2.symbols: add cairo_directfb_surface_create. + + libcairo2-dev conflicts with libcairo-directfb2-dev + (<< 1.6.4-6.1). + * rules: completely cleanup the .la files from their dependency libs. + Closes: #491292. + * Add ~ to symbol versions to make backports possible. + * Fix doc-base section. + * Standards version is 3.8.0. + + -- Josselin Mouette <[EMAIL PROTECTED]> Thu, 02 Oct 2008 18:18:47 +0200 + cairo (1.6.4-6) unstable; urgency=low * debian/control: reverted: --- cairo-1.6.4/debian/libcairo-directfb2.symbols +++ cairo-1.6.4.orig/debian/libcairo-directfb2.symbols @@ -1,238 +0,0 @@ -libcairo.so.2 libcairo-directfb2 #MINVER# -* Build-Depends-Package: libcairo-directfb2-dev - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.6.0 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.6.0 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.6.0 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.6.0 - [EMAIL PROTECTED] 1.6.0 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.6.0 - [EMAIL PROTECTED] 1.6.0 - [EMAIL PROTECTED] 1.6.0 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.6.0 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.4.10 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.6.0 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 - [EMAIL PROTECTED] 1.2.4 reverted: --- cairo-1.6.4/debian/libcairo-directfb2-dev.install +++ cairo-1.6.4.orig/debian/libcairo-directfb2-dev.install @@ -1,4 +0,0 @@ -debian/dist-directfb/usr/lib/libcairo-directfb/include/cairo/*.h /usr/lib/libcairo-directfb/include/cairo -debian/dist-directfb/usr/lib/libcairo-directfb/lib/libcairo.so /usr/lib/libcairo-directfb/lib -debian/dist-directfb/usr/lib/libcairo-directfb/lib/libcairo*.a /usr/lib/libcairo-directfb/lib -debian/dist-directfb/usr/lib/pkgconfig/cairo-directfb.pc /usr/lib/pkgconfig only in patch2: unchanged: --- cairo-1.6.4.orig/debian/libcairo-directfb2-dev.links +++ cairo-1.6.4/debian/libcairo-directfb2-dev.links @@ -0,0 +1,3 @@ +/usr/include/cairo /usr/lib/libcairo-directfb/include/cairo +/usr/lib/libcairo.so /usr/lib/libcairo-directfb/lib/libcairo.so +/usr/lib/libcairo.a /usr/lib/libcairo-directfb/lib/libcairo.a only in patch2: unchanged: --- cairo-1.6.4.orig/debian/libcairo-directfb2.links +++ cairo-1.6.4/debian/libcairo-directfb2.links @@ -0,0 +1 @@ +/usr/lib/libcairo.so.2 /usr/lib/libcairo-directfb/lib/libcairo.so.2
signature.asc
Description: Ceci est une partie de message numériquement signée
