xft: Changes to 'debian-unstable'

2014-01-18 Thread Julien Cristau 
 debian/changelog |6 ++
 src/xftglyphs.c  |6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 58ef0aac88d8d2a57a4d467e9c1edffa4d9d7887
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 18 20:14:09 2014 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 6aa0c0d..fef4a38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xft (2.3.1-2) unstable; urgency=medium
+
+  * Fix FTBFS with freetype 2.5.1 (closes: #733385).
+
+ -- Julien Cristau jcris...@debian.org  Sat, 18 Jan 2014 20:14:05 +0100
+
 xft (2.3.1-1) unstable; urgency=low
 
   * New upstream release:

commit b7b4bc1386bb0c3fdd84491f305940ad9a9ebc9d
Author: Julien Cristau jcris...@debian.org
Date:   Mon Dec 2 16:26:24 2013 +0100

Use FT_*_H macros instead of including freetype/*.h

freetype moved its headers around in 2.5.1.

Signed-off-by: Julien Cristau jcris...@debian.org
(cherry picked from commit 4acfdaf95adb0a05c2a25550bdde036c865902f4)

diff --git a/src/xftglyphs.c b/src/xftglyphs.c
index 2f3dc5a..4b5fb82 100644
--- a/src/xftglyphs.c
+++ b/src/xftglyphs.c
@@ -21,10 +21,10 @@
  */
 
 #include xftint.h
-#include freetype/ftoutln.h
-#include freetype/ftlcdfil.h
+#include FT_OUTLINE_H
+#include FT_LCD_FILTER_H
 
-#include freetype/ftsynth.h
+#include FT_SYNTHESIS_H
 
 /*
  * Validate the memory info for a font


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1w4bgb-kb...@moszumanska.debian.org

xft: Changes to 'debian-unstable'

2012-06-16 Thread Cyril Brulebois 
 ChangeLog|  228 +++
 NEWS |   16 -
 README   |2 
 configure.ac |  149 ++
 debian/changelog |7 
 include/X11/Xft/Xft.h.in |   42 +-
 src/xftcolor.c   |6 
 src/xftcore.c|   96 +++---
 src/xftdpy.c |   62 ++--
 src/xftdraw.c|   46 +--
 src/xftextent.c  |   14 
 src/xftfont.c|   16 -
 src/xftfreetype.c|  161 --
 src/xftglyphs.c  |  696 +++
 src/xftinit.c|4 
 src/xftint.h |   23 -
 src/xftlist.c|6 
 src/xftname.c|8 
 src/xftrender.c  |   54 +--
 src/xftswap.c|2 
 src/xftxlfd.c|   28 -
 21 files changed, 971 insertions(+), 695 deletions(-)

New commits:
commit 0c27f7dcb858bd7da4fa4318cb881a282348b715
Author: Cyril Brulebois k...@debian.org
Date:   Sat Jun 16 22:04:47 2012 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index be0924b..6aa0c0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xft (2.3.1-1) UNRELEASED; urgency=low
+xft (2.3.1-1) unstable; urgency=low
 
   * New upstream release:
 - Subpixel LCD text rendering improvements (Closes: #641197).
 
- -- Cyril Brulebois k...@debian.org  Sat, 16 Jun 2012 19:58:53 +
+ -- Cyril Brulebois k...@debian.org  Sat, 16 Jun 2012 22:04:44 +0200
 
 xft (2.2.0-3) unstable; urgency=low
 

commit 8ee0cb0aaf7ddaa088334df2423488cc1c4d0d20
Author: Cyril Brulebois k...@debian.org
Date:   Sat Jun 16 22:03:47 2012 +0200

Add bug closure for #641197.

diff --git a/debian/changelog b/debian/changelog
index 842c02e..be0924b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xft (2.3.1-1) UNRELEASED; urgency=low
 
-  * New upstream release.
+  * New upstream release:
+- Subpixel LCD text rendering improvements (Closes: #641197).
 
  -- Cyril Brulebois k...@debian.org  Sat, 16 Jun 2012 19:58:53 +
 

commit df13b2392a3bbf043e4b40ac6fe2d90390707a07
Author: Cyril Brulebois k...@debian.org
Date:   Sat Jun 16 19:59:05 2012 +

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index 6a6d960..150f3a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,231 @@
+commit 0847b64af14acefaa7aa86b3cec8632497babe73
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Sat Jun 2 09:36:29 2012 -0700
+
+libXft 2.3.1
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 1066d2b34db6124fbb0105f5d30f560217fd2a5a
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Sat Mar 10 23:09:21 2012 -0800
+
+Dead code removal
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit 84b8b5b46773f9b686d57f28092824b86bffed9d
+Author: Mikael Magnusson mika...@gmail.com
+Date:   Sun Mar 11 02:41:55 2012 +0100
+
+Fixup for 550b2f76401c2 which broke bold fonts
+
+The commit removed the line
+AC_CHECK_FUNCS(FT_Get_Next_Char FT_Get_BDF_Property FT_Get_PS_Font_Info 
FT_Has_PS_Glyph_Names FT_GlyphSlot_Embolden)
+but failed to remove the #if lines that this commit removes, resulting
+in that code never being executed.
+
+Fixes: https://bugs.freedesktop.org/attachment.cgi?id=58280
+
+Reviewed-by: Jeremy Huddleston jerem...@apple.com
+
+commit b543efafefb71fb1f87ee9c1c261e86c8ca29e76
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Wed Mar 7 20:12:27 2012 -0800
+
+libXft 2.3.0
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 301029c9a1d9429009eaf08bb726357d4e94780d
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Mon Oct 24 23:39:25 2011 -0700
+
+Fix undefined ftbit in XftFontLoadGlyphs
+
+https://bugs.freedesktop.org/show_bug.cgi?id=42173
+
+Fixes regression from: 6f1d7bcdd461b1f6cc64370793f52d7c170187d0
+
+Fixed by examining original patch before rebase from:
+https://bugs.freedesktop.org/show_bug.cgi?id=29151
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit 550b2f76401c292d982700b60326e0a837e391b4
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Mon Oct 10 13:00:35 2011 -0700
+
+Remove fontconfig and freetype ifdef-fu and instead require non-ancinet 
versions of both
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit 21a59c10803582c8f90d3b5f32e8f0240c050adf
+Author: Tom \spot\ Callaway tcall...@redhat.com
+Date:   Thu Oct 6 15:58:29 2011 -0400
+
+compiler noise cleanups related to subpixel LCD support
+
+Reviewed-by: Jeremy Huddleston jerem...@apple.com
+
+commit 6f1d7bcdd461b1f6cc64370793f52d7c170187d0
+Author: Tom \spot\ Callaway tcall...@redhat.com
+Date:   Thu Oct 6 15:41:10 2011 -0400
+
+Subpixel LCD text rendering improvements
+
+Reviewed-by: Jeremy Huddleston jerem...@apple.com
+
+commit 0e0efb8b26a241f8370053bc3686f7abc69357c1

xft: Changes to 'debian-unstable'

2011-06-12 Thread Julien Cristau 
 debian/README.source|2 +-
 debian/changelog|   13 +
 debian/control  |7 +--
 debian/libxft-dev.install   |6 +++---
 debian/libxft2-udeb.install |2 +-
 debian/libxft2.install  |2 +-
 debian/rules|   13 ++---
 debian/xsfbs/xsfbs.mk   |   35 ++-
 8 files changed, 56 insertions(+), 24 deletions(-)

New commits:
commit 5469069357e6f0b9740fb320d4c0a0f9b87da4c8
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jun 12 16:30:56 2011 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index ba3af48..b5e57f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-xft (2.2.0-3) UNRELEASED; urgency=low
+xft (2.2.0-3) unstable; urgency=low
+
+  * Team upload.
 
   [ Steve Langasek ]
   * Build for multiarch.
@@ -7,7 +9,7 @@ xft (2.2.0-3) UNRELEASED; urgency=low
   * Add build-indep and build-arch d/rules targets.
   * Bump Standards-Version to 3.9.2.
 
- -- Julien Cristau jcris...@debian.org  Sun, 12 Jun 2011 16:27:00 +0200
+ -- Julien Cristau jcris...@debian.org  Sun, 12 Jun 2011 16:30:44 +0200
 
 xft (2.2.0-2) unstable; urgency=low
 

commit 74f064112f116cd861b556c76ad7a0fbb2ce312e
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jun 12 16:30:40 2011 +0200

Bump Standards-Version to 3.9.2.

diff --git a/debian/changelog b/debian/changelog
index 769f8a3..ba3af48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xft (2.2.0-3) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * Add build-indep and build-arch d/rules targets.
+  * Bump Standards-Version to 3.9.2.
 
  -- Julien Cristau jcris...@debian.org  Sun, 12 Jun 2011 16:27:00 +0200
 
diff --git a/debian/control b/debian/control
index 6105bf4..ac0cef8 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev (= 1:7.5+4),
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/xft
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/xft.git
 

commit 91c48652f5b779441580bd1b957ebbb6d464c69e
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jun 12 16:29:02 2011 +0200

Add build-indep and build-arch d/rules targets.

diff --git a/debian/changelog b/debian/changelog
index b2e8b0b..769f8a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ xft (2.2.0-3) UNRELEASED; urgency=low
   [ Steve Langasek ]
   * Build for multiarch.
 
+  [ Julien Cristau ]
+  * Add build-indep and build-arch d/rules targets.
+
  -- Julien Cristau jcris...@debian.org  Sun, 12 Jun 2011 16:27:00 +0200
 
 xft (2.2.0-2) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 079aa76..1f5e768 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,11 @@ build/config.status: configure
 --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 CFLAGS=$(CFLAGS) 
 
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep:
+.PHONY: build build-arch build-indep
+
 build-stamp: build/config.status
dh_testdir
cd build  $(MAKE)
@@ -101,4 +105,4 @@ binary-indep: build install
 # Nothing to do
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: clean binary-indep binary-arch binary install

commit 9a750e521eaa7da8faced483e91ce1d3005a7a11
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jun 12 16:27:44 2011 +0200

Don't put debug symbols for the udeb in libxft2-dbg

diff --git a/debian/rules b/debian/rules
index 8ea949a..079aa76 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,7 +85,8 @@ binary-arch: build install
dh_install --sourcedir=debian/tmp --list-missing
dh_installchangelogs ChangeLog
dh_link
-   dh_strip --dbg-package=$(PACKAGE)-dbg
+   dh_strip -p$(PACKAGE) --dbg-package=$(PACKAGE)-dbg
+   dh_strip -N$(PACKAGE)
dh_compress
dh_fixperms
dh_makeshlibs -V libxft2 ( 2.1.1) --add-udeb=$(PACKAGE)-udeb

commit 86462ba212c884ff757aaae3c7bf0ec082bfe76b
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jun 12 16:27:15 2011 +0200

Add changelog entry for multiarch

diff --git a/debian/changelog b/debian/changelog
index 6f95537..b2e8b0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xft (2.2.0-3) UNRELEASED; urgency=low
+
+  [ Steve Langasek ]
+  * Build for multiarch.
+
+ -- Julien Cristau jcris...@debian.org  Sun, 12 Jun 2011 16:27:00 +0200
+
 xft (2.2.0-2) unstable; urgency=low
 
   * Remove Andres Salomon and David Nusinow from Uploaders.  Thanks for your

commit 59663bd01334638848dd9b3a7481e7525776b67a
Author: Steve Langasek steve.langa...@ubuntu.com
Date:   Wed Mar 23 15:34:04 2011 -0700

build for multiarch

diff --git a/debian/control b/debian/control
index 816654a..6105bf4 100644
--- a/debian/control
+++ b/debian/control

xft: Changes to 'debian-unstable'

2011-02-10 Thread Julien Cristau 
 .gitignore |   79 ++
 ChangeLog  |  199 ++
 Makefile.am|   12 
 NEWS   |8 
 configure.ac   |   25 
 debian/changelog   |   22 
 debian/control |7 
 debian/copyright   |2 
 debian/libxft-dev.install  |2 
 debian/patches/001_no_export_freetype.diff |   13 
 debian/patches/series  |1 
 debian/rules   |2 
 include/X11/Xft/.gitignore |2 
 include/X11/Xft/Xft.h.in   |8 
 man/Makefile.am|   13 
 man/Xft.3.in   |  845 -
 man/Xft.man|  845 +
 man/xft-config.1.in|  120 
 src/Makefile.am|2 
 xft-config.in  |  100 ---
 xft.pc.in  |2 
 21 files changed, 1176 insertions(+), 1133 deletions(-)

New commits:
commit 9a7bc97f9c2bae8014979f10f917697721a03ebb
Author: Julien Cristau jcris...@debian.org
Date:   Thu Feb 10 20:04:16 2011 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index a4bacea..6f95537 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-xft (2.2.0-2) UNRELEASED; urgency=low
+xft (2.2.0-2) unstable; urgency=low
 
   * Remove Andres Salomon and David Nusinow from Uploaders.  Thanks for your
 work!
   * Parse DEB_BUILD_OPTIONS with $(filter ..), not $(findstring ..).
   * Drop obsolete Conflicts on libxft2-dev and xlibs-dev.
   * Bump Standards-Version to 3.9.1.
+  * Upload to unstable.
 
- -- Julien Cristau jcris...@debian.org  Thu, 10 Feb 2011 19:55:41 +0100
+ -- Julien Cristau jcris...@debian.org  Thu, 10 Feb 2011 20:04:14 +0100
 
 xft (2.2.0-1) experimental; urgency=low
 

commit c8ba7d9a03d0da8ac046f3baa35bd1cc475d4e20
Author: Julien Cristau jcris...@debian.org
Date:   Thu Feb 10 20:01:43 2011 +0100

Bump Standards-Version to 3.9.1.

diff --git a/debian/changelog b/debian/changelog
index 5d344b2..a4bacea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xft (2.2.0-2) UNRELEASED; urgency=low
 work!
   * Parse DEB_BUILD_OPTIONS with $(filter ..), not $(findstring ..).
   * Drop obsolete Conflicts on libxft2-dev and xlibs-dev.
+  * Bump Standards-Version to 3.9.1.
 
  -- Julien Cristau jcris...@debian.org  Thu, 10 Feb 2011 19:55:41 +0100
 
diff --git a/debian/control b/debian/control
index f9a86a1..816654a 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev (= 1:7.5+4),
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/xft
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/xft.git
 

commit 0a95a04ec3c81c9e8c7ee42dec13bc64a69de08e
Author: Julien Cristau jcris...@debian.org
Date:   Thu Feb 10 20:01:10 2011 +0100

Drop obsolete Conflicts on libxft2-dev and xlibs-dev.

diff --git a/debian/changelog b/debian/changelog
index 8d3e3e6..5d344b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xft (2.2.0-2) UNRELEASED; urgency=low
   * Remove Andres Salomon and David Nusinow from Uploaders.  Thanks for your
 work!
   * Parse DEB_BUILD_OPTIONS with $(filter ..), not $(findstring ..).
+  * Drop obsolete Conflicts on libxft2-dev and xlibs-dev.
 
  -- Julien Cristau jcris...@debian.org  Thu, 10 Feb 2011 19:55:41 +0100
 
diff --git a/debian/control b/debian/control
index c42839f..f9a86a1 100644
--- a/debian/control
+++ b/debian/control
@@ -74,7 +74,6 @@ Depends:
  libxrender-dev,
  zlib1g-dev | libz-dev,
  ${misc:Depends},
-Conflicts: libxft2-dev, xlibs-dev ( 4.3.0)
 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

commit 59443759e02495eec5a3a17209c8b6e99b62d4d5
Author: Julien Cristau jcris...@debian.org
Date:   Thu Feb 10 19:56:59 2011 +0100

Parse DEB_BUILD_OPTIONS with $(filter ..), not $(findstring ..).

diff --git a/debian/changelog b/debian/changelog
index 423e681..8d3e3e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xft (2.2.0-2) UNRELEASED; urgency=low
 
   * Remove Andres Salomon and David Nusinow from Uploaders.  Thanks for your
 work!
+  * Parse DEB_BUILD_OPTIONS with $(filter ..), not $(findstring ..).
 
  -- Julien Cristau jcris...@debian.org  Thu, 10 Feb 2011 19:55:41 +0100
 
diff --git a/debian/rules b/debian/rules
index abf842f..f845b62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ PACKAGE = libxft2
 include debian/xsfbs/xsfbs.mk
 
 CFLAGS = -Wall -g
-ifneq (,$(findstring

xft: Changes to 'debian-unstable'

2010-03-10 Thread Cyril Brulebois 
 debian/changelog|   15 +--
 debian/control  |   36 +---
 debian/libxft2-udeb.install |1 +
 debian/rules|2 +-
 4 files changed, 44 insertions(+), 10 deletions(-)

New commits:
commit 310bc734dda762dcd9881610897518a61d975030
Author: Cyril Brulebois k...@debian.org
Date:   Thu Mar 11 02:34:22 2010 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index db42ed7..faa9344 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xft (2.1.14-2) UNRELEASED; urgency=low
+xft (2.1.14-2) unstable; urgency=low
 
   [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -15,7 +15,7 @@ xft (2.1.14-2) UNRELEASED; urgency=low
   * Add ${misc:Depends} to non-udeb binaries, and wrap Depends.
   * Add myself to Uploaders.
 
- -- Julien Cristau jcris...@debian.org  Sat, 16 Jan 2010 16:47:37 +
+ -- Cyril Brulebois k...@debian.org  Thu, 11 Mar 2010 02:33:50 +0100
 
 xft (2.1.14-1) unstable; urgency=low
 

commit 15eeff298ae23414c35bb44c798a92d929025ee5
Author: Cyril Brulebois k...@debian.org
Date:   Thu Mar 11 02:33:29 2010 +0100

Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index 1f5cd2a..db42ed7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ xft (2.1.14-2) UNRELEASED; urgency=low
  - libxrender-dev
   * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
   * Add ${misc:Depends} to non-udeb binaries, and wrap Depends.
+  * Add myself to Uploaders.
 
  -- Julien Cristau jcris...@debian.org  Sat, 16 Jan 2010 16:47:37 +
 
diff --git a/debian/control b/debian/control
index c954b0a..8adfac1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xft
 Section: devel
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow dnusi...@debian.org, Andres Salomon 
dilin...@debian.org
+Uploaders: David Nusinow dnusi...@debian.org, Andres Salomon 
dilin...@debian.org, Cyril Brulebois k...@debian.org
 Build-Depends:
  debhelper (= 5.0.0),
  libfontconfig1-dev,

commit 752ae090e5db325d9b3e36baea414b7c0986f5c1
Author: Cyril Brulebois k...@debian.org
Date:   Thu Mar 11 02:28:09 2010 +0100

Add ${misc:Depends} to non-udeb binaries, and wrap Depends.

diff --git a/debian/changelog b/debian/changelog
index 2fbf718..1f5cd2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ xft (2.1.14-2) UNRELEASED; urgency=low
  - libx11-dev
  - libxrender-dev
   * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
+  * Add ${misc:Depends} to non-udeb binaries, and wrap Depends.
 
  -- Julien Cristau jcris...@debian.org  Sat, 16 Jan 2010 16:47:37 +
 
diff --git a/debian/control b/debian/control
index 7db4f6e..c954b0a 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,9 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/xft.git
 Package: libxft2
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
 Description: FreeType-based font drawing library for X
  Xft provides a client-side font API for X applications, making the FreeType
  font rasterizer available to X clients.  Fontconfig is used for font
@@ -32,7 +34,8 @@ Package: libxft2-udeb
 XC-Package-Type: udeb
 Section: debian-installer
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends:
+ ${shlibs:Depends},
 Description: FreeType-based font drawing library for X
  This is a udeb, or a microdeb, for the debian-installer.
 
@@ -40,7 +43,10 @@ Package: libxft2-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: libxft2 (= ${binary:Version}), ${shlibs:Depends}
+Depends:
+ libxft2 (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends},
 Description: FreeType-based font drawing library for X (unstripped)
  Xft provides a client-side font API for X applications, making the FreeType
  font rasterizer available to X clients.  Fontconfig is used for font
@@ -59,7 +65,15 @@ Description: FreeType-based font drawing library for X 
(unstripped)
 Package: libxft-dev
 Section: libdevel
 Architecture: any
-Depends: libxft2 (= ${binary:Version}), libc6-dev | libc-dev, 
libfontconfig1-dev, libfreetype6-dev, libx11-dev (= 2:1.0.0), libxrender-dev, 
zlib1g-dev | libz-dev
+Depends:
+ libxft2 (= ${binary:Version}),
+ libc6-dev | libc-dev,
+ libfontconfig1-dev,
+ libfreetype6-dev,
+ libx11-dev (= 2:1.0.0),
+ libxrender-dev,
+ zlib1g-dev | libz-dev,
+ ${misc:Depends},
 Conflicts: libxft2-dev, xlibs-dev ( 4.3.0)
 Provides: libxft2-dev
 Description: FreeType-based font drawing library for X (development files)

commit a784bc4d28b5cefd67f0d7aa6923d462669e610a
Author: Cyril Brulebois k...@debian.org
Date:   Thu Mar 11 02:26:28 2010 +0100

Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).

diff --git a/debian/changelog b/debian/changelog
index

xft: Changes to 'debian-unstable'

2010-01-22 Thread Julien Cristau 
 debian/changelog |1 +
 debian/control   |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 41b0ef1a3b6c280b74c5baf8954f2fa8ef14c668
Author: Julien Cristau jul...@radis.liafa.jussieu.fr
Date:   Sat Jan 23 01:46:39 2010 +0100

Remove myself from Uploaders

diff --git a/debian/changelog b/debian/changelog
index b4c11c4..cd23578 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xft (2.1.14-2) UNRELEASED; urgency=low
 
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
+  * Remove myself from Uploaders
 
  -- Julien Cristau jcris...@debian.org  Sat, 16 Jan 2010 16:47:37 +
 
diff --git a/debian/control b/debian/control
index 326570e..7abfd5e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xft
 Section: devel
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow dnusi...@debian.org, Andres Salomon 
dilin...@debian.org, Julien Cristau jcris...@debian.org
+Uploaders: David Nusinow dnusi...@debian.org, Andres Salomon 
dilin...@debian.org
 Build-Depends:
  debhelper (= 5.0.0),
  libfontconfig1-dev,


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xft: Changes to 'debian-unstable'

2010-01-16 Thread Julien Cristau 
 debian/changelog |7 +++
 debian/rules |   14 +++---
 2 files changed, 14 insertions(+), 7 deletions(-)

New commits:
commit 8fca5684029c143b6e812d28626263573835f1c8
Author: Julien Cristau jul...@radis.liafa.jussieu.fr
Date:   Sat Jan 16 16:48:52 2010 +

Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good 
reason.  Thanks, Colin Watson!

diff --git a/debian/changelog b/debian/changelog
index 35aa0a9..b4c11c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xft (2.1.14-2) UNRELEASED; urgency=low
+
+  * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+good reason.  Thanks, Colin Watson!
+
+ -- Julien Cristau jcris...@debian.org  Sat, 16 Jan 2010 16:47:37 +
+
 xft (2.1.14-1) unstable; urgency=low
 
   [ Timo Aaltonen ]
diff --git a/debian/rules b/debian/rules
index fecd731..ed3c030 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,18 +36,18 @@ configure: $(STAMP_DIR)/patch
dh_testdir
autoreconf -vfi
 
-obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
+build/config.status: configure
dh_testdir
-   test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE)
-   cd obj-$(DEB_BUILD_GNU_TYPE)  \
+   test -d build || mkdir build
+   cd build  \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
 --infodir=\$${prefix}/share/info $(confflags) \
 CFLAGS=$(CFLAGS) 
 
 build: build-stamp
-build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
+build-stamp: build/config.status
dh_testdir
-   cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
+   cd build  $(MAKE)
$@
 
 clean: xsfclean
@@ -59,7 +59,7 @@ clean: xsfclean
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
-   rm -rf obj-*
+   rm -rf build
rm -f $$(find -name Makefile.in)
rm -f compile config.guess config.sub configure depcomp install-sh
rm -f ltmain.sh missing INSTALL aclocal.m4 config.h.in mkinstalldirs
@@ -72,7 +72,7 @@ install: build
dh_clean -k
dh_installdirs
 
-   cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE) DESTDIR=$(CURDIR)/debian/tmp 
install
+   cd build  $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
 # Build architecture-dependent files here.
 binary-arch: build install


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xft: Changes to 'debian-unstable'

2009-12-03 Thread Julien Cristau 
 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit a5c9b61746b174aa92ccbb83f6dcad4dc7d49880
Author: Julien Cristau jcris...@debian.org
Date:   Thu Dec 3 14:40:33 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 22561ac..35aa0a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xft (2.1.14-1) UNRELEASED; urgency=low
+xft (2.1.14-1) unstable; urgency=low
 
+  [ Timo Aaltonen ]
   * New upstream release.
   * Bump the build-dep on xutils-dev (= 1:7.5~1).
   * Bump Standards-Version to 3.8.3 (README.source added).
@@ -7,7 +8,7 @@ xft (2.1.14-1) UNRELEASED; urgency=low
 for upgrades from sarge.
   * Move -dbg package to section debug.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 26 Nov 2009 16:43:51 +0200
+ -- Julien Cristau jcris...@debian.org  Thu, 03 Dec 2009 14:40:25 +0100
 
 xft (2.1.13-3) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xft: Changes to 'debian-unstable'

2009-11-26 Thread Timo Aaltonen 
 .gitignore   |   11 
 ChangeLog|   81 ++
 Makefile.am  |6 
 NEWS |   57 
 README   |   59 +---
 configure.ac |   34 +-
 debian/README.source |   73 +
 debian/changelog |   11 
 debian/control   |   17 -
 debian/xsfbs/repack.sh   |   32 ++
 debian/xsfbs/xsfbs.mk|   21 -
 debian/xsfbs/xsfbs.sh|  311 ---
 include/X11/Xft/Xft.h|  630 ---
 include/X11/Xft/Xft.h.in |  617 ++
 man/.gitignore   |4 
 src/.gitignore   |6 
 src/Makefile.am  |4 
 src/xftcore.c|6 
 src/xftdpy.c |   18 -
 src/xftdraw.c|   30 +-
 src/xftextent.c  |2 
 src/xftfont.c|   26 -
 src/xftfreetype.c|   57 ++--
 src/xftglyphs.c  |   12 
 src/xftinit.c|2 
 src/xftlist.c|6 
 src/xftname.c|2 
 src/xftrender.c  |8 
 src/xftxlfd.c|   38 +-
 29 files changed, 1057 insertions(+), 1124 deletions(-)

New commits:
commit dfffa30be52c25c4134f8ff56f617ec285dde3fe
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Thu Nov 26 16:57:14 2009 +0200

Move -dbg package to section debug.

diff --git a/debian/changelog b/debian/changelog
index 2fada81..22561ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xft (2.1.14-1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.8.3 (README.source added).
   * Drop pre-dependency on x11-common from libxft-dev. This was needed
 for upgrades from sarge.
+  * Move -dbg package to section debug.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 26 Nov 2009 16:43:51 +0200
 
diff --git a/debian/control b/debian/control
index 4f45332..326570e 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Description: FreeType-based font drawing library for X
  glyph drawing; otherwise, the core X protocol is used.
 
 Package: libxft2-dbg
-Section: libdevel
+Section: debug
 Priority: extra
 Architecture: any
 Depends: libxft2 (= ${binary:Version}), ${shlibs:Depends}

commit 91222c49ff1734730c320ccfe4b64ef90bd69609
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Thu Nov 26 16:55:57 2009 +0200

Drop pre-dependency on x11-common from libxft-dev. This was needed for 
upgrades from sarge.

diff --git a/debian/changelog b/debian/changelog
index be35f52..2fada81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xft (2.1.14-1) UNRELEASED; urgency=low
   * New upstream release.
   * Bump the build-dep on xutils-dev (= 1:7.5~1).
   * Bump Standards-Version to 3.8.3 (README.source added).
+  * Drop pre-dependency on x11-common from libxft-dev. This was needed
+for upgrades from sarge.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 26 Nov 2009 16:43:51 +0200
 
diff --git a/debian/control b/debian/control
index df5233c..4f45332 100644
--- a/debian/control
+++ b/debian/control
@@ -54,7 +54,6 @@ Architecture: any
 Depends: libxft2 (= ${binary:Version}), libc6-dev | libc-dev, 
libfontconfig1-dev, libfreetype6-dev, libx11-dev (= 2:1.0.0), libxrender-dev, 
zlib1g-dev | libz-dev
 Conflicts: libxft2-dev, xlibs-dev ( 4.3.0)
 Provides: libxft2-dev
-Pre-Depends: x11-common (= 1:7.0.0)
 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

commit d544620e5cfb1dbeeec296e431b470d84eb5f776
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Thu Nov 26 16:54:30 2009 +0200

Bump Standards-Version to 3.8.3 (README.source added).

diff --git a/debian/changelog b/debian/changelog
index c994749..be35f52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xft (2.1.14-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Bump the build-dep on xutils-dev (= 1:7.5~1).
+  * Bump Standards-Version to 3.8.3 (README.source added).
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 26 Nov 2009 16:43:51 +0200
 
diff --git a/debian/control b/debian/control
index c7805b4..df5233c 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev (= 1:7.5~1)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/xft
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/xft.git
 

commit e73c9a3452ff6fd83af727bb17fc58cf4d882ac3
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Thu Nov 26 16:47:45 2009 +0200

Bump the build-dep on xutils-dev (= 1:7.5~1).

diff --git a/debian/changelog b/debian/changelog
index 161ea47..c994749 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xft (2.1.14-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump the build-dep on xutils-dev (=

xft: Changes to 'debian-unstable'

2009-02-15 Thread Julien Cristau 
 .gitignore   |1 
 COPYING  |1 
 ChangeLog|   80 
 INSTALL  |8 
 Makefile.am  |   12 
 Makefile.in  |  716 -
 aclocal.m4   | 7462 --
 config.guess | 1500 --
 config.h.in  |   79 
 config.sub   | 1608 ---
 configure|21864 ---
 configure.ac |4 
 debian/changelog |   24 
 debian/control   |2 
 debian/libxft-dev.preinst.in |   48 
 debian/rules |   22 
 debian/xsfbs/xsfbs.mk|   29 
 depcomp  |  530 -
 include/X11/Xft/Xft.h|4 
 include/X11/Xft/XftCompat.h  |2 
 install-sh   |  323 
 ltmain.sh| 6871 -
 man/Makefile.in  |  435 
 man/Xft.3.in |2 
 missing  |  360 
 mkinstalldirs|  158 
 src/Makefile.am  |2 
 src/Makefile.in  |  538 -
 src/xftcolor.c   |2 
 src/xftcore.c|2 
 src/xftdbg.c |2 
 src/xftdpy.c |2 
 src/xftdraw.c|2 
 src/xftextent.c  |2 
 src/xftfont.c|2 
 src/xftfreetype.c|   11 
 src/xftglyphs.c  |2 
 src/xftinit.c|2 
 src/xftint.h |2 
 src/xftlist.c|2 
 src/xftname.c|3 
 src/xftrender.c  |2 
 src/xftstr.c |2 
 src/xftswap.c|2 
 src/xftxlfd.c|2 
 45 files changed, 152 insertions(+), 42577 deletions(-)

New commits:
commit 0f6d0dd28c1d9c414650188ebed6bdc25f0973be
Author: Julien Cristau jul...@radis.liafa.jussieu.fr
Date:   Sun Feb 15 22:07:14 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index ce11c6f..f5501d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xft (2.1.13-3) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Julien Cristau jcris...@debian.org  Sun, 15 Feb 2009 22:07:06 +0100
+
 xft (2.1.13-2) experimental; urgency=low
 
   * Delete obsolete libxft-dev preinst (closes: #491633).

commit 243607b3a9f66d904b536fa7dbb744c1e561f5a7
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jul 26 23:02:30 2008 +0200

Prepare changelog for upload, and add bug closer

diff --git a/debian/changelog b/debian/changelog
index b451476..ce11c6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xft (2.1.13-2) UNRELEASED; urgency=low
+xft (2.1.13-2) experimental; urgency=low
 
-  * Delete obsolete libxft-dev preinst.
+  * Delete obsolete libxft-dev preinst (closes: #491633).
 
- -- Julien Cristau jcris...@debian.org  Sat, 19 Jul 2008 22:16:21 +0200
+ -- Julien Cristau jcris...@debian.org  Sat, 26 Jul 2008 23:02:21 +0200
 
 xft (2.1.13-1) experimental; urgency=low
 

commit d4ed55e8c8c32c263a34699fa6a67e9bd1077927
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jul 19 22:16:37 2008 +0200

Delete obsolete libxft-dev preinst.

diff --git a/debian/changelog b/debian/changelog
index 670b9cf..b451476 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xft (2.1.13-2) UNRELEASED; urgency=low
+
+  * Delete obsolete libxft-dev preinst.
+
+ -- Julien Cristau jcris...@debian.org  Sat, 19 Jul 2008 22:16:21 +0200
+
 xft (2.1.13-1) experimental; urgency=low
 
   [ Brice Goglin ]
diff --git a/debian/libxft-dev.preinst.in b/debian/libxft-dev.preinst.in
deleted file mode 100644
index 890c6e2..000
--- a/debian/libxft-dev.preinst.in
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-# -*- coding: utf-8 -*-
-# Preinst for libxft-dev
-# Copyright © 2002 Colin Walters walt...@gnu.org
-# Copyright © 2003 Branden Robinson bran...@debian.org
-
-# $Id: libxft-dev.preinst 99 2004-03-11 07:12:41Z branden $
-
-set -e
-
-if [ $1 = install -o $1 = upgrade ]; then
-# Remove any diversions created by earlier versions of this package
-# (libxft-dev), and any still present that were created by the previous
-# name of this package (libxft2-dev).
-for PKG in libxft-dev libxft2-dev; do
-if dpkg-divert --list /usr/X11R6/include/X11/Xft/Xft.h | \
-grep \$PKG\$; then
-dpkg-divert --package $PKG --remove --rename \
---divert /usr/X11R6/include/X11/Xft/Xft1.h \
-/usr/X11R6/include/X11/Xft/Xft.h
-fi
-
-if dpkg-divert --list /usr/X11R6/lib/libXft.a | \
-grep \$PKG\$; then
-dpkg-divert --package $PKG --remove --rename \
---divert /usr/X11R6/lib/libXft1.a /usr/X11R6/lib/libXft.a
-fi
-
-if dpkg-divert --list /usr/X11R6/lib/libXft.so | \
-grep \$PKG\$; then
-

xft: Changes to 'debian-unstable'

2008-06-13 Thread Brice Goglin 
 debian/changelog |6 ++
 debian/copyright |6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit b36abb65418d55cd7e652b78eb1adadc3ba42e5f
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Fri Jun 13 10:54:14 2008 +0200

Misc fixes to debian/control and debian/copyright

  * Update upstream URL in debian/copyright.

diff --git a/debian/changelog b/debian/changelog
index 8bcdc91..68f0858 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xft (2.1.12-4) UNRELEASED; urgency=low
+
+  * Update upstream URL in debian/copyright.
+
+ -- Brice Goglin [EMAIL PROTECTED]  Fri, 13 Jun 2008 11:39:54 +0200
+
 xft (2.1.12-3) unstable; urgency=low
 
   * Remove Branden from Uploaders with his permission.
diff --git a/debian/copyright b/debian/copyright
index bcbaf2f..e5ee6ce 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,11 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/lib/
+
 This package was originally Debianized by Colin Walters
 [EMAIL PROTECTED] on Sun, 13 Oct 2002 15:01:50 -0400.
 
 Later versions were Debianized by Branden Robinson [EMAIL PROTECTED].
 
-It was downloaded from
-URL: http://xlibs.freedesktop.org/release/libXft-2.1.7.tar.gz .
-
 Upstream maintainer: Keith Packard
 
 Copyright and license:


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

xft: Changes to 'debian-unstable'

2008-06-10 Thread Julien Cristau 
 debian/changelog   |9 
 debian/control |2 
 debian/patches/001_no_export_freetype.diff |   21 -
 debian/xsfbs/xsfbs-autoreconf.mk   |  150 ---
 debian/xsfbs/xsfbs.mk  |   26 -
 debian/xsfbs/xsfbs.sh  |  387 +++--
 src/xftdraw.c  |5 
 7 files changed, 234 insertions(+), 366 deletions(-)

New commits:
commit 82ed1e9b0a57fc9edba5b0702e204ddd8440c6c4
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Tue Jun 10 16:12:39 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index ff6fda5..8bcdc91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xft (2.1.12-3) UNRELEASED; urgency=low
+xft (2.1.12-3) unstable; urgency=low
 
   * Remove Branden from Uploaders with his permission.
   * Bump Standards-Version to 3.7.3.
@@ -13,7 +13,7 @@ xft (2.1.12-3) UNRELEASED; urgency=low
   * Fix XftDrawRect when Render not supported (cherry-picked from upstream
 git; closes: #462262).
 
- -- Julien Cristau [EMAIL PROTECTED]  Mon, 17 Mar 2008 18:13:50 +0100
+ -- Julien Cristau [EMAIL PROTECTED]  Tue, 10 Jun 2008 16:12:37 +0200
 
 xft (2.1.12-2) unstable; urgency=low
 

commit 136d2fd8ce50d0741463c5c5a042dceee6b2f726
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Tue Jun 10 16:06:46 2008 +0200

Update changelog

diff --git a/debian/changelog b/debian/changelog
index e6142f5..ff6fda5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ xft (2.1.12-3) UNRELEASED; urgency=low
   * Modify patch 001_no_export_freetype.diff to not export fontconfig in
 'pkg-config --libs xft' (closes: #389831).
   * Add myself to Uploaders.
+  * Fix XftDrawRect when Render not supported (cherry-picked from upstream
+git; closes: #462262).
 
  -- Julien Cristau [EMAIL PROTECTED]  Mon, 17 Mar 2008 18:13:50 +0100
 

commit 1abc06b72f2b95c9c4be9690b31cb3112564a29e
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Mon Mar 24 12:10:19 2008 -0400

Bug #14232: Fix XftDrawRect when Render not supported.
(cherry picked from commit 541c6194d986e7849ee9541a9fd60b0724647a44)

diff --git a/src/xftdraw.c b/src/xftdraw.c
index 1e8b6de..5931bd1 100644
--- a/src/xftdraw.c
+++ b/src/xftdraw.c
@@ -809,7 +809,10 @@ XftDrawRect (XftDraw   *draw,
 }
 else if (_XftDrawCorePrepare (draw, color))
 {
-   XftRectCore (draw, color, x, y, width, height);
+   /* note: not XftRectCore() */
+   XSetForeground (draw-dpy, draw-core.gc, color-pixel);
+   XFillRectangle (draw-dpy, draw-drawable, draw-core.gc,
+   x, y, width, height);
 }
 }
 

