X Strike Force X.Org X11 SVN commit: r1109 - branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian
Author: dnusinow
Date: 2006-01-22 22:07:34 -0500 (Sun, 22 Jan 2006)
New Revision: 1109
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/libxft-dev.install
branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/libxft2.install
branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/rules
Log:
Grab latest from Ubuntu, which brings this lib in line with the rest of the modular libs.
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-01-23 02:45:38 UTC (rev 1108)
+++ branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/changelog 2006-01-23 03:07:34 UTC (rev 1109)
@@ -1,29 +1,28 @@
-xft (2.1.8.2-1) UNRELEASED; urgency=low
+libxft (2.1.8.2-1) UNRELEASED; urgency=low
- * First modular upload to Debian
- * Add myself to uploaders
+ * First upload to Debian
- -- David Nusinow <dnusinow@debian.org> Thu, 29 Dec 2005 20:52:12 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 22 Jan 2006 22:06:17 -0500
-xft (2.1.7-1ubuntu5) breezy; urgency=low
+libxft (2.1.8.2-0ubuntu2) dapper; urgency=low
- * debian/control.in:
- - updated the libx11-dev requirement to build without -D_XOPEN_SOURCE.
+ * Change dependency on x-common to x11-common.
- -- Sebastien Bacher <seb128@canonical.com> Sat, 23 Jul 2005 14:46:42 +0200
+ -- Daniel Stone <daniel.stone@ubuntu.com> Thu, 19 Jan 2006 18:27:58 +1100
-xft (2.1.7-1ubuntu4) breezy; urgency=low
+libxft (2.1.8.2-0ubuntu1) dapper; urgency=low
- * Set a versioned libxrender-dev build-dep to make sure we
- get the correct behaviour wanted with the previous upload.
+ * New upstream release.
+ * Repackaged to fit all the other X packages.
+ * Stop shipping libXft.la.
- -- Adam Conrad <adconrad@ubuntu.com> Tue, 19 Jul 2005 12:38:29 +1000
+ -- Daniel Stone <daniel.stone@ubuntu.com> Wed, 21 Dec 2005 13:13:31 +1100
-xft (2.1.7-1ubuntu3) breezy; urgency=low
+xft (2.1.8.1-0ubuntu1) dapper; urgency=low
- * Rebuild for the libXrender changes.
+ * New upstream release.
- -- Sebastien Bacher <seb128@canonical.com> Fri, 15 Jul 2005 13:07:36 +0200
+ -- Daniel Stone <daniel.stone@ubuntu.com> Mon, 12 Dec 2005 15:33:13 +1100
xft (2.1.7-1ubuntu2) breezy; 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-01-23 02:45:38 UTC (rev 1108)
+++ branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/control 2006-01-23 03:07:34 UTC (rev 1109)
@@ -1,9 +1,8 @@
-Source: xft
-Section: devel
+Source: libxft
+Section: x11
Priority: optional
-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Branden Robinson <branden@debian.org>, David Nusinow <dnusinow@debian.org>
-Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.0.0), libfontconfig1-dev, libfreetype6-dev, x-dev, libx11-dev (>= 1:0.99.2-1), libxrender-dev (>= 1:0.9.0-2), zlib1g-dev | libz-dev
+Maintainer: Daniel Stone <daniel.stone@ubuntu.com>
+Build-Depends: debhelper (>= 4.0.0), libfontconfig1-dev, libfreetype6-dev, x11proto-core-dev, libx11-dev, libxrender-dev, zlib1g-dev | libz-dev
Standards-Version: 3.6.1
Package: libxft2
@@ -42,7 +41,7 @@
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 (>= 1:1.09)
+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/libxft-dev.install
===================================================================
--- branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/libxft-dev.install 2006-01-23 02:45:38 UTC (rev 1108)
+++ branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/libxft-dev.install 2006-01-23 03:07:34 UTC (rev 1109)
@@ -1,6 +1,7 @@
-debian/tmp/usr/include/X11/Xft/* usr/include/X11/Xft/
-debian/tmp/usr/lib/libXft*.{a,la,so}
-debian/tmp/usr/lib/pkgconfig/*.pc
-debian/tmp/usr/bin/xft-config
-debian/tmp/usr/share/man/man1/xft-config.1
-debian/tmp/usr/share/man/man3/Xft.3
+usr/include/X11/Xft/*
+usr/lib/libXft.a
+usr/lib/libXft.so
+usr/lib/pkgconfig/*.pc
+usr/bin/xft-config
+usr/share/man/man1/*
+usr/share/man/man3/*
Modified: branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/libxft2.install
===================================================================
--- branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/libxft2.install 2006-01-23 02:45:38 UTC (rev 1108)
+++ branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/libxft2.install 2006-01-23 03:07:34 UTC (rev 1109)
@@ -1 +1 @@
-debian/tmp/usr/lib/libXft*.so.*
+usr/lib/libXft.so.*
Modified: branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/rules
===================================================================
--- branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/rules 2006-01-23 02:45:38 UTC (rev 1108)
+++ branches/modular/lib/libXft-X11R7.0-2.1.8.2/debian/rules 2006-01-23 03:07:34 UTC (rev 1109)
@@ -1,13 +1,91 @@
#!/usr/bin/make -f
+# debian/rules for the Debian libxft package.
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>
+# Copyright © 2005 Daniel Stone <daniel@fooishbar.org>
+# Copyright © 2005 David Nusinow <dnusinow@debian.org>
-# $Id: rules 91 2003-11-17 07:26:21Z branden $
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
-# Import Common Debian Build System (CDBS).
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+PACKAGE = libxft1
-# RPATH is considered harmful by the Debian Project.
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-rpath
+include debian/xsfbs/xsfbs.mk
-# Library interface did not change in Xft 2.1.2.
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V "libxft2 (>> 2.1.1)"
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ confflags += --build=$(DEB_HOST_GNU_TYPE)
+else
+ confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
+
+build: build-stamp
+build-stamp:
+ dh_testdir
+
+ mkdir obj-$(DEB_BUILD_GNU_TYPE)
+ cd obj-$(DEB_BUILD_GNU_TYPE) && \
+ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info $(confflags) \
+ CFLAGS="$(CFLAGS)"
+ cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ rm -f config.cache config.log config.status
+ rm -f */config.cache */config.log */config.status
+ rm -f conftest* */conftest*
+ rm -rf autom4te.cache */autom4te.cache
+ rm -rf obj-*
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+
+ dh_installdocs
+ dh_install --sourcedir=debian/tmp
+ dh_installchangelogs
+ dh_link
+ dh_strip --dbg-package=$(PACKAGE)
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_makeshlibs -V "libxft2 (>> 2.1.1)"
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# Build architecture-independent files here.
+binary-indep: build install
+# Nothing to do
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Reply to: