xserver-xorg-input-mouse: Changes to 'debian-experimental'
debian/changelog | 6 ++++--
debian/control | 7 +++----
debian/xsfbs/xsfbs.mk | 19 ++++++++++++-------
3 files changed, 19 insertions(+), 13 deletions(-)
New commits:
commit b9b6aec16bb91fc523c3268a720907171bd6195f
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 16 19:28:14 2007 +0200
Drop obsolete CVS info from the description, add XS-Vcs-*.
diff --git a/debian/changelog b/debian/changelog
index 290d3e3..77eef20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-mouse (1:1.1.2-1) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.1.2-1) experimental; urgency=low
* New upstream release (X11R7.2).
* Add link to xserver-xorg-core bug script, so that bugreports contain
@@ -7,8 +7,9 @@ xserver-xorg-input-mouse (1:1.1.2-1) UNRELEASED; urgency=low
versions don't have the bug script.
* Generate the dependency on xserver-xorg-core automatically.
* Remove Fabio from Uploaders, with his permission.
+ * Drop obsolete CVS info from the description, add XS-Vcs-*.
- -- Julien Cristau <jcristau@debian.org> Mon, 16 Apr 2007 19:22:03 +0200
+ -- Julien Cristau <jcristau@debian.org> Mon, 16 Apr 2007 19:27:46 +0200
xserver-xorg-input-mouse (1:1.1.1-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index e6ccd4a..590015f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,8 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Drew Parsons <dparsons@debian.org>
Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.2.0-3), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, quilt
Standards-Version: 3.7.2
+XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-mouse
+XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-mouse.git
Package: xserver-xorg-input-mouse
Architecture: any
@@ -17,6 +19,3 @@ Description: X.Org X server -- mouse input driver
More information about X.Org can be found at:
<URL:http://xorg.freedesktop.org>
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
- .
- This module can be found as the module 'driver/xf86-input-mouse' at
- :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
commit 8e8f9e0dd038c9876425dd4a03e0a6a7dfcfcd49
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 16 19:22:29 2007 +0200
Remove Fabio from Uploaders, with his permission.
diff --git a/debian/changelog b/debian/changelog
index 5acc219..290d3e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ xserver-xorg-input-mouse (1:1.1.2-1) UNRELEASED; urgency=low
* Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous
versions don't have the bug script.
* Generate the dependency on xserver-xorg-core automatically.
+ * Remove Fabio from Uploaders, with his permission.
- -- Julien Cristau <jcristau@debian.org> Sun, 18 Feb 2007 19:14:59 +0100
+ -- Julien Cristau <jcristau@debian.org> Mon, 16 Apr 2007 19:22:03 +0200
xserver-xorg-input-mouse (1:1.1.1-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 32c6783..e6ccd4a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-input-mouse
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>, Drew Parsons <dparsons@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Drew Parsons <dparsons@debian.org>
Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.2.0-3), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, quilt
Standards-Version: 3.7.2
commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb
Author: Branden Robinson <branden@sisyphus.(none)>
Date: Thu Apr 12 23:18:32 2007 -0400
Test for existence of debian/patches directory before creating a symlink to it.
This prevents packages that apply no patches from ending up with a broken
symlink in them.
Remove SVN keyword.
Update copyright notice.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index d88c6db..63dde45 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -1,11 +1,10 @@
#!/usr/bin/make -f
-# $Id$
-# Debian rules file for xorg-x11 source package
+# Debian X Strike Force Build System (XSFBS): Make portion
# Copyright 1996 Stephen Early
# Copyright 1997 Mark Eichin
-# Copyright 1998-2005 Branden Robinson
+# Copyright 1998-2005, 2007 Branden Robinson
# Copyright 2005 David Nusinow
#
# Licensed under the GNU General Public License, version 2. See the file
@@ -127,7 +126,7 @@ $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
- if [ ! -e patches ]; then \
+ if [ -e debian/patches ] && [ ! -e patches ]; then \
ln -s debian/patches patches; \
fi; \
>$@
commit 72811b4cede7275a35d36b44bcb5f431a8aa0133
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 2 20:28:15 2007 +0100
Fix copy/paste typo in the input driver provides.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 0343aec..d88c6db 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -359,7 +359,7 @@ 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-video-$(INPUTABI)
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
commit 4a943db2564c4f573ce2f5f676a841267e961f16
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Mar 1 22:06:04 2007 -0500
Fix one missed bit from the serverabiver -> serverminver rename
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index cfc5496..0343aec 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -366,7 +366,7 @@ endif
.PHONY: serverabi
serverabi:
-ifeq ($(SERVERABI),)
+ifeq ($(SERVERMINVERS),)
@echo error: xserver-xorg-dev needs to be installed
@exit 1
else
commit 1344bb9deda5ba54215d0ec5b164706999236b0b
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Feb 28 23:08:17 2007 -0500
Fix typo that prevented the input abi versioning from working.
Good catch Julien
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5e8cf41..cfc5496 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -356,7 +356,7 @@ debian/shlibs.local:
SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
-INPUTABI = $(shell cat /usr/share/xserver-xorg/driverabiver 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-video-$(INPUTABI)
commit a0c9602f38e9d47d7a76b7b345e7e8bbb29b752f
Author: David Nusinow <dnusinow@debian.org>
Date: Tue Feb 27 21:50:20 2007 -0500
Add support for X server input ABI versioning
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index d54ffd3..5e8cf41 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -355,9 +355,11 @@ debian/shlibs.local:
cat debian/*.shlibs >$@
SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
-SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2>/dev/null)
+VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
+INPUTABI = $(shell cat /usr/share/xserver-xorg/driverabiver 2>/dev/null)
SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
-DRIVER_PROVIDES = xserver-xorg-video-$(SERVERABI)
+VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
+INPDRIVER_PROVIDES = xserver-xorg-video-$(INPUTABI)
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
@@ -369,7 +371,8 @@ ifeq ($(SERVERABI),)
@exit 1
else
echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
- echo "xviddriver:Provides=$(DRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
+ echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
+ echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
endif
include debian/xsfbs/xsfbs-autoreconf.mk
commit 00fc799ec3107c0c29286b75e780bef82c1fa137
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Feb 21 22:47:30 2007 -0500
Fix name of serverminver
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index ae767b1..d54ffd3 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -354,7 +354,7 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
debian/shlibs.local:
cat debian/*.shlibs >$@
-SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminvers 2>/dev/null)
+SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2>/dev/null)
SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
DRIVER_PROVIDES = xserver-xorg-video-$(SERVERABI)
commit dacefd5a6bb9f786c78f35358273e3214c7492e9
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Feb 21 21:37:52 2007 -0500
Update serverabi generation to also account for driver Provides
* Have the drivers use the file serverminver instead of serverabiver in order
to generate the versioned dependency on the server. This is clearer
naming.
* Use serverabiver to actually store the server's video ABI version. This
is used to generate the Provides: line for drivers so the server can
depend on them properly. This goes in to the substvar
xviddriver:Provides.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index dbb2872..ae767b1 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -354,8 +354,10 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
debian/shlibs.local:
cat debian/*.shlibs >$@
+SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminvers 2>/dev/null)
SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2>/dev/null)
-SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERABI))
+SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
+DRIVER_PROVIDES = xserver-xorg-video-$(SERVERABI)
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
@@ -367,6 +369,7 @@ ifeq ($(SERVERABI),)
@exit 1
else
echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
+ echo "xviddriver:Provides=$(DRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
endif
include debian/xsfbs/xsfbs-autoreconf.mk
Reply to: