[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force Xft SVN commit: rev 83 - trunk/debian



Author: branden
Date: 2003-10-08 18:14:48 -0500 (Wed, 08 Oct 2003)
New Revision: 83

Modified:
   trunk/debian/changelog
   trunk/debian/control
Log:
Make libxft-dev conflict with and provide libxft2-dev to help apt figure
out an upgrade path.  Deliberately *not* making libxft-dev replace
libxft2-dev, even though it would be correct to do so, because doing that
plays such havoc with dpkg-divert that libxft-dev will fail to install on
upgrades from libxft2-dev.  This way libxft2-dev will be properly removed
first.

- debian/control


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2003-10-08 23:03:11 UTC (rev 82)
+++ trunk/debian/changelog	2003-10-08 23:14:48 UTC (rev 83)
@@ -10,8 +10,16 @@
     - aclocal.m4
     - configure
 
- -- Branden Robinson <branden@debian.org>  Wed,  8 Oct 2003 16:59:03 -0500
+  * Make libxft-dev conflict with and provide libxft2-dev to help apt figure
+    out an upgrade path.  Deliberately *not* making libxft-dev replace
+    libxft2-dev, even though it would be correct to do so, because doing that
+    plays such havoc with dpkg-divert that libxft-dev will fail to install on
+    upgrades from libxft2-dev.  This way libxft2-dev will be properly removed
+    first.
+    - debian/control
 
+ -- Branden Robinson <branden@debian.org>  Wed,  8 Oct 2003 18:09:37 -0500
+
 xft (2.1.2-3) unstable; urgency=low
 
   * Migrate dpkg diversions from libxft2-dev to libxft-dev, which was

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2003-10-08 23:03:11 UTC (rev 82)
+++ trunk/debian/control	2003-10-08 23:14:48 UTC (rev 83)
@@ -39,6 +39,8 @@
 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
+Conflicts: libxft2-dev
+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
  font rasterizer available to X clients.  Fontconfig is used for font



Reply to: