X Strike Force Xft SVN commit: rev 68 - branches/post-xfree86-4.3.0-in-debian-unstable/debian
Author: branden
Date: 2003-10-06 21:56:38 -0500 (Mon, 06 Oct 2003)
New Revision: 68
Removed:
branches/post-xfree86-4.3.0-in-debian-unstable/debian/libxft-dev.postrm
Modified:
branches/post-xfree86-4.3.0-in-debian-unstable/debian/changelog
branches/post-xfree86-4.3.0-in-debian-unstable/debian/libxft-dev.preinst
Log:
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.
- debian/libxft-dev.postrm: deleted
- debian/libxft-dev.preinst: remove old diversions as needed
Modified: branches/post-xfree86-4.3.0-in-debian-unstable/debian/changelog
===================================================================
--- branches/post-xfree86-4.3.0-in-debian-unstable/debian/changelog 2003-10-07 02:50:50 UTC (rev 67)
+++ branches/post-xfree86-4.3.0-in-debian-unstable/debian/changelog 2003-10-07 02:56:38 UTC (rev 68)
@@ -5,8 +5,15 @@
Xft library.
- debian/control
- -- Branden Robinson <branden@debian.org> Mon, 6 Oct 2003 21:48:25 -0500
+ * 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.
+ - 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
+
xft (2.1.2-1) unstable; urgency=low
* new upstream version
Deleted: branches/post-xfree86-4.3.0-in-debian-unstable/debian/libxft-dev.postrm
===================================================================
--- branches/post-xfree86-4.3.0-in-debian-unstable/debian/libxft-dev.postrm 2003-10-07 02:50:50 UTC (rev 67)
+++ branches/post-xfree86-4.3.0-in-debian-unstable/debian/libxft-dev.postrm 2003-10-07 02:56:38 UTC (rev 68)
@@ -1,21 +0,0 @@
-#!/bin/bash
-# -*- coding: utf-8 -*-
-# Postrm for libxft2-dev
-# Copyright © 2002 Colin Walters <walters@gnu.org>
-
-# $Id$
-
-set -e
-
-if [ remove = "$1" ]; then
- dpkg-divert --package libxft2-dev --remove --rename \
- --divert /usr/X11R6/include/X11/Xft/Xft1.h /usr/X11R6/include/X11/Xft/Xft.h
- dpkg-divert --package libxft2-dev --remove --rename \
- --divert /usr/X11R6/lib/libXft1.a /usr/X11R6/lib/libXft.a
- dpkg-divert --package libxft2-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: 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-10-07 02:50:50 UTC (rev 67)
+++ branches/post-xfree86-4.3.0-in-debian-unstable/debian/libxft-dev.preinst 2003-10-07 02:56:38 UTC (rev 68)
@@ -2,26 +2,29 @@
# -*- coding: utf-8 -*-
# Preinst for libxft2-dev
# Copyright © 2002 Colin Walters <walters@gnu.org>
+# Copyright © 2003 Branden Robinson <branden@debian.org>
# $Id$
set -e
-if [ install = "$1" -o upgrade = "$1" ]; then
- dpkg-divert --package libxft2-dev --add --rename \
- --divert /usr/X11R6/include/X11/Xft/Xft1.h /usr/X11R6/include/X11/Xft/Xft.h
- dpkg-divert --package libxft2-dev --add --rename \
- --divert /usr/X11R6/lib/libXft1.a /usr/X11R6/lib/libXft.a
- dpkg-divert --package libxft2-dev --add --rename \
- --divert /usr/X11R6/lib/libXft1.so /usr/X11R6/lib/libXft.so
-fi
-
-# we no longer ship XftFreetype.h, so we no longer have to divert it
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
dpkg-divert --package libxft2-dev --remove --rename \
--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
+ dpkg-divert --package libxft2-dev --remove --rename \
+ --divert /usr/X11R6/include/X11/Xft/Xft1.h /usr/X11R6/include/X11/Xft/Xft.h
+ dpkg-divert --package libxft2-dev --remove --rename \
+ --divert /usr/X11R6/lib/libXft1.a /usr/X11R6/lib/libXft.a
+ dpkg-divert --package libxft2-dev --remove --rename \
+ --divert /usr/X11R6/lib/libXft1.so /usr/X11R6/lib/libXft.so
+ fi
fi
#DEBHELPER#
Reply to: