Author: ishikawa Date: 2003-06-13 13:31:39 -0500 (Fri, 13 Jun 2003) New Revision: 198
Added: people/ishikawa/debian/xlibs-pic-dev.install people/ishikawa/debian/xlibs-pic-dev.install.netbsd-i386 Removed: people/ishikawa/debian/xlibs-pic.install people/ishikawa/debian/xlibs-pic.install.netbsd-i386 Modified: people/ishikawa/debian/changelog people/ishikawa/debian/control Log: sync with branches/4.3.0/sid/debian Copied: people/ishikawa/debian/xlibs-pic-dev.install.netbsd-i386 (from rev 188, people/ishikawa/debian/xlibs-pic.install.netbsd-i386) Modified: people/ishikawa/debian/changelog ============================================================================== --- people/ishikawa/debian/changelog 2003-06-13 18:04:01 UTC (rev 197) +++ people/ishikawa/debian/changelog 2003-06-13 18:31:39 UTC (rev 198) @@ -26,7 +26,7 @@ liked against external FreeType2 [ISHIKAWA Mutsimi] * Imake warning fix patch; - - patch #057_X11.tmpl_warning_fix.diff: new; ISHIKAWA Mutsumi] + - patch #057_X11.tmpl_warning_fix.diff: new; [ISHIKAWA Mutsumi] * Use external Xft, Xrender and Xcursor libraries [ISHIKAWA Mutsumi] - patch #058, #059, #060: new; @@ -34,9 +34,12 @@ - xlibs{,-dbg,-dev}.*, shlibs*: drop Xrender and Xcursor related entry - debian/control: add Build-Depends: libxrender-dev, libxcursor-dev + * xlibs-pic package rename to xlibs-pic-dev + - reintegrate piclib_support.diff (patch #909) + * debian/control: - Change all references to libstdc++5-dev to be - libstdc++5-dev | libstdc++-dev, allowing libstdc++5-3.3-dev to satiffy + libstdc++5-dev | libstdc++-dev, allowing libstdc++5-3.3-dev to satisfy the dependency, and thus allowing gcc3.2 to be removed. (Closes: #194136) - New xlibmesa-drm-src package. (Closes: #139817) @@ -1732,6 +1735,6 @@ See /usr/share/doc/xfree86-common/changelog.Debian.old.gz in the xfree86-common package for the remainder of this changelog. - $Id: changelog 179 2003-06-11 19:10:38Z branden $ + $Id: changelog 194 2003-06-13 12:29:19Z ishikawa $ vim:set ai et sts=2 sw=2 tw=78: Modified: people/ishikawa/debian/control ============================================================================== --- people/ishikawa/debian/control 2003-06-13 18:04:01 UTC (rev 197) +++ people/ishikawa/debian/control 2003-06-13 18:31:39 UTC (rev 198) @@ -4,7 +4,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Uploaders: Branden Robinson <[EMAIL PROTECTED]> Standards-Version: 3.5.10 -Build-Depends: dpkg (>= 1.7.0), cpp-3.2, flex, bison, bsdmainutils, m4, groff, zlib1g-dev | libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev, libfreetype6-dev, libpaperg, tetex-bin, po-debconf, debhelper (>= 4.1.16), html2text, libglide2-dev (>> 2001.01.26) [i386], libglide3-dev (>> 2001.01.26) [i386], libglide3-alpha-dev [alpha], kernel-headers-2.4 | hurd | freebsd | netbsd | openbsd, libpng12-0-dev | libpng-dev (>= 1.2.1), libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft2-dev, libxrender-dev, libxcursor-dev, libstdc++5-dev | libstdc++-dev +Build-Depends: dpkg (>= 1.7.0), cpp-3.2, flex, bison, bsdmainutils, m4, groff, zlib1g-dev | libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev, libfreetype6-dev, libpaperg, tetex-bin, po-debconf, debhelper (>= 4.1.16), html2text, libglide2-dev (>> 2001.01.26) [i386], libglide3-dev (>> 2001.01.26) [i386], libglide3-alpha-dev [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, libstdc++5-dev | libstdc++-dev Package: lbxproxy Architecture: any Added: people/ishikawa/debian/xlibs-pic-dev.install ============================================================================== --- people/ishikawa/debian/xlibs-pic-dev.install 2003-06-13 18:04:01 UTC (rev 197) +++ people/ishikawa/debian/xlibs-pic-dev.install 2003-06-13 18:31:39 UTC (rev 198) @@ -0,0 +1,7 @@ +usr/X11R6/lib/libI810XvMC_pic.a +usr/X11R6/lib/libXinerama_pic.a +usr/X11R6/lib/libXvMC_pic.a +usr/X11R6/lib/libXv_pic.a +usr/X11R6/lib/libXxf86dga_pic.a +usr/X11R6/lib/libXxf86vm_pic.a +usr/X11R6/lib/libxkbfile_pic.a Deleted: people/ishikawa/debian/xlibs-pic.install ============================================================================== --- people/ishikawa/debian/xlibs-pic.install 2003-06-13 18:04:01 UTC (rev 197) +++ people/ishikawa/debian/xlibs-pic.install 2003-06-13 18:31:39 UTC (rev 198) @@ -1,7 +0,0 @@ -usr/X11R6/lib/libI810XvMC_pic.a -usr/X11R6/lib/libXinerama_pic.a -usr/X11R6/lib/libXvMC_pic.a -usr/X11R6/lib/libXv_pic.a -usr/X11R6/lib/libXxf86dga_pic.a -usr/X11R6/lib/libXxf86vm_pic.a -usr/X11R6/lib/libxkbfile_pic.a Deleted: people/ishikawa/debian/xlibs-pic.install.netbsd-i386 ============================================================================== --- people/ishikawa/debian/xlibs-pic.install.netbsd-i386 2003-06-13 18:04:01 UTC (rev 197) +++ people/ishikawa/debian/xlibs-pic.install.netbsd-i386 2003-06-13 18:31:39 UTC (rev 198) @@ -1,6 +0,0 @@ -usr/X11R6/lib/libXinerama_pic.a -usr/X11R6/lib/libXvMC_pic.a -usr/X11R6/lib/libXv_pic.a -usr/X11R6/lib/libXxf86dga_pic.a -usr/X11R6/lib/libXxf86vm_pic.a -usr/X11R6/lib/libxkbfile_pic.a