libxrandr: Changes to 'debian-unstable'
debian/README.source | 2 +-
debian/changelog | 13 +++++++++++++
debian/control | 9 ++++++---
debian/libxrandr-dev.install | 6 +++---
debian/libxrandr2.install | 2 +-
debian/rules | 2 ++
debian/xsfbs/xsfbs.mk | 35 ++++++++++++++++++++++-------------
7 files changed, 48 insertions(+), 21 deletions(-)
New commits:
commit 8403952b17edfe232c01e6b5620c0b79ff1afaab
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 23:13:01 2011 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 4732dec..d332252 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-libxrandr (2:1.3.1-2) UNRELEASED; urgency=low
+libxrandr (2:1.3.1-2) unstable; urgency=low
+
+ * Team upload.
[ Steve Langasek ]
* Build for multiarch.
@@ -7,7 +9,7 @@ libxrandr (2:1.3.1-2) UNRELEASED; urgency=low
* Remove David Nusinow from Uploaders.
* Bump Standards-Version to 3.9.2.
- -- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 23:02:03 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 23:12:54 +0200
libxrandr (2:1.3.1-1) unstable; urgency=low
commit aa10f3d1c7496eecadca5412e5a14c2312ab9346
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 23:12:53 2011 +0200
Bump Standards-Version to 3.9.2.
diff --git a/debian/changelog b/debian/changelog
index 3d65e51..4732dec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libxrandr (2:1.3.1-2) UNRELEASED; urgency=low
[ Julien Cristau ]
* Remove David Nusinow from Uploaders.
+ * Bump Standards-Version to 3.9.2.
-- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 23:02:03 +0200
diff --git a/debian/control b/debian/control
index a0f0d54..4957447 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
automake,
libtool,
xutils-dev (>= 1:7.5+4),
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxrandr
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxrandr.git
commit 18ca81afacf7a98d3ea135704f411a69669a3347
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 23:05:21 2011 +0200
Remove David Nusinow from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 1bb4f2f..3d65e51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ libxrandr (2:1.3.1-2) UNRELEASED; urgency=low
[ Steve Langasek ]
* Build for multiarch.
+ [ Julien Cristau ]
+ * Remove David Nusinow from Uploaders.
+
-- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 23:02:03 +0200
libxrandr (2:1.3.1-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 15f86f4..a0f0d54 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libxrandr
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Cyril Brulebois <kibi@debian.org>
+Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 8.1.3),
libx11-dev (>= 1:0.99.2),
commit 05e55e33653ff8da598ffbabb6705e10ef6e39b6
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 23:02:16 2011 +0200
Add changelog entry for multiarch
diff --git a/debian/changelog b/debian/changelog
index eb8e6ff..1bb4f2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxrandr (2:1.3.1-2) UNRELEASED; urgency=low
+
+ [ Steve Langasek ]
+ * Build for multiarch.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 23:02:03 +0200
+
libxrandr (2:1.3.1-1) unstable; urgency=low
* New upstream release.
commit 406a32c9a29a5d9918d7637ad2c85bde0b9fbb25
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Wed Mar 23 23:14:17 2011 -0700
build for multiarch
diff --git a/debian/control b/debian/control
index 02f9750..15f86f4 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 <dnusinow@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
- debhelper (>= 5.0.0),
+ debhelper (>= 8.1.3),
libx11-dev (>= 1:0.99.2),
libxext-dev (>= 1:0.99.1),
x11proto-randr-dev (>= 1.3),
@@ -23,6 +23,8 @@ Package: libxrandr2
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: X11 RandR extension library
libXrandr provides an X Window System client interface to the RandR
extension to the X protocol.
@@ -41,6 +43,7 @@ Section: debug
Priority: extra
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libxrandr2 (= ${binary:Version})
+Multi-Arch: same
Description: X11 RandR extension library (debug package)
libXrandr provides an X Window System client interface to the RandR
extension to the X protocol.
diff --git a/debian/libxrandr-dev.install b/debian/libxrandr-dev.install
index 21cf111..c073181 100644
--- a/debian/libxrandr-dev.install
+++ b/debian/libxrandr-dev.install
@@ -1,5 +1,5 @@
usr/include/X11/*
-usr/lib/libXrandr.a
-usr/lib/libXrandr.so
-usr/lib/pkgconfig/xrandr.pc
+usr/lib/*/libXrandr.a
+usr/lib/*/libXrandr.so
+usr/lib/*/pkgconfig/xrandr.pc
usr/share/man/man3/*
diff --git a/debian/libxrandr2.install b/debian/libxrandr2.install
index 2a1b2a9..9155a09 100644
--- a/debian/libxrandr2.install
+++ b/debian/libxrandr2.install
@@ -1 +1 @@
-usr/lib/libXrandr.so.2*
+usr/lib/*/libXrandr.so.2*
diff --git a/debian/rules b/debian/rules
index eda03d3..8945372 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
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)
@@ -40,6 +41,7 @@ build/config.status: configure
test -d build || mkdir build
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--infodir=\$${prefix}/share/info $(confflags) \
CFLAGS="$(CFLAGS)"
commit 81fc271788605b52e85c2d11635a0371fb44605e
Author: Cyril Brulebois <kibi@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 <jcristau@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 <jcristau@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 <kibi@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.
Reply to: