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 @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Uploaders: Cyril Brulebois <k...@debian.org> Build-Depends: - debhelper (>= 5.0.0), + debhelper (>= 8.1.3), libfontconfig1-dev, libfreetype6-dev, libx11-dev (>= 2:1.3.3-2), @@ -24,6 +24,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same 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 @@ -47,6 +49,7 @@ Depends: libxft2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, +Multi-Arch: same 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 diff --git a/debian/libxft-dev.install b/debian/libxft-dev.install index 5553ba7..720116a 100644 --- a/debian/libxft-dev.install +++ b/debian/libxft-dev.install @@ -1,5 +1,5 @@ usr/include/X11/Xft/* -usr/lib/libXft.a -usr/lib/libXft.so -usr/lib/pkgconfig/*.pc +usr/lib/*/libXft.a +usr/lib/*/libXft.so +usr/lib/*/pkgconfig/*.pc usr/share/man/man3/* diff --git a/debian/libxft2-udeb.install b/debian/libxft2-udeb.install index c33b7c9..28a5a84 100644 --- a/debian/libxft2-udeb.install +++ b/debian/libxft2-udeb.install @@ -1 +1 @@ -usr/lib/libXft.so.* +usr/lib/*/libXft.so.* usr/lib diff --git a/debian/libxft2.install b/debian/libxft2.install index c33b7c9..fc10360 100644 --- a/debian/libxft2.install +++ b/debian/libxft2.install @@ -1 +1 @@ -usr/lib/libXft.so.* +usr/lib/*/libXft.so.* diff --git a/debian/rules b/debian/rules index f845b62..8ea949a 100755 --- a/debian/rules +++ b/debian/rules @@ -23,6 +23,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) endif +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) 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) @@ -42,6 +43,7 @@ build/config.status: configure cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ CFLAGS="$(CFLAGS)" build: build-stamp commit 81fc271788605b52e85c2d11635a0371fb44605e Author: Cyril Brulebois <k...@debian.org> Date: Sun May 2 02:14:45 2010 +0200 Add xorg-driver-{video,input} to Provides. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 77c4a39..3c59c20 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) # these two can be removed post-squeeze VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) -INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) +VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video +INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) commit b045afbd8277ad0c44e29d7c45802053c4335ccd Author: Julien Cristau <jcris...@debian.org> Date: Fri Apr 16 22:14:46 2010 +0200 Update serverabi rule for xserver 1.7.6.901 Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for drivers. The ${xserver:Depends} variable is deprecated. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 351fea5..77c4a39 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir # debian/*.prerm >$@ -SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) +# Compute dependencies for drivers +# +VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) +INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) + +# these two can be removed post-squeeze VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) + ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) endif .PHONY: serverabi serverabi: install -ifeq ($(SERVERMINVERS),) - @echo error: xserver-xorg-dev needs to be installed +ifeq ($(VIDEODEP),) + @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' @exit 1 else - echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars + echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars + # the following is there for compatibility... echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars endif # vim:set noet ai sts=8 sw=8 tw=0: commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff Author: Julien Cristau <jcris...@debian.org> Date: Tue Apr 13 14:06:33 2010 +0200 xsfbs.mk: don't use a directory as a make target The timestamp on the directory gets updated each time a file is added in it, which causes useless rebuilds. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 5e16b10..351fea5 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir: .PHONY: prepare stampdir_targets+=prepare prepare: $(STAMP_DIR)/prepare -$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts +$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts >$@ -.PHONY: log -stampdir_targets+=log -log: $(STAMP_DIR)/log -$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir +.PHONY: logdir +stampdir_targets+=logdir +logdir: $(STAMP_DIR)/logdir +$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir mkdir -p $(STAMP_DIR)/log + >$@ # Apply all patches to the upstream source. .PHONY: patch @@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare # Revert all patches to the upstream source. .PHONY: unpatch -unpatch: $(STAMP_DIR)/log +unpatch: $(STAMP_DIR)/logdir rm -f $(STAMP_DIR)/patch @echo -n "Unapplying patches..."; \ if $(QUILT) applied >/dev/null 2>/dev/null; then \ commit 734e3b2d1dcfe5db07cb19902617fd1212c0c186 Author: Cyril Brulebois <k...@debian.org> Date: Thu Apr 1 20:49:15 2010 +0200 Fix typo. diff --git a/debian/README.source b/debian/README.source index 34ab4bf..b09a1ab 100644 --- a/debian/README.source +++ b/debian/README.source @@ -25,7 +25,7 @@ just need to be pulled into git.debian.org in a "upstream-*" branch. Otherwise, the upstream sources are manually installed in the Debian git repository. -The .orig.tar.gz upstream source file could be generated this +The .orig.tar.gz upstream source file could be generated using this "upstream-*" branch in the Debian git repository but it is actually copied from upstream tarballs directly. -- 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/e1qvlli-0006bo...@vasks.debian.org