commit be100c09312d942916f0b65796547f38a20d067f
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Tue Jun 10 16:03:04 2008 +0200

add bug closer

diff --git a/debian/changelog b/debian/changelog
index cfea36e..e6142f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ xft (2.1.12-3) UNRELEASED; urgency=low
   * Use ${binary:Version} instead of the equivalent but confusingly-named
 ${Source-Version}.
   * Modify patch 001_no_export_freetype.diff to not export fontconfig in
-'pkg-config --libs xft'.
+'pkg-config --libs xft' (closes: #389831).
   * Add myself to Uploaders.
 
  -- Julien Cristau [EMAIL PROTECTED]  Mon, 17 Mar 2008 18:13:50 +0100

commit 5ae68d3464853707a8ce1cfd5d7b0def1a90f5cf
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Tue Jun 10 15:55:36 2008 +0200

Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index 7b3be16..cfea36e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xft (2.1.12-3) UNRELEASED; urgency=low
 ${Source-Version}.
   * Modify patch 001_no_export_freetype.diff to not export fontconfig in
 'pkg-config --libs xft'.
+  * Add myself to Uploaders.
 
  -- Julien Cristau [EMAIL PROTECTED]  Mon, 17 Mar 2008 18:13:50 +0100
 
diff --git a/debian/control b/debian/control
index a6c7f53..9c9fa52 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xft
 Section: devel
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow [EMAIL PROTECTED], Andres Salomon [EMAIL 
PROTECTED]
+Uploaders: David Nusinow [EMAIL PROTECTED], Andres Salomon [EMAIL 
PROTECTED], Julien Cristau [EMAIL PROTECTED]
 Build-Depends: debhelper (= 5.0.0), libfontconfig1-dev, libfreetype6-dev, 
libx11-dev, libxrender-dev, zlib1g-dev | libz-dev, quilt
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/xft

commit ec0314e066f21b17326143e7f933f7a0ae13c2ac
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Tue Jun 10 15:53:59 2008 +0200

Move fontconfig to Requires.private only in xft.pc

Modify patch 001_no_export_freetype.diff to not export fontconfig in
'pkg-config --libs xft'.

diff --git a/debian/changelog b/debian/changelog
index

xft: Changes to 'debian-unstable'

2008-03-17 Thread Julien Cristau 
 debian/changelog  |   12 +
 debian/control|   12 ++---
 debian/xsfbs/xsfbs.mk |  110 +-
 debian/xsfbs/xsfbs.sh |7 ---
 4 files changed, 39 insertions(+), 102 deletions(-)

New commits:
commit 35d63133ba2dda7aece7621be379ca968004dd04
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Mon Mar 17 18:15:56 2008 +0100

Update debian/control

* Remove Branden from Uploaders with his permission.
* Bump Standards-Version to 3.7.3.
* Add Vcs-Git and Vcs-Browser control fields.
* Drop pre-dependency on x11-common from libxft2 and libxft2-dbg, as it's
  not needed.
* Use ${binary:Version} instead of the equivalent but confusingly-named
  ${Source-Version}.

diff --git a/debian/changelog b/debian/changelog
index a6e2dd9..5c886d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+xft (2.1.12-3) UNRELEASED; urgency=low
+
+  * Remove Branden from Uploaders with his permission.
+  * Bump Standards-Version to 3.7.3.
+  * Add Vcs-Git and Vcs-Browser control fields.
+  * Drop pre-dependency on x11-common from libxft2 and libxft2-dbg, as it's
+not needed.
+  * Use ${binary:Version} instead of the equivalent but confusingly-named
+${Source-Version}.
+
+ -- Julien Cristau [EMAIL PROTECTED]  Mon, 17 Mar 2008 18:13:50 +0100
+
 xft (2.1.12-2) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/control b/debian/control
index 7953cbe..a6c7f53 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,15 @@ Source: xft
 Section: devel
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: Branden Robinson [EMAIL PROTECTED], David Nusinow [EMAIL 
PROTECTED], Andres Salomon [EMAIL PROTECTED]
+Uploaders: David Nusinow [EMAIL PROTECTED], Andres Salomon [EMAIL 
PROTECTED]
 Build-Depends: debhelper (= 5.0.0), libfontconfig1-dev, libfreetype6-dev, 
libx11-dev, libxrender-dev, zlib1g-dev | libz-dev, quilt
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/xft
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/xft.git
 
 Package: libxft2
 Section: libs
 Architecture: any
-Pre-Depends: x11-common (= 1:7.0.0)
 Depends: ${shlibs:Depends}
 Description: FreeType-based font drawing library for X
  Xft provides a client-side font API for X applications, making the FreeType
@@ -21,8 +22,7 @@ Package: libxft2-dbg
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libxft2 (= ${Source-Version}), ${shlibs:Depends}
-Pre-Depends: x11-common (= 1:7.0.0)
+Depends: libxft2 (= ${binary:Version}), ${shlibs:Depends}
 Description: FreeType-based font drawing library for X (unstripped)
  Xft provides a client-side font API for X applications, making the FreeType
  font rasterizer available to X clients.  Fontconfig is used for font
@@ -41,7 +41,7 @@ Description: FreeType-based font drawing library for X 
(unstripped)
 Package: libxft-dev
 Section: libdevel
 Architecture: any
-Depends: libxft2 (= ${Source-Version}), libc6-dev | libc-dev, 
libfontconfig1-dev, libfreetype6-dev, libx11-dev (= 2:1.0.0), libxrender-dev, 
zlib1g-dev | libz-dev
+Depends: libxft2 (= ${binary:Version}), libc6-dev | libc-dev, 
libfontconfig1-dev, libfreetype6-dev, libx11-dev (= 2:1.0.0), libxrender-dev, 
zlib1g-dev | libz-dev
 Conflicts: libxft2-dev, xlibs-dev ( 4.3.0)
 Provides: libxft2-dev
 Pre-Depends: x11-common (= 1:7.0.0)

commit 844199da71f29556be3436fa0fead2f0cc0bfc1b
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue Jan 8 20:18:49 2008 -0500

Kill the manifest code.
It served its purpose for the monolith and is now dead.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index b8f7afd..4822173 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -196,7 +196,6 @@ xsfclean: cleanscripts unpatch
rm -rf $(STAMP_DIR) $(SOURCE_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
-debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new \
 debian/po/pothead
 
 # Generate the debconf templates POT file header.
@@ -209,58 +208,6 @@ debian/po/pothead: debian/po/pothead.in
 updatepo: debian/po/pothead
debian/scripts/debconf-updatepo --pot-header=pothead --verbose
 
-# Use the MANIFEST files to determine whether we're shipping everything we
-# expect to ship, and not shipping anything we don't expect to ship.
-.PHONY: check-manifest
-stampdir_targets+=check-manifest
-check-manifest: $(STAMP_DIR)/check-manifest
-$(STAMP_DIR)/check-manifest: $(STAMP_DIR)/install
-   # Compare manifests.
-   (cd debian/tmp  find -type f | LC_ALL=C sort | cut -c3-) \
- debian/MANIFEST.$(ARCH).new
-   # Construct MANIFEST files from MANIFEST.$(ARCH).in and
-   # MANIFEST.$(ARCH).all or MANIFEST.all.
-   if expr $(findstring -DBuildFonts=NO,$(IMAKE_DEFINES)) \
- : -DBuildFonts=NO /dev/null 21; then \
- LC_ALL=C sort -u

xft: Changes to 'debian-unstable'

2007-04-10 Thread Julien Cristau 
 .gitignore|   21 
 COPYING   |2 
 ChangeLog |  268 
 Makefile.am   |2 
 Makefile.in   |  342 
 aclocal.m4| 3426 +
 config.guess  |  667 +
 config.sub|  222 
 configure |12411 --
 configure.ac  |4 
 debian/changelog  |   47 
 debian/control|6 
 debian/patches/002_no_xproto_dep.diff |   13 
 debian/patches/series |1 
 debian/rules  |4 
 debian/xsfbs/xsfbs-autoreconf.mk  |  150 
 debian/xsfbs/xsfbs.mk |  380 +
 debian/xsfbs/xsfbs.sh |  907 ++
 depcomp   |  103 
 include/X11/Xft/Xft.h |   14 
 include/X11/Xft/XftCompat.h   |2 
 install-sh|  477 -
 ltmain.sh | 1278 ++-
 man/.gitignore|4 
 man/Makefile.in   |  144 
 man/Xft.3 |  847 --
 man/Xft.3.in  |2 
 man/xft-config.1  |  120 
 missing   |  142 
 mkinstalldirs |   89 
 src/.gitignore|6 
 src/Makefile.in   |  266 
 src/xftcolor.c|8 
 src/xftcore.c |   12 
 src/xftdbg.c  |4 
 src/xftdpy.c  |   22 
 src/xftdraw.c |   58 
 src/xftextent.c   |   14 
 src/xftfont.c |   10 
 src/xftfreetype.c |   30 
 src/xftglyphs.c   |   16 
 src/xftinit.c |   14 
 src/xftint.h  |   10 
 src/xftlist.c |6 
 src/xftname.c |   10 
 src/xftrender.c   |   32 
 src/xftstr.c  |4 
 src/xftswap.c |   12 
 src/xftxlfd.c |8 
 49 files changed, 12363 insertions(+), 10274 deletions(-)

New commits:
commit 32030a0380da1ab66f4f8f680730d9c56d29f85a
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Tue Apr 10 20:45:12 2007 +0200

Prepare changelog for upload.

diff --git a/debian/changelog b/debian/changelog
index 01db053..a6e2dd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xft (2.1.12-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Julien Cristau [EMAIL PROTECTED]  Tue, 10 Apr 2007 20:43:57 +0200
+
 xft (2.1.12-1) experimental; urgency=low
 
   * New upstream release.

commit 4c3f9946536161105a4908d96261062b66ff5aad
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Tue Apr 10 20:35:57 2007 +0200

Delete xsfbs to prepare for a proper import.

diff --git a/debian/xsfbs/xsfbs-autoreconf.mk b/debian/xsfbs/xsfbs-autoreconf.mk
deleted file mode 100644
index fc2fe62..000
--- a/debian/xsfbs/xsfbs-autoreconf.mk
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/usr/bin/make -f
-# $Id: xsfbs-autoreconf.mk 2284 2006-06-06 18:02:50Z branden $
-
-# Automagical conversion of autoreconf results into quilt patches.
-
-# Copyright 2006 Eugene Konev
-#
-# Licensed under the GNU General Public License, version 2.  See the file
-# /usr/share/common-licenses/GPL or http://www.gnu.org/copyleft/gpl.txt.
-
-# The idea behind this is storing changes produced by autoreconf as a 
-# separate patch on quilt stack (on top of stack actually).
-# The only usable target here is 'autoreconf`. Other targets are not
-# supposed to be called directly. DO NOT invoke them, unless you know what
-# you are doing.
-# The autoreconf target will check if files with names in $(RECONF_CHECKFILES)
-# were changed during patching (from upstream version or from previously
-# autoreconfed version) and call actual autoreconfing if they were.
-# The actual autoreconfing target (doautoreconf) WILL FAIL after 
-# calling autoreconf and pushing changes into quilt stack by design. It
-# should never be invoked by automatic build process.
-# The proposed use is adding autoreconf into clean's prerequisites before
-# xsfclean like:
-# - clean: xsfclean
-# + clean: autoreconf xsfclean
-# This will ensure it is called when you build package with dpkg-buildpackage.
-
-# This dir will be used for producing diff of autoreconfed tree
-RECONF_DIR := xsfautoreconf
-
-# This files will be checked for changes
-RECONF_CHECKFILES += configure.ac Makefile.am
-
-# This files will not be hardlinked but copied
-RECONF_NOLINKFILES += aclocal.m4
-
-# This files/dirs will be pruned after autoreconf run
-RECONF_PRUNEFILES += autom4te.cache config.h.in~ aclocal.m4~
-

xft: Changes to 'debian-unstable'

2007-01-25 Thread David Nusinow 
New branch 'debian-unstable' available with the following commits:
commit 7028b6319b485fed61d8df4ff5f5f69e79c39d52
Author: Thierry Reding [EMAIL PROTECTED]
Date:   Tue Sep 26 09:37:55 2006 +

Add watch files.

commit bc8758f380736579360ce3fae2902811e42bc5d7
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun May 21 20:27:12 2006 +

Prepare changelog for upload

commit 25486a83e50a0494a2c4f56b92ee0cabdacdf3bf
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun May 21 20:16:59 2006 +

* Rebuild with freetype6 2.2.1, which fixes ABI breakages of the past.
  Thanks Steve Langasek and Keith Packard for managing the freetype side of
  things. (closes: #350113)

commit 32eef6e4f420caa031a21ab381fc582207526288
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun May 21 20:14:22 2006 +

* Bump debhelper compat level to 5

commit c2c5a0b314d32790717dd8bec6586ba8418c33ef
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun May 21 19:55:39 2006 +

* Bump standards version to 3.7.2.0

commit c0162c95861588c2340228381532ca0adfbe30b3
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed May 3 02:31:55 2006 +

* Fix package name in rules file so that the debugging symbols go to the
  right place. Thanks Tim Johann. (closes: #365341)
* Remove useless instaces of x-dev in dependencies. Thaks Ross Burton.
  (closes: #363507)

commit 1dd395f3509e1911891b87c72361de684fec1ea9
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed May 3 02:24:43 2006 +

* Run dh_install with --list-missing

commit 4267476bd8d79cf933be88f1516cabf83a38aa93
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed May 3 02:22:26 2006 +

* Add closer

commit d7bf0c6db9c8cd60f34949a5b4801c0ea0b6e568
Author: Steve Langasek [EMAIL PROTECTED]
Date:   Wed Apr 19 07:16:54 2006 +

rename the xft package directory as well

commit f466b261a5e6926341e5a016ae239b3089fa04d6
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed Apr 19 01:55:13 2006 +

* Reorder makeshlib command in rules file so that ldconfig is run
  properly. Thanks Drew Parsons and Steve Langasek.

commit b84dbd78af7eceb9f5e1a8e7fae27f41a30b656a
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue Apr 4 23:55:04 2006 +

Set all libs to upload to unstable. Also update xft for modular.

commit b40e139b0e20c4a8fb5b0de7b72f918e472e6582
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sat Feb 18 20:21:03 2006 +

Move xft packaging to modular branch

commit 7585260086c287a33175640ea486180a2bc352ee
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed Jan 25 01:34:54 2006 +

Set libs to be uploaded to experimental. Also pull in some libxft fixes 
from what's in unstable

commit 5e730ba1f05204aff09cd3481ae615f30ab8620c
Author: David Nusinow [EMAIL PROTECTED]
Date:   Mon Jan 23 03:09:34 2006 +

* Add build-dep on quilt
* Set maintainer and uploaders

commit b64a70433e5cf35522cbabacd0d2744e36b5ef37
Author: David Nusinow [EMAIL PROTECTED]
Date:   Mon Jan 23 03:07:34 2006 +

Grab latest from Ubuntu, which brings this lib in line with the rest of the 
modular libs.

commit 152db2756bd219e4c988729ef25aeaed3c0e9121
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Dec 30 20:12:45 2005 +

Update libs to 7.0 release with packaging

commit 056aa529ded2b53d4e60181a402ee229b1d23b76
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Dec 30 00:24:15 2005 +

Vendor drop of proto and lib for 7.0


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]