debian/README.source | 2 +-
debian/changelog | 11 +++++++++--
debian/control | 5 +----
debian/xsfbs/xsfbs.mk | 35 ++++++++++++++++++++++-------------
4 files changed, 33 insertions(+), 20 deletions(-)
New commits:
commit 3dbea9f1a0169360fa85880a5a19165be2f75041
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jul 11 14:41:25 2010 +0100
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index ee1f56f..ed05852 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xutils-dev (1:7.5+4) UNRELEASED; urgency=low
+xutils-dev (1:7.5+4) unstable; urgency=low
[ Robert Hooker ]
* util-macros 1.10.0.
@@ -9,7 +9,7 @@ xutils-dev (1:7.5+4) UNRELEASED; urgency=low
and xmkmf. These packages are only in old ubuntu releases, and upgrades
from dapper to maverick are not supported AFAIK.
- -- Robert Hooker <sarv...@ubuntu.com> Sat, 03 Jul 2010 18:00:29 -0400
+ -- Julien Cristau <jcris...@debian.org> Sun, 11 Jul 2010 14:41:22 +0100
xutils-dev (1:7.5+3) unstable; urgency=low
commit 9e059e5799dd1448e8ae09eb3ce64966dcf84d66
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jul 11 14:39:28 2010 +0100
Drop obsolete Conflicts/Replaces/Provides
imake, makedepend, xorg-build-macros and xmkmf are only in old ubuntu
releases, and upgrades from dapper to maverick are not supported AFAIK.
diff --git a/debian/changelog b/debian/changelog
index fc79e65..ee1f56f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ xutils-dev (1:7.5+4) UNRELEASED; urgency=low
[ Julien Cristau ]
* Bump Standards-Version to 3.9.0.
+ * Drop Conflicts/Replaces/Provides on imake, makedepend, xorg-build-macros
+ and xmkmf. These packages are only in old ubuntu releases, and upgrades
+ from dapper to maverick are not supported AFAIK.
-- Robert Hooker <sarv...@ubuntu.com> Sat, 03 Jul 2010 18:00:29 -0400
diff --git a/debian/control b/debian/control
index b99d13e..521dc0d 100644
--- a/debian/control
+++ b/debian/control
@@ -11,9 +11,6 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/app/xutils-dev.git
Package: xutils-dev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
-Conflicts: imake (<= 1:1.0.1-1), makedepend (<= 1:1.0.0-1), xorg-build-macros
(<= 1.0.1-1), xmkmf (<= 0.99.0-6)
-Replaces: imake (<= 1:1.0.1-1), makedepend (<= 1:1.0.0-1), xorg-build-macros
(<= 1.0.1-1), xmkmf (<= 0.99.0-6)
-Provides: imake, makedepend, xorg-build-macros, xmkmf
Description: X Window System utility programs for development
xutils-dev provides a set of utility programs shipped with the X Window System
that do not require the X libraries; many of these programs are useful
commit b8ce252483b11c2d79bfd4cc88bdfcec9e9d0ed0
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jul 11 14:35:56 2010 +0100
Bump Standards-Version to 3.9.0.
diff --git a/debian/changelog b/debian/changelog
index 24276d6..fc79e65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
xutils-dev (1:7.5+4) UNRELEASED; urgency=low
+ [ Robert Hooker ]
* util-macros 1.10.0.
+ [ Julien Cristau ]
+ * Bump Standards-Version to 3.9.0.
+
-- Robert Hooker <sarv...@ubuntu.com> Sat, 03 Jul 2010 18:00:29 -0400
xutils-dev (1:7.5+3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 2ba4a97..b99d13e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusi...@debian.org>, Andres Salomon
<dilin...@debian.org>, Brice Goglin <bgog...@debian.org>
Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, x11proto-core-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.9.0
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xutils-dev
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xutils-dev.git
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/e1oxwob-00046y...@alioth.debian.org
