debian/README.source | 2 - debian/changelog | 11 +++++++++ debian/control | 58 +------------------------------------------------- debian/xsfbs/xsfbs.mk | 35 ++++++++++++++++++------------ 4 files changed, 36 insertions(+), 70 deletions(-)
New commits: commit c1a27777d3eaddf7e1ec1f3bf4ee3fb54d64db89 Author: Julien Cristau <[email protected]> Date: Wed Oct 13 15:41:27 2010 +0200 Use non-versioned driver virtual packages for xserver-xorg dependencies. The ABI handling is done directly between the server and drivers, no need to duplicate it here. diff --git a/debian/changelog b/debian/changelog index 6ef12f0..bf16d2a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ xorg (1:7.6~1) UNRELEASED; urgency=low * Drop xlibmesa-gl, xlibmesa-gl-dev, xlibmesa-glu, libglu1-xorg and libglu1-xorg-dev. These were already transitional packages in etch, so it's high time people updated their dependencies. + * Use non-versioned driver virtual packages for xserver-xorg dependencies. -- Julien Cristau <[email protected]> Wed, 13 Oct 2010 15:29:12 +0200 diff --git a/debian/control b/debian/control index 6ccfe7f..e9a6cde 100644 --- a/debian/control +++ b/debian/control @@ -25,8 +25,8 @@ Package: xserver-xorg Architecture: any Depends: xserver-xorg-core (>= 2:1.9.0.901), - xserver-xorg-video-all | xserver-xorg-video-8, - xserver-xorg-input-all | xserver-xorg-input-11, + xserver-xorg-video-all | xorg-driver-video, + xserver-xorg-input-all | xorg-driver-input, xserver-xorg-input-evdev [linux-any], hal (>= 0.5.12~git20090406) [kfreebsd-any], ${shlibs:Depends}, commit dc016ced615a0a387a31ad1369e92e22b0df663a Author: Julien Cristau <[email protected]> Date: Wed Oct 13 15:33:06 2010 +0200 Drop libGL and libGLU transitional packages Drop xlibmesa-gl, xlibmesa-gl-dev, xlibmesa-glu, libglu1-xorg and libglu1-xorg-dev. These were already transitional packages in etch, so it's high time people updated their dependencies. diff --git a/debian/changelog b/debian/changelog index ac4ef53..6ef12f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ xorg (1:7.6~1) UNRELEASED; urgency=low * Bump version number, we're getting close to X11R7.6. * Drop obsolete Breaks/Replaces/Conflicts from x11-common and xserver-xorg. + * Drop xlibmesa-gl, xlibmesa-gl-dev, xlibmesa-glu, libglu1-xorg and + libglu1-xorg-dev. These were already transitional packages in etch, so + it's high time people updated their dependencies. -- Julien Cristau <[email protected]> Wed, 13 Oct 2010 15:29:12 +0200 diff --git a/debian/control b/debian/control index e18afd2..6ccfe7f 100644 --- a/debian/control +++ b/debian/control @@ -170,56 +170,6 @@ Description: the X.Org X Window System development libraries Note that this is a convenience package for users and is not a package for Debian developers to have their package depend on. -Package: xlibmesa-gl -Section: libs -Architecture: all -Depends: - libgl1-mesa-glx, - ${misc:Depends}, -Description: transitional package for Debian etch - This package is provided to smooth upgrades from Debian 3.1 ("sarge") to - Debian etch. It may be safely removed from your system. - -Package: xlibmesa-gl-dev -Section: libdevel -Architecture: all -Depends: - libgl1-mesa-dev, - ${misc:Depends}, -Description: transitional package for Debian etch - This package is provided to smooth upgrades from Debian 3.1 ("sarge") to - Debian etch. It may be safely removed from your system. - -Package: xlibmesa-glu -Section: libdevel -Architecture: all -Depends: - libglu1-mesa, - ${misc:Depends}, -Description: transitional package for Debian etch - This package is provided to smooth upgrades from Debian 3.1 ("sarge") to - Debian etch. It may be safely removed from your system. - -Package: libglu1-xorg -Section: libs -Architecture: all -Depends: - libglu1-mesa, - ${misc:Depends}, -Description: transitional package for Debian etch - This package is provided to smooth upgrades from Debian 3.1 ("sarge") to - Debian etch. It may be safely removed from your system. - -Package: libglu1-xorg-dev -Section: libdevel -Architecture: all -Depends: - libglu1-mesa-dev, - ${misc:Depends}, -Description: transitional package for Debian etch - This package is provided to smooth upgrades from Debian 3.1 ("sarge") to - Debian etch. It may be safely removed from your system. - Package: xbase-clients Section: x11 Architecture: all commit 3839548af3ef8ad1de7a340421c85f55cc137279 Author: Julien Cristau <[email protected]> Date: Wed Oct 13 15:31:38 2010 +0200 Drop obsolete Breaks/Replaces/Conflicts from x11-common and xserver-xorg. diff --git a/debian/changelog b/debian/changelog index ce4a4fb..ac4ef53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xorg (1:7.6~1) UNRELEASED; urgency=low * Bump version number, we're getting close to X11R7.6. + * Drop obsolete Breaks/Replaces/Conflicts from x11-common and xserver-xorg. -- Julien Cristau <[email protected]> Wed, 13 Oct 2010 15:29:12 +0200 diff --git a/debian/control b/debian/control index 92e6d55..e18afd2 100644 --- a/debian/control +++ b/debian/control @@ -9,8 +9,6 @@ Build-Depends: po-debconf, debhelper (>= 7) Package: x11-common Architecture: all Depends: ${misc:Depends}, lsb-base (>= 1.3-9ubuntu2) -Breaks: gdm (<< 2.20.7-5) -Replaces: xfree86-common, xorg-common, xserver-common (<< 7), x-common Description: X Window System (X.Org) infrastructure x11-common contains the filesystem infrastructure required for further installation of the X Window System in any configuration; it does not @@ -25,8 +23,6 @@ Description: X Window System (X.Org) infrastructure Package: xserver-xorg Architecture: any -Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common (<< 7), x11-common (<< 1:7.3+11) -Replaces: xserver-common (<< 7), x11-common (<< 1:7.3+11) Depends: xserver-xorg-core (>= 2:1.9.0.901), xserver-xorg-video-all | xserver-xorg-video-8, commit 99f584cf2a4f547dffdcd42775a9b81aef3fb2d9 Author: Julien Cristau <[email protected]> Date: Wed Oct 13 15:29:52 2010 +0200 Bump version number, we're getting close to X11R7.6. diff --git a/debian/changelog b/debian/changelog index 68f8ccb..ce4a4fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg (1:7.6~1) UNRELEASED; urgency=low + + * Bump version number, we're getting close to X11R7.6. + + -- Julien Cristau <[email protected]> Wed, 13 Oct 2010 15:29:12 +0200 + xorg (1:7.5+9) experimental; urgency=low * Depend on Xserver 1.9.1 rc1. Bump input and video driver ABI. commit 81fc271788605b52e85c2d11635a0371fb44605e Author: Cyril Brulebois <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
