X Strike Force XFree86 SVN commit: rev 881 - branches/4.3.0/sid/debian
Author: ishikawa
Date: 2004-01-07 08:25:22 -0500 (Wed, 07 Jan 2004)
New Revision: 881
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/control
branches/4.3.0/sid/debian/rules
Log:
* Fix link problem of libXrender and libXft:
- debian/rules:
+ libXrender.* moved from /usr/X11R6/lib to /usr/lib after 0.8.3-1,
generateing symlink in debian/rules refrect this change.
+ libXrender.* moved from /usr/X11R6/lib to /usr/lib after 2.1.2-1,
generateing symlink in debian/rules refrect this change.
- debian/control
+ Build-Depend update to adapt above changes
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2004-01-01 08:45:56 UTC (rev 880)
+++ branches/4.3.0/sid/debian/changelog 2004-01-07 13:25:22 UTC (rev 881)
@@ -24,6 +24,15 @@
server build in build-server target (thanks, David Schmitt).
- debian/rules
+ * Fix link problem of libXrender and libXft [ISHIKAWA Mutsumi]:
+ - debian/rules:
+ + libXrender.* moved from /usr/X11R6/lib to /usr/lib after 0.8.3-1,
+ generateing symlink in debian/rules refrect this change.
+ + libXrender.* moved from /usr/X11R6/lib to /usr/lib after 2.1.2-1,
+ generateing symlink in debian/rules refrect this change.
+ - debian/control
+ + Build-Depend update to adapt above changes
+
-- Branden Robinson <branden@debian.org> Thu, 1 Jan 2004 03:44:45 -0500
xfree86 (4.3.0-0pre1v5) experimental; urgency=low
Modified: branches/4.3.0/sid/debian/control
===================================================================
--- branches/4.3.0/sid/debian/control 2004-01-01 08:45:56 UTC (rev 880)
+++ branches/4.3.0/sid/debian/control 2004-01-07 13:25:22 UTC (rev 881)
@@ -4,7 +4,7 @@
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Branden Robinson <branden@debian.org>
Standards-Version: 3.6.1
-Build-Depends: dpkg (>= 1.7.0), cpp-3.2, flex, bison, bsdmainutils, groff, zlib1g-dev | libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev, libfreetype6-dev, libpaperg, libstdc++5-dev | libstdc++-dev, tetex-bin, po-debconf, debhelper (>= 4.1.16), html2text, libglide2-dev (>> 2001.01.26) [i386], libglide3-dev (>= 2002.04.10-3) [i386 alpha], kernel-headers-2.4 [alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sh sparc], libpng12-0-dev | libpng-dev (>= 1.2.1), libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft2-dev, libxrender-dev, libxcursor-dev, dbs, m4
+Build-Depends: dpkg (>= 1.7.0), cpp-3.2, flex, bison, bsdmainutils, groff, zlib1g-dev | libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev, libfreetype6-dev, libpaperg, libstdc++5-dev | libstdc++-dev, tetex-bin, po-debconf, debhelper (>= 4.1.16), html2text, libglide2-dev (>> 2001.01.26) [i386], libglide3-dev (>= 2002.04.10-3) [i386 alpha], kernel-headers-2.4 [alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sh sparc], libpng12-0-dev | libpng-dev (>= 1.2.1), libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft-dev (>= 2.1.2), libxrender-dev (>= 0.8.3), libxcursor-dev, dbs, m4
Build-Conflicts: gcc-3.3 (<< 1:3.3.2-0pre1)
Package: lbxproxy
Modified: branches/4.3.0/sid/debian/rules
===================================================================
--- branches/4.3.0/sid/debian/rules 2004-01-01 08:45:56 UTC (rev 880)
+++ branches/4.3.0/sid/debian/rules 2004-01-07 13:25:22 UTC (rev 881)
@@ -208,11 +208,11 @@
# not limited to, -I/usr/include).
mkdir -p debian/local/exports/lib
mkdir -p debian/local/exports/include/X11/extensions
- ln -s /usr/X11R6/lib/libXft* debian/local/exports/lib
+ ln -s /usr/lib/libXft* debian/local/exports/lib
rm -f debian/local/exports/lib/libXft.so.1* debian/local/exports/lib/libXft1*
ln -s /usr/include/X11/Xft debian/local/exports/include/X11
# Xrender
- ln -s /usr/X11R6/lib/libXrender.* debian/local/exports/lib
+ ln -s /usr/lib/libXrender.* debian/local/exports/lib
ln -s /usr/include/X11/extensions/Xrender.h debian/local/exports/include/X11/extensions
# Xcursor
ln -s /usr/lib/libXcursor.* debian/local/exports/lib
Reply to: