X Strike Force Xft SVN commit: r96 - trunk/debian
Author: branden
Date: 2004-02-16 15:30:09 -0500 (Mon, 16 Feb 2004)
New Revision: 96
Removed:
trunk/debian/libxft-dev.postrm
Modified:
trunk/debian/changelog
trunk/debian/control
trunk/debian/libxft-dev.preinst
Log:
Merge changes from branches/post-xfree86-4.3.0-reorg.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-12-10 00:28:36 UTC (rev 95)
+++ trunk/debian/changelog 2004-02-16 20:30:09 UTC (rev 96)
@@ -1,3 +1,17 @@
+xft (2.1.2-6) unstable; urgency=low
+
+ * 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
+
+ -- Branden Robinson <branden@debian.org> Tue, 9 Dec 2003 15:22:53 -0500
+
xft (2.1.2-5) unstable; urgency=medium
* Urgency due to fix for FTBFS problem introduced by new FreeType library.
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2003-12-10 00:28:36 UTC (rev 95)
+++ trunk/debian/control 2004-02-16 20:30:09 UTC (rev 96)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Branden Robinson <branden@debian.org>
-Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.0.0), libfontconfig1-dev, libfreetype6-dev, zlib1g-dev | libz-dev, libxrender-dev, xlibs-dev
+Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.0.0), libfontconfig1-dev, libfreetype6-dev, x-dev, libx11-dev, libxrender-dev, zlib1g-dev | libz-dev
Standards-Version: 3.6.1
Package: libxft2
@@ -39,8 +39,8 @@
Package: libxft-dev
Section: libdevel
Architecture: any
-Depends: libxft2 (= ${Source-Version}), libc6-dev | libc-dev, libfontconfig1-dev, libfreetype6-dev, zlib1g-dev | libz-dev, libxrender-dev, xlibs-dev
-Conflicts: libxft2-dev
+Depends: libxft2 (= ${Source-Version}), libc6-dev | libc-dev, libfontconfig1-dev, libfreetype6-dev, x-dev, libx11-dev, libxrender-dev, zlib1g-dev | libz-dev
+Conflicts: libxft2-dev, xlibs-dev (<< 4.3.0)
Provides: libxft2-dev
Description: FreeType-based font drawing library for X (development files)
Xft provides a client-side font API for X applications, making the FreeType
Deleted: trunk/debian/libxft-dev.postrm
===================================================================
--- trunk/debian/libxft-dev.postrm 2003-12-10 00:28:36 UTC (rev 95)
+++ trunk/debian/libxft-dev.postrm 2004-02-16 20:30:09 UTC (rev 96)
@@ -1,24 +0,0 @@
-#!/bin/bash
-# -*- coding: utf-8 -*-
-# Postrm for libxft-dev
-# Copyright © 2002 Colin Walters <walters@gnu.org>
-# Copyright © 2003 Branden Robinson <branden@debian.org>
-
-# $Id$
-
-set -e
-
-if [ "$1" = "remove" ]; then
- # Remove the diversions created by this package's pre-installation script.
- dpkg-divert --package libxft-dev --remove --rename \
- --divert /usr/X11R6/include/X11/Xft/Xft1.h \
- /usr/X11R6/include/X11/Xft/Xft.h
- dpkg-divert --package libxft-dev --remove --rename \
- --divert /usr/X11R6/lib/libXft1.a /usr/X11R6/lib/libXft.a
- dpkg-divert --package libxft-dev --remove --rename \
- --divert /usr/X11R6/lib/libXft1.so /usr/X11R6/lib/libXft.so
-fi
-
-#DEBHELPER#
-
-# vim:set ai et sts=4 sw=4 tw=0:
Modified: trunk/debian/libxft-dev.preinst
===================================================================
--- trunk/debian/libxft-dev.preinst 2003-12-10 00:28:36 UTC (rev 95)
+++ trunk/debian/libxft-dev.preinst 2004-02-16 20:30:09 UTC (rev 96)
@@ -9,28 +9,30 @@
set -e
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
+ # Remove any diversions created by earlier versions of this package
+ # (libxft-dev), and any still present that were created by the previous
+ # name of this package (libxft2-dev).
+ for PKG in libxft-dev libxft2-dev; do
+ if dpkg-divert --list /usr/X11R6/include/X11/Xft/Xft.h | \
+ grep "\<$PKG\$"; then
+ dpkg-divert --package libxft2-dev --remove --rename \
+ --divert /usr/X11R6/include/X11/Xft/Xft1.h \
+ /usr/X11R6/include/X11/Xft/Xft.h
+ fi
- # Remove any diversions still present that were created by the previous
- # name of this package.
- if dpkg-divert --list /usr/X11R6/include/X11/Xft/Xft.h | \
- grep '\<libxft2-dev$'; then
- dpkg-divert --package libxft2-dev --remove --rename \
- --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 | \
+ grep "\<$PKG\$"; 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.a | \
- grep '\<libxft2-dev$'; 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 | \
+ grep "\<$PKG\$"; then
+ dpkg-divert --package libxft2-dev --remove --rename \
+ --divert /usr/X11R6/lib/libXft1.so /usr/X11R6/lib/libXft.so
+ fi
+ done
- if dpkg-divert --list /usr/X11R6/lib/libXft.so | \
- grep '\<libxft2-dev$'; then
- dpkg-divert --package libxft2-dev --remove --rename \
- --divert /usr/X11R6/lib/libXft1.so /usr/X11R6/lib/libXft.so
- fi
-
# The following diversion dates back to libxft2-dev << 2.1.1, but we have
# no way of knowing what version of a different package was on the system.
if dpkg-divert --list /usr/X11R6/include/X11/Xft/XftFreetype.h | \
@@ -39,16 +41,6 @@
--divert /usr/X11R6/include/X11/Xft/XftFreetype1.h \
/usr/X11R6/include/X11/Xft/XftFreetype.h
fi
-
- # Add diversions for this package. These can go away when we can conflict
- # with "xlibs-dev (<< 4.3.0)".
- dpkg-divert --package libxft-dev --add --rename \
- --divert /usr/X11R6/include/X11/Xft/Xft1.h \
- /usr/X11R6/include/X11/Xft/Xft.h
- dpkg-divert --package libxft-dev --add --rename \
- --divert /usr/X11R6/lib/libXft1.a /usr/X11R6/lib/libXft.a
- dpkg-divert --package libxft-dev --add --rename \
- --divert /usr/X11R6/lib/libXft1.so /usr/X11R6/lib/libXft.so
fi
#DEBHELPER#
Reply to: