debian/README.source | 2 +- debian/changelog | 13 +++++++++++++ debian/control | 9 ++++++--- debian/libxinerama-dev.install | 6 +++--- debian/libxinerama1-udeb.install | 2 +- debian/libxinerama1.install | 2 +- debian/rules | 2 ++ debian/xsfbs/xsfbs.mk | 35 ++++++++++++++++++++++------------- 8 files changed, 49 insertions(+), 22 deletions(-)
New commits: commit a93fbb96c86bbd3f855f5322c082f103ed9764b9 Author: Julien Cristau <[email protected]> Date: Sat Jun 11 16:27:10 2011 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 716ef56..6643b30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,6 @@ -libxinerama (2:1.1.1-2) UNRELEASED; urgency=low +libxinerama (2:1.1.1-2) unstable; urgency=low + + * Team upload. [ Steve Langasek ] * Build for multiarch. @@ -7,7 +9,7 @@ libxinerama (2:1.1.1-2) UNRELEASED; urgency=low * Remove David Nusinow from Uploaders. * Bump Standards-Version to 3.9.2. - -- Julien Cristau <[email protected]> Sat, 11 Jun 2011 16:25:13 +0200 + -- Julien Cristau <[email protected]> Sat, 11 Jun 2011 16:26:59 +0200 libxinerama (2:1.1.1-1) unstable; urgency=low commit c4121be3b62f3ba03eaf3696463b3ec56c07ce94 Author: Julien Cristau <[email protected]> Date: Sat Jun 11 16:26:58 2011 +0200 Bump Standards-Version to 3.9.2. diff --git a/debian/changelog b/debian/changelog index 00ad2a7..716ef56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ libxinerama (2:1.1.1-2) UNRELEASED; urgency=low [ Julien Cristau ] * Remove David Nusinow from Uploaders. + * Bump Standards-Version to 3.9.2. -- Julien Cristau <[email protected]> Sat, 11 Jun 2011 16:25:13 +0200 diff --git a/debian/control b/debian/control index faa5193..17c3fb9 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: automake, libtool, xutils-dev (>= 1:7.5+4), -Standards-Version: 3.8.4 +Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxinerama Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxinerama.git commit 6d2782f83abe19b00a0f7f55b13a4b17df23e4ca Author: Julien Cristau <[email protected]> Date: Sat Jun 11 16:26:40 2011 +0200 Remove David Nusinow from Uploaders. diff --git a/debian/changelog b/debian/changelog index e243900..00ad2a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ libxinerama (2:1.1.1-2) UNRELEASED; urgency=low [ Steve Langasek ] * Build for multiarch. + [ Julien Cristau ] + * Remove David Nusinow from Uploaders. + -- Julien Cristau <[email protected]> Sat, 11 Jun 2011 16:25:13 +0200 libxinerama (2:1.1.1-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 2a3c1ba..faa5193 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: libxinerama Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> -Uploaders: David Nusinow <[email protected]>, Cyril Brulebois <[email protected]> +Uploaders: Cyril Brulebois <[email protected]> Build-Depends: debhelper (>= 8.1.3), libx11-dev (>= 2:1.3.3-2), commit 3793d7431365b830cf2ff63ff6fd95af243eaebc Author: Julien Cristau <[email protected]> Date: Sat Jun 11 16:25:36 2011 +0200 Add changelog entry for multiarch diff --git a/debian/changelog b/debian/changelog index df776ce..e243900 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libxinerama (2:1.1.1-2) UNRELEASED; urgency=low + + [ Steve Langasek ] + * Build for multiarch. + + -- Julien Cristau <[email protected]> Sat, 11 Jun 2011 16:25:13 +0200 + libxinerama (2:1.1.1-1) unstable; urgency=low * New upstream release. commit a99048f70568f2b234a9c08422f34ef4c345f2f0 Author: Steve Langasek <[email protected]> Date: Wed Mar 23 23:07:11 2011 -0700 build for multiarch diff --git a/debian/control b/debian/control index 1cd36c4..2a3c1ba 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian X Strike Force <[email protected]> Uploaders: David Nusinow <[email protected]>, Cyril Brulebois <[email protected]> Build-Depends: - debhelper (>= 5.0.0), + debhelper (>= 8.1.3), libx11-dev (>= 2:1.3.3-2), libxext-dev (>= 2:1.1.1-3), x11proto-xinerama-dev (>= 1.2), @@ -20,6 +20,8 @@ Package: libxinerama1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Description: X11 Xinerama extension library libXinerama provides an X Window System client interface to the XINERAMA extension to the X protocol. @@ -47,6 +49,7 @@ Section: debug Priority: extra Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libxinerama1 (= ${binary:Version}) +Multi-Arch: same Description: X11 Xinerama extension library (debug package) libXinerama provides an X Window System client interface to the XINERAMA extension to the X protocol. diff --git a/debian/libxinerama-dev.install b/debian/libxinerama-dev.install index c020c30..01d06be 100644 --- a/debian/libxinerama-dev.install +++ b/debian/libxinerama-dev.install @@ -1,5 +1,5 @@ -usr/lib/libXinerama.a -usr/lib/libXinerama.so -usr/lib/pkgconfig/xinerama.pc +usr/lib/*/libXinerama.a +usr/lib/*/libXinerama.so +usr/lib/*/pkgconfig/xinerama.pc usr/share/man/man3/* usr/include/X11/extensions/* diff --git a/debian/libxinerama1-udeb.install b/debian/libxinerama1-udeb.install index eba365f..29fc5a8 100644 --- a/debian/libxinerama1-udeb.install +++ b/debian/libxinerama1-udeb.install @@ -1 +1 @@ -usr/lib/libXinerama.so.1* +usr/lib/*/libXinerama.so.1* usr/lib diff --git a/debian/libxinerama1.install b/debian/libxinerama1.install index eba365f..b828401 100644 --- a/debian/libxinerama1.install +++ b/debian/libxinerama1.install @@ -1 +1 @@ -usr/lib/libXinerama.so.1* +usr/lib/*/libXinerama.so.1* diff --git a/debian/rules b/debian/rules index 5e87046..8eac788 100755 --- a/debian/rules +++ b/debian/rules @@ -23,6 +23,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) MAKEFLAGS += -j$(NUMJOBS) 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-stamp: mkdir -p build cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --infodir=\$${prefix}/share/info $(confflags) \ CFLAGS="$(CFLAGS)" cd build && $(MAKE) 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]
