X Strike Force X.Org X11 SVN commit: r1220 - in branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian: . patches
Author: dnusinow
Date: 2006-02-18 15:21:03 -0500 (Sat, 18 Feb 2006)
New Revision: 1220
Added:
branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/patches/002_no_xproto_dep.diff
Modified:
branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/changelog
branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/control
branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/patches/001_no_export_freetype.diff
branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/patches/series
Log:
Move xft packaging to modular branch
Modified: branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/changelog
===================================================================
--- branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/changelog 2006-02-18 19:53:16 UTC (rev 1219)
+++ branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/changelog 2006-02-18 20:21:03 UTC (rev 1220)
@@ -1,12 +1,34 @@
-libxft (2.1.8.2-1) experimental; urgency=low
+xft (2.1.8.2-3) unstable; urgency=low
- * First upload to Debian
+ * Include freetype headers in cflags in the xft.pc file. This is an edit to
+ 001_no_export_freetype.diff. The freetype headers are included in xft's
+ headers, so these are necessary. Also, don't use variables in the .pc file
+ that haven't been defined anywhere. Thanks to Roger Leigh, Decklin Foster,
+ Eric Dorland, and Steve Langasek (who wrote the patch). (closes: #350458)
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 5 Feb 2006 12:59:29 -0500
+
+xft (2.1.8.2-2) unstable; urgency=low
+
+ * Add 002_no_xproto_dep.diff so that the .pc file doesn't depend on xproto,
+ which doesn't yet have a .pc file in Debian (to be removed when 7.0 enters
+ the archive). Thanks Mike Hommey. (closes: #349678)
+ * Include patch from Steve Langasek in full from previous upload. This
+ should work around the issue properly. (closes: #349318)
+
+ -- David Nusinow <dnusinow@debian.org> Tue, 24 Jan 2006 21:52:01 -0500
+
+xft (2.1.8.2-1) unstable; urgency=low
+
* Add build-dep on quilt
* Add 001_no_export_freetype.diff. This is a modified patch from Steve
Langasek that causes xft.pc not to export freetype or xrender as part of
the interface, but hide them in Requires.private instead (closes: #349318)
+ * Remove versioned build-deps on libx11 and libxrender.
+ * Move preinst to preinst.in so it doesn't get deleted by clean target. We
+ really need a better way to deal with these things...
- -- David Nusinow <dnusinow@debian.org> Sun, 22 Jan 2006 22:27:15 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 22 Jan 2006 22:35:36 -0500
libxft (2.1.8.2-0ubuntu2) dapper; urgency=low
Modified: branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/control
===================================================================
--- branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/control 2006-02-18 19:53:16 UTC (rev 1219)
+++ branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/control 2006-02-18 20:21:03 UTC (rev 1220)
@@ -1,9 +1,9 @@
-Source: libxft
-Section: x11
+Source: xft
+Section: devel
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
-Build-Depends: debhelper (>= 4.0.0), libfontconfig1-dev, libfreetype6-dev, x11proto-core-dev, libx11-dev, libxrender-dev, zlib1g-dev | libz-dev, quilt
+Uploaders: Branden Robinson <branden@debian.org>, David Nusinow <dnusinow@debian.org>
+Build-Depends: debhelper (>= 4.0.0), libfontconfig1-dev, libfreetype6-dev, x-dev, libx11-dev, libxrender-dev, zlib1g-dev | libz-dev, quilt
Standards-Version: 3.6.1
Package: libxft2
@@ -42,7 +42,6 @@
Depends: libxft2 (= ${Source-Version}), libc6-dev | libc-dev, libfontconfig1-dev, libfreetype6-dev, x-dev, libx11-dev, libxrender-dev, zlib1g-dev | libz-dev
Conflicts: libxft2-dev, xlibs-dev (<< 4.3.0)
Provides: libxft2-dev
-Pre-Depends: x11-common (>= 7.0.0-0ubuntu3)
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
Modified: branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/patches/001_no_export_freetype.diff
===================================================================
--- branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/patches/001_no_export_freetype.diff 2006-02-18 19:53:16 UTC (rev 1219)
+++ branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/patches/001_no_export_freetype.diff 2006-02-18 20:21:03 UTC (rev 1220)
@@ -1,14 +1,22 @@
-Index: libXft-X11R7.0-2.1.8.2/xft.pc.in
+Index: xft/xft.pc.in
===================================================================
---- libXft-X11R7.0-2.1.8.2.orig/xft.pc.in 2005-12-30 14:50:49.000000000 -0500
-+++ libXft-X11R7.0-2.1.8.2/xft.pc.in 2006-01-22 22:12:27.000000000 -0500
-@@ -6,7 +6,7 @@
+--- xft.orig/xft.pc.in 2006-02-04 17:59:59.000000000 -0500
++++ xft/xft.pc.in 2006-02-05 12:58:35.000000000 -0500
+@@ -2,11 +2,14 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
++freetypelibs="@FREETYPE_LIBS@"
++freetypecflags="@FREETYPE_CFLAGS@"
++xrenderlibs="@XRENDER_LIBS@"
+
Name: Xft
Description: X FreeType library
Version: @VERSION@
-Requires: xproto, xrender, fontconfig, freetype2
-Requires.private: xrender, fontconfig, freetype2
+-Cflags: -I${includedir}
+Requires: xproto, fontconfig
-+Requires.private: xrender, freetype2
- Cflags: -I${includedir}
++Cflags: -I${includedir} ${freetypecflags}
Libs: -L${libdir} -lXft
++Libs.private: -lX11 ${xrenderlibs} ${freetypelibs}
Added: branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/patches/002_no_xproto_dep.diff
===================================================================
--- branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/patches/002_no_xproto_dep.diff 2006-02-18 19:53:16 UTC (rev 1219)
+++ branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/patches/002_no_xproto_dep.diff 2006-02-18 20:21:03 UTC (rev 1220)
@@ -0,0 +1,13 @@
+Index: xft/xft.pc.in
+===================================================================
+--- xft.orig/xft.pc.in 2006-02-05 12:58:35.000000000 -0500
++++ xft/xft.pc.in 2006-02-05 12:58:40.000000000 -0500
+@@ -9,7 +9,7 @@
+ Name: Xft
+ Description: X FreeType library
+ Version: @VERSION@
+-Requires: xproto, fontconfig
++Requires: fontconfig
+ Cflags: -I${includedir} ${freetypecflags}
+ Libs: -L${libdir} -lXft
+ Libs.private: -lX11 ${xrenderlibs} ${freetypelibs}
Modified: branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/patches/series
===================================================================
--- branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/patches/series 2006-02-18 19:53:16 UTC (rev 1219)
+++ branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/patches/series 2006-02-18 20:21:03 UTC (rev 1220)
@@ -1 +1,2 @@
001_no_export_freetype.diff
+002_no_xproto_dep.diff
Reply to: