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 +0000
+ -- 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 +0000
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 +0000
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 b6954f2..2fbf718 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ xft (2.1.14-2) UNRELEASED; urgency=low
the (recently-added) udebs rather than on the libraries:
- libx11-dev
- libxrender-dev
+ * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
-- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:37 +0000
diff --git a/debian/control b/debian/control
index 0272c32..7db4f6e 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
automake,
libtool,
xutils-dev (>= 1:7.5~1)
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/xft
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/xft.git
commit 07861b99105924d6be612cc0b612015e0bdc3b9f
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Feb 26 07:24:29 2010 +0100
Use XC-Package-Type to save some memory.
diff --git a/debian/control b/debian/control
index 3c92fb2..0272c32 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-udeb
-Package-Type: udeb
+XC-Package-Type: udeb
Section: debian-installer
Architecture: any
Depends: ${shlibs:Depends}
commit 00812a1c56e3feb1d60a5e887f636a14bf440d89
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Feb 6 23:51:08 2010 +0000
Version/Bump some B-D to make sure the udeb gets its dependencies on udebs.
diff --git a/debian/changelog b/debian/changelog
index f354e0f..b6954f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ xft (2.1.14-2) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Add udeb needed for the graphical installer: libxft2-udeb.
+ * Version/Bump some B-D to make sure the udeb gets its dependencies on
+ the (recently-added) udebs rather than on the libraries:
+ - libx11-dev
+ - libxrender-dev
-- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:37 +0000
diff --git a/debian/control b/debian/control
index f244809..3c92fb2 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Build-Depends:
debhelper (>= 5.0.0),
libfontconfig1-dev,
libfreetype6-dev,
- libx11-dev,
- libxrender-dev,
+ libx11-dev (>= 2:1.3.3-2),
+ libxrender-dev (>= 1:0.9.5-2),
zlib1g-dev | libz-dev,
quilt,
automake,
commit c70c9d70d0c82331c3d5fc3e254c44c61ebd96b0
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Feb 6 23:45:45 2010 +0000
Add udeb needed for the graphical installer: libxft2-udeb.
diff --git a/debian/changelog b/debian/changelog
index cd23578..f354e0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
xft (2.1.14-2) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
+ [ Cyril Brulebois ]
+ * Add udeb needed for the graphical installer: libxft2-udeb.
+
-- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:37 +0000
xft (2.1.14-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 7abfd5e..f244809 100644
--- a/debian/control
+++ b/debian/control
@@ -28,6 +28,14 @@ Description: FreeType-based font drawing library for X
specification resolution. Where available, the RENDER extension handles
glyph drawing; otherwise, the core X protocol is used.
+Package: libxft2-udeb
+Package-Type: udeb
+Section: debian-installer
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: FreeType-based font drawing library for X
+ This is a udeb, or a microdeb, for the debian-installer.
+
Package: libxft2-dbg
Section: debug
Priority: extra
diff --git a/debian/libxft2-udeb.install b/debian/libxft2-udeb.install
new file mode 100644
index 0000000..c33b7c9
--- /dev/null
+++ b/debian/libxft2-udeb.install
@@ -0,0 +1 @@
+usr/lib/libXft.so.*
diff --git a/debian/rules b/debian/rules
index ed3c030..abf842f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -86,7 +86,7 @@ binary-arch: build install
dh_strip --dbg-package=$(PACKAGE)-dbg
dh_compress
dh_fixperms
- dh_makeshlibs -V "libxft2 (>> 2.1.1)"
+ dh_makeshlibs -V "libxft2 (>> 2.1.1)" --add-udeb=$(PACKAGE)-udeb
dh_shlibdeps
dh_installdeb
dh_gencontrol
--
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/e1npxqi-0002tc...@alioth.debian.org
