X Strike Force Xft SVN commit: rev 94 - branches/post-xfree86-4.3.0-in-debian-unstable/debian
Author: branden
Date: 2003-12-09 15:32:37 -0500 (Tue, 09 Dec 2003)
New Revision: 94
Modified:
branches/post-xfree86-4.3.0-in-debian-unstable/debian/changelog
branches/post-xfree86-4.3.0-in-debian-unstable/debian/control
branches/post-xfree86-4.3.0-in-debian-unstable/debian/libxft-dev.preinst
Log:
Make package compatible with the XFree86 4.3.0 package reorganization.
- debian/control:
+ package build-depends on x-dev and libx11-dev instead of xlibs-dev
+ libxrender-dev depends on x-dev and libx11-dev instead of xlibs-dev
+ make libxft-dev conflict with xlibs-dev (<< 4.3.0) due to (now
undiverted) file overlaps
- debian/libxft-dev.preinst: remove diversions made by previous versions
of package if present
- debian/libxft-dev.postrm: deleted
Modified: branches/post-xfree86-4.3.0-in-debian-unstable/debian/changelog
===================================================================
--- branches/post-xfree86-4.3.0-in-debian-unstable/debian/changelog 2003-11-17 08:29:55 UTC (rev 93)
+++ branches/post-xfree86-4.3.0-in-debian-unstable/debian/changelog 2003-12-09 20:32:37 UTC (rev 94)
@@ -1,18 +1,16 @@
-xft (2.1.2-THE.FUTURE) unstable; urgency=low
+xft (2.1.2-2) unstable; urgency=low
- * Make libxft-dev conflict with xlibs-dev (<< 4.3.0), since the latter also
- provided a static library and header files for (a previous version of) the
- Xft library.
- - debian/control
-
- * Stop diverting static library, header file, and symbolic link to shared
- library used by the compile-time linker. If upgrading from versions of
- the package which created these diversions, remove them prior to
- installation of this version.
+ * Make package compatible with the XFree86 4.3.0 package reorganization.
+ - debian/control:
+ + package build-depends on x-dev and libx11-dev instead of xlibs-dev
+ + libxrender-dev depends on x-dev and libx11-dev instead of xlibs-dev
+ + make libxft-dev conflict with xlibs-dev (<< 4.3.0) due to (now
+ undiverted) file overlaps
+ - debian/libxft-dev.preinst: remove diversions made by previous versions
+ of package if present
- debian/libxft-dev.postrm: deleted
- - debian/libxft-dev.preinst: remove old diversions as needed
- -- Branden Robinson <branden@debian.org> Mon, 6 Oct 2003 21:54:31 -0500
+ -- Branden Robinson <branden@debian.org> Tue, 9 Dec 2003 15:22:53 -0500
xft (2.1.2-1) unstable; urgency=low
Modified: branches/post-xfree86-4.3.0-in-debian-unstable/debian/control
===================================================================
--- branches/post-xfree86-4.3.0-in-debian-unstable/debian/control 2003-11-17 08:29:55 UTC (rev 93)
+++ branches/post-xfree86-4.3.0-in-debian-unstable/debian/control 2003-12-09 20:32:37 UTC (rev 94)
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Branden Robinson <branden@debian.org>
-Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.0.0), libfontconfig1-dev, libfreetype6-dev, libxrender-dev (>> 0.8.1), xlibs-dev (>> 4.2.1), zlib1g-dev | libz-dev
+Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.0.0), libfontconfig1-dev, libfreetype6-dev, libx11-dev, libxrender-dev (>> 0.8.1), x-dev, zlib1g-dev | libz-dev
Standards-Version: 3.6.1
Package: libxft2
@@ -38,7 +38,7 @@
Package: libxft-dev
Section: libdevel
Architecture: any
-Depends: libxft2 (= ${Source-Version}), libc6-dev | libc-dev, libfontconfig1-dev, libfreetype6-dev, libxrender-dev (>> 0.8.1), xlibs-dev (>> 4.2.1), zlib1g-dev | libz-dev, pkg-config
+Depends: libxft2 (= ${Source-Version}), libc6-dev | libc-dev, libfontconfig1-dev, libfreetype6-dev, libx11-dev, libxrender-dev (>> 0.8.1), x-dev, zlib1g-dev | libz-dev, pkg-config
Conflicts: xlibs-dev (<< 4.3.0)
Description: FreeType-based font drawing library for X (development files)
Xft provides a client-side font API for X applications, making the FreeType
Modified: branches/post-xfree86-4.3.0-in-debian-unstable/debian/libxft-dev.preinst
===================================================================
--- branches/post-xfree86-4.3.0-in-debian-unstable/debian/libxft-dev.preinst 2003-11-17 08:29:55 UTC (rev 93)
+++ branches/post-xfree86-4.3.0-in-debian-unstable/debian/libxft-dev.preinst 2003-12-09 20:32:37 UTC (rev 94)
@@ -9,19 +9,32 @@
set -e
if [ "$1" = "upgrade" ]; then
- # we no longer ship XftFreetype.h, so we no longer have to divert it
- if dpkg --compare-versions "$2" lt "2.1.1"; then
+ # Eliminate diversion created by xft2 (<= 2.1-8). "dpkg-divert --list"
+ # does not have a useful exit status, so we have to compare its output to
+ # the null string.
+ if [ "$(dpkg-divert --list /usr/X11R6/include/X11/Xft/XftFreetype.h)" != \
+ "" ]; then
dpkg-divert --package libxft2-dev --remove --rename \
- --divert /usr/X11R6/include/X11/Xft/XftFreetype1.h /usr/X11R6/include/X11/Xft/XftFreetype.h
+ --divert /usr/X11R6/include/X11/Xft/XftFreetype1.h \
+ /usr/X11R6/include/X11/Xft/XftFreetype.h
fi
- # remove diversions created by versions of the package which had to coexist
- # with versions of xlibs-dev that also provided these files
- if dpkg --compare-versions "$2" lt "2.1.2-THE.FUTURE"; then
+ # Eliminate diversions created by xft (<= 2.1.2-1).
+ if [ "$(dpkg-divert --list /usr/X11R6/include/X11/Xft/Xft.h)" != \
+ "" ]; then
dpkg-divert --package libxft2-dev --remove --rename \
- --divert /usr/X11R6/include/X11/Xft/Xft1.h /usr/X11R6/include/X11/Xft/Xft.h
+ --divert /usr/X11R6/include/X11/Xft/Xft1.h \
+ /usr/X11R6/include/X11/Xft/Xft.h
+ fi
+
+ if [ "$(dpkg-divert --list /usr/X11R6/lib/libXft.a)" != \
+ "" ]; then
dpkg-divert --package libxft2-dev --remove --rename \
--divert /usr/X11R6/lib/libXft1.a /usr/X11R6/lib/libXft.a
+ fi
+
+ if [ "$(dpkg-divert --list /usr/X11R6/lib/libXft.so)" != \
+ "" ]; then
dpkg-divert --package libxft2-dev --remove --rename \
--divert /usr/X11R6/lib/libXft1.so /usr/X11R6/lib/libXft.so
fi
Reply to: