debian/README.source | 2 +-
debian/changelog | 16 ++++++++++++++++
debian/control | 8 +++-----
debian/rules | 14 +++++++-------
debian/xsfbs/xsfbs.mk | 35 ++++++++++++++++++++++-------------
5 files changed, 49 insertions(+), 26 deletions(-)
New commits:
commit fe4acaa8ab2a6aebd21d35a61344346589654431
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Oct 16 20:44:51 2010 +0200
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index c29d9c6..2ac69b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-s3 (1:0.6.3-3) UNRELEASED; urgency=low
+xserver-xorg-video-s3 (1:0.6.3-3) experimental; urgency=low
* Build against Xserver 1.9.1 rc1.
* Add myself to Uploaders.
- -- Cyril Brulebois <k...@debian.org> Sat, 16 Oct 2010 20:44:28 +0200
+ -- Cyril Brulebois <k...@debian.org> Sat, 16 Oct 2010 20:44:50 +0200
xserver-xorg-video-s3 (1:0.6.3-2) unstable; urgency=medium
commit d4c7734e87a5f6a265bd2b1ac4afc2d982d0cbd5
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Oct 16 20:44:41 2010 +0200
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 1abb5d2..c29d9c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-s3 (1:0.6.3-3) UNRELEASED; urgency=low
* Build against Xserver 1.9.1 rc1.
+ * Add myself to Uploaders.
-- Cyril Brulebois <k...@debian.org> Sat, 16 Oct 2010 20:44:28 +0200
diff --git a/debian/control b/debian/control
index cf02213..c39459d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-s3
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin
<bgog...@debian.org>
+Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin
<bgog...@debian.org>, Cyril Brulebois <k...@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
commit 1a109af84c56b082682bde6594dfeb993a4660f8
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Oct 16 20:44:31 2010 +0200
Build against Xserver 1.9.1 rc1.
diff --git a/debian/changelog b/debian/changelog
index 60b0e4d..1abb5d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-s3 (1:0.6.3-3) UNRELEASED; urgency=low
+
+ * Build against Xserver 1.9.1 rc1.
+
+ -- Cyril Brulebois <k...@debian.org> Sat, 16 Oct 2010 20:44:28 +0200
+
xserver-xorg-video-s3 (1:0.6.3-2) unstable; urgency=medium
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
diff --git a/debian/control b/debian/control
index 09d570d..cf02213 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin
<bgog...@debian.org
Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
- xserver-xorg-dev (>= 2:1.7.6.901),
+ xserver-xorg-dev (>= 2:1.9.0.901),
x11proto-video-dev,
x11proto-core-dev,
x11proto-fonts-dev,
commit 69084124b12e1ff9050e0486d9be4550257ffd68
Author: Julien Cristau <jcris...@debian.org>
Date: Sat May 15 16:18:58 2010 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 9442b3f..60b0e4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-s3 (1:0.6.3-2) UNRELEASED; urgency=low
+xserver-xorg-video-s3 (1:0.6.3-2) unstable; urgency=medium
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
* Update xsfbs, use new ${xviddriver:Depends} substvar.
- -- Julien Cristau <jcris...@debian.org> Sat, 23 Jan 2010 02:26:14 +0100
+ -- Julien Cristau <jcris...@debian.org> Sat, 15 May 2010 16:18:28 +0200
xserver-xorg-video-s3 (1:0.6.3-1) experimental; urgency=low
commit c48288b3082d8555625641f21c12cedf85c61c3b
Author: Julien Cristau <jcris...@debian.org>
Date: Sat May 15 16:18:24 2010 +0200
Update xsfbs, use new ${xviddriver:Depends} substvar.
diff --git a/debian/changelog b/debian/changelog
index 10c9277..9442b3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-s3 (1:0.6.3-2) UNRELEASED; urgency=low
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
+ * Update xsfbs, use new ${xviddriver:Depends} substvar.
-- Julien Cristau <jcris...@debian.org> Sat, 23 Jan 2010 02:26:14 +0100
diff --git a/debian/control b/debian/control
index 56332ad..09d570d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin
<bgog...@debian.org
Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
- xserver-xorg-dev (>= 2:1.7),
+ xserver-xorg-dev (>= 2:1.7.6.901),
x11proto-video-dev,
x11proto-core-dev,
x11proto-fonts-dev,
@@ -23,7 +23,7 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-s3.git
Package: xserver-xorg-video-s3
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
Provides: ${xviddriver:Provides}
Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-s3
Conflicts: xserver-xorg-driver-s3
commit 43a6ceefc580a71a2e84bd1a07ae6efd128fe381
Author: Mikhail Gusarov <dotted...@debian.org>
Date: Fri May 7 18:58:58 2010 +0700
Remove duplicate xorg.fd.o URL and confusing mailing list URL from
debian/control
diff --git a/debian/control b/debian/control
index b7ce6bc..56332ad 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,5 @@ Description: X.Org X server -- legacy S3 display driver
.
More information about X.Org can be found at:
<URL:http://www.X.org>
- <URL:http://xorg.freedesktop.org>
- <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
.
This package is built from the X.org xf86-video-s3 driver module.
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.
commit 23a96878307b7349d690871ea8a832d3ea937508
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jan 23 01:46:35 2010 +0100
Remove myself from Uploaders
diff --git a/debian/changelog b/debian/changelog
index d923944..41c4815 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ xserver-xorg-video-s3 (1:0.6.3-1) 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
-- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 05 Dec 2009 01:49:10 +0200
diff --git a/debian/control b/debian/control
index 6817091..b7ce6bc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-s3
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusi...@debian.org>, Julien Cristau
<jcris...@debian.org>, Brice Goglin <bgog...@debian.org>
+Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin
<bgog...@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
commit 9563e3bfcaa33acb72ce6976d8eaba0084f7b3c4
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jan 16 16:48:48 2010 +0000
Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good
reason. Thanks, Colin Watson!
diff --git a/debian/changelog b/debian/changelog
index f70a375..d923944 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ xserver-xorg-video-s3 (1:0.6.3-1) UNRELEASED; urgency=low
* Bump Standards-Version to 3.8.3.
* Build against Xserver 1.7.
+ [ Julien Cristau ]
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+ good reason. Thanks, Colin Watson!
+
-- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 05 Dec 2009 01:49:10 +0200
xserver-xorg-video-s3 (1:0.6.2-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index dac14a1..f991bfd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,17 +35,17 @@ confflags += --disable-static
configure:
autoreconf -vfi
-obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
- mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
- cd obj-$(DEB_BUILD_GNU_TYPE) && \
+build/config.status: configure
+ mkdir -p build
+ cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
CFLAGS="$(CFLAGS)"
build: build-stamp
-build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
+build-stamp: build/config.status
dh_testdir
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd build && $(MAKE)
>$@
clean:
@@ -57,7 +57,7 @@ clean:
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
- rm -rf obj-*
+ rm -rf build
rm -f $$(find -name Makefile.in)
rm -f aclocal.m4 config.guess config.h.in config.sub configure
rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
@@ -70,7 +70,7 @@ install: build
dh_clean -k
dh_installdirs
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp
install
+ cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Build architecture-dependent files here.
binary-arch: build install serverabi
--
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/e1p7bnx-0003sn...@alioth.debian.org
