X Strike Force Xft SVN commit: rev 75 - trunk/debian
Author: branden
Date: 2003-10-07 13:10:28 -0500 (Tue, 07 Oct 2003)
New Revision: 75
Modified:
trunk/debian/changelog
trunk/debian/libxft-dev.postrm
trunk/debian/libxft-dev.preinst
Log:
Migrate dpkg diversions from libxft2-dev to libxft-dev, which was
neglected in the previous release.
- debian/libxft-dev.preinst:
+ remove all previous diversions created by libxft2-dev on all installs
and upgrades (libxft-dev's preinst script will not be passed a $2
corresponding to the most-recently-configured version of libxft2-dev)
+ add diversions using new package name
- debian/libxft-dev.postrm: remove diversions using new package name
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-10-07 17:54:26 UTC (rev 74)
+++ trunk/debian/changelog 2003-10-07 18:10:28 UTC (rev 75)
@@ -6,8 +6,17 @@
- debian/rules: add common-install-arch double-colon rule to invoke
chrpath on the libXft shared object
- -- Branden Robinson <branden@debian.org> Tue, 7 Oct 2003 00:00:13 -0500
+ * Migrate dpkg diversions from libxft2-dev to libxft-dev, which was
+ neglected in the previous release.
+ - debian/libxft-dev.preinst:
+ + remove all previous diversions created by libxft2-dev on all installs
+ and upgrades (libxft-dev's preinst script will not be passed a $2
+ corresponding to the most-recently-configured version of libxft2-dev)
+ + add diversions using new package name
+ - debian/libxft-dev.postrm: remove diversions using new package name
+ -- Branden Robinson <branden@debian.org> Tue, 7 Oct 2003 13:01:15 -0500
+
xft (2.1.2-1) unstable; urgency=low
* new upstream version
Modified: trunk/debian/libxft-dev.postrm
===================================================================
--- trunk/debian/libxft-dev.postrm 2003-10-07 17:54:26 UTC (rev 74)
+++ trunk/debian/libxft-dev.postrm 2003-10-07 18:10:28 UTC (rev 75)
@@ -9,11 +9,11 @@
set -e
if [ remove = "$1" ]; then
- dpkg-divert --package libxft2-dev --remove --rename \
+ 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 libxft2-dev --remove --rename \
+ dpkg-divert --package libxft-dev --remove --rename \
--divert /usr/X11R6/lib/libXft1.a /usr/X11R6/lib/libXft.a
- dpkg-divert --package libxft2-dev --remove --rename \
+ dpkg-divert --package libxft-dev --remove --rename \
--divert /usr/X11R6/lib/libXft1.so /usr/X11R6/lib/libXft.so
fi
Modified: trunk/debian/libxft-dev.preinst
===================================================================
--- trunk/debian/libxft-dev.preinst 2003-10-07 17:54:26 UTC (rev 74)
+++ trunk/debian/libxft-dev.preinst 2003-10-07 18:10:28 UTC (rev 75)
@@ -8,21 +8,25 @@
set -e
-if [ install = "$1" -o upgrade = "$1" ]; then
- dpkg-divert --package libxft2-dev --add --rename \
+if [ "$1" = "install" -o "$1" = "upgrade" ]; then
+ # remove any diversions created by previous name of this package
+ 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 --add --rename \
+ dpkg-divert --package libxft2-dev --remove --rename \
--divert /usr/X11R6/lib/libXft1.a /usr/X11R6/lib/libXft.a
- dpkg-divert --package libxft2-dev --add --rename \
+ dpkg-divert --package libxft2-dev --remove --rename \
--divert /usr/X11R6/lib/libXft1.so /usr/X11R6/lib/libXft.so
-fi
+ # This 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.
+ dpkg-divert --package libxft2-dev --remove --rename \
+ --divert /usr/X11R6/include/X11/Xft/XftFreetype1.h /usr/X11R6/include/X11/Xft/XftFreetype.h
-# we no longer ship XftFreetype.h, so we no longer have to divert it
-if [ "$1" = "upgrade" ]; then
- 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
+ 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: