debian/changelog | 10 ++++++++-- debian/control | 3 ++- debian/rules | 13 +++++++++---- 3 files changed, 19 insertions(+), 7 deletions(-)
New commits: commit 178f5a282f36b1a6ff4de30efc1f0541eec4c20a Author: Brice Goglin <[email protected]> Date: Wed Dec 2 21:05:23 2009 +0100 Prepare Changelog for upload diff --git a/debian/changelog b/debian/changelog index 50c8d68..5275d92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-ati (1:6.12.4-1) UNRELEASED; urgency=low +xserver-xorg-video-ati (1:6.12.4-1) experimental; urgency=low [ Timo Aaltonen ] * New upstream release. @@ -9,7 +9,7 @@ xserver-xorg-video-ati (1:6.12.4-1) UNRELEASED; urgency=low dependencies, closes: #558290. * Build against xserver 1.7. - -- Brice Goglin <[email protected]> Thu, 03 Dec 2009 16:37:52 +0100 + -- Brice Goglin <[email protected]> Thu, 03 Dec 2009 16:38:29 +0100 xserver-xorg-video-ati (1:6.12.3-1) unstable; urgency=low commit c9de351ba3ab204996cc17d2af77f6fce72d798a Author: Brice Goglin <[email protected]> Date: Wed Dec 2 21:05:09 2009 +0100 Build against Xserver 1.7 diff --git a/debian/changelog b/debian/changelog index ea53c3e..50c8d68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,9 @@ xserver-xorg-video-ati (1:6.12.4-1) UNRELEASED; urgency=low [ Brice Goglin ] * Properly generate each binary package substvars so as to fix shlibs dependencies, closes: #558290. + * Build against xserver 1.7. - -- Brice Goglin <[email protected]> Thu, 03 Dec 2009 16:37:07 +0100 + -- Brice Goglin <[email protected]> Thu, 03 Dec 2009 16:37:52 +0100 xserver-xorg-video-ati (1:6.12.3-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 401a890..4bcab8a 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow <[email protected]>, Drew Parsons <[email protected] Build-Depends: debhelper (>= 5), pkg-config, - xserver-xorg-dev (>= 2:1.5.99.901), + xserver-xorg-dev (>= 2:1.7), x11proto-gl-dev, x11proto-xext-dev, x11proto-core-dev, commit 79d61abe9918642b85a1987704555938937ffa4c Author: Brice Goglin <[email protected]> Date: Wed Dec 2 21:04:28 2009 +0100 Properly generate each binary package substvars To fix #558290, we need to run the serverabi rule twice with different PACKAGE values. However, this rule depends on the install target, which calls dh_clean. So the second invokation of serverabi would erase the first generated substvars. To workaround this, we add a install-stamp so that the install rule is only executed once. Note that install-stamp must depend on build-stamp and not on build. Otherwise install-stamp would always be regenerated since build is .PHONY. diff --git a/debian/changelog b/debian/changelog index 7782299..ea53c3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ xserver-xorg-video-ati (1:6.12.4-1) UNRELEASED; urgency=low + [ Timo Aaltonen ] * New upstream release. * Bump Standards-Version to 3.8.3. - -- Timo Aaltonen <[email protected]> Mon, 30 Nov 2009 16:01:49 +0200 + [ Brice Goglin ] + * Properly generate each binary package substvars so as to fix shlibs + dependencies, closes: #558290. + + -- Brice Goglin <[email protected]> Thu, 03 Dec 2009 16:37:07 +0100 xserver-xorg-video-ati (1:6.12.3-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 64ec665..401a890 100644 --- a/debian/control +++ b/debian/control @@ -30,6 +30,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ati.git Package: xserver-xorg-video-ati Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}, xserver-xorg-video-r128, xserver-xorg-video-mach64, xserver-xorg-video-radeon +Provides: ${xviddriver:Provides} Description: X.Org X server -- ATI display driver wrapper This driver for the X.Org X server (see xserver-xorg for a further description) provides support for the ATI Mach64, Rage128, Radeon and FireGL series. diff --git a/debian/rules b/debian/rules index 5c87ec5..43a1aa8 100755 --- a/debian/rules +++ b/debian/rules @@ -54,7 +54,7 @@ build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status clean: dh_testdir dh_testroot - rm -f build-stamp + rm -f build-stamp install-stamp rm -f config.cache config.log config.status rm -f */config.cache */config.log */config.status @@ -67,16 +67,22 @@ clean: dh_clean -install: build +.PHONY: install +install: install-stamp +install-stamp: build-stamp dh_testdir dh_testroot dh_clean -k dh_installdirs cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + >$@ + +serverabi-%: install + $(MAKE) -f debian/rules serverabi PACKAGE=xserver-xorg-video-$* # Build architecture-dependent files here. -binary-arch: build install serverabi +binary-arch: build install serverabi-ati serverabi-radeon dh_testdir dh_testroot @@ -91,7 +97,6 @@ binary-arch: build install serverabi dh_fixperms dh_installdeb dh_shlibdeps -- --warnings=6 - cp -f debian/xserver-xorg-video-ati.substvars debian/xserver-xorg-video-radeon.substvars # xsfbs serverabi hack dh_gencontrol dh_md5sums dh_builddeb -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
