xserver-xorg-video-fbdev: Changes to 'debian-experimental'
debian/changelog | 25 +++++++++++++++++++++++++
debian/control | 15 +++++++++------
debian/copyright | 3 +++
debian/patches/01_fbdev_man.diff | 15 +++++++++++++++
debian/patches/series | 1 +
debian/rules | 6 +++---
debian/xsfbs/xsfbs.mk | 9 ++++-----
man/fbdev.man | 2 +-
8 files changed, 61 insertions(+), 15 deletions(-)
New commits:
commit c9f0e2fb7665ea3f1228125764b8474e1879ab28
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Sep 12 10:56:14 2007 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index ff95717..cd31a3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-fbdev (1:0.3.1-3) UNRELEASED; urgency=low
+xserver-xorg-video-fbdev (1:0.3.1-3) experimental; urgency=low
[ Julien Cristau ]
* Add patch to fix minor warnings from man in fbdev(4).
@@ -21,7 +21,7 @@ xserver-xorg-video-fbdev (1:0.3.1-3) UNRELEASED; urgency=low
* Pull upstream up to commit b17f9256d5958fdd45dd5fe0ce10663ef9634900.
+ Fixes non-ascii character in the manpage, closes: #441829.
- -- Brice Goglin <bgoglin@debian.org> Wed, 12 Sep 2007 10:11:44 +0200
+ -- Brice Goglin <bgoglin@debian.org> Wed, 12 Sep 2007 10:56:04 +0200
xserver-xorg-video-fbdev (1:0.3.1-2) experimental; urgency=low
commit fc15da487f8334ae4a7cb1d1c5016257a5c8aaf8
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Sep 12 10:52:39 2007 +0200
Pull upstream up to commit b17f9256d5958fdd45dd5fe0ce10663ef9634900
diff --git a/debian/changelog b/debian/changelog
index 1de87bf..ff95717 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ xserver-xorg-video-fbdev (1:0.3.1-3) UNRELEASED; urgency=low
permission.
* Add upstream URL to debian/copyright.
* Bump Standards-Version to 3.7.2.2, no change needed.
+ * Pull upstream up to commit b17f9256d5958fdd45dd5fe0ce10663ef9634900.
+ + Fixes non-ascii character in the manpage, closes: #441829.
-- Brice Goglin <bgoglin@debian.org> Wed, 12 Sep 2007 10:11:44 +0200
diff --git a/debian/patches/01_fbdev_man.diff b/debian/patches/01_fbdev_man.diff
index a976055..c072da8 100644
--- a/debian/patches/01_fbdev_man.diff
+++ b/debian/patches/01_fbdev_man.diff
@@ -13,9 +13,3 @@ Index: xserver-xorg-video-fbdev/man/fbdev.man
to figure out the correct values.
.PP
The following driver
-@@ -60,4 +60,4 @@
- __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__),
- X(__miscmansuffix__), fbdevhw(__drivermansuffix__)
- .SH AUTHORS
--Authors include: Gerd Knorr, Michel Dänzer, Geert Uytterhoeven
-+Authors include: Gerd Knorr, Michel D\(:anzer, Geert Uytterhoeven
commit 57501169ce6dc1465d11412564bd710116ee9515
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Sep 12 10:48:32 2007 +0200
Build against xserver 1.4 and fix various minor things
diff --git a/debian/changelog b/debian/changelog
index ea8990b..1de87bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,15 +7,19 @@ xserver-xorg-video-fbdev (1:0.3.1-3) UNRELEASED; urgency=low
* Replaces/Conflicts: xserver-xorg-driver-fbdev.
[ Brice Goglin ]
+ * Build against xserver 1.4.
* Install the upstream changelog.
* Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
(needed to let xsfbs get access to serverminver).
* Add XS-Vcs-*.
* Add a link to www.X.org and a reference to the xf86-video-fbdev
module in the long description.
- * Remove Fabio from uploaders with his permission. He's always welcome back.
+ * Add myself to Uploaders, and remove Branden and Fabio with their
+ permission.
+ * Add upstream URL to debian/copyright.
+ * Bump Standards-Version to 3.7.2.2, no change needed.
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Sat, 28 Apr 2007 17:12:35 +0200
+ -- Brice Goglin <bgoglin@debian.org> Wed, 12 Sep 2007 10:11:44 +0200
xserver-xorg-video-fbdev (1:0.3.1-2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 7255d07..93ea9bb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: xserver-xorg-video-fbdev
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>
-Build-Depends: debhelper (>= 4.0.0), quilt, pkg-config, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-video-dev
-Standards-Version: 3.6.1
+Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>
+Build-Depends: debhelper (>= 4.0.0), quilt, pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-video-dev
+Standards-Version: 3.7.2.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-fbdev
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-fbdev.git
diff --git a/debian/copyright b/debian/copyright
index c513618..f6efdaf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,6 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
commit a9a7763ce04b4b4e1529f1aa74bb5081dc562ea7
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Sep 12 01:49:33 2007 +0200
Replace a non-ascii char with the corresponding groff escape in fbdev.man
diff --git a/man/fbdev.man b/man/fbdev.man
index da89ba8..aed60ce 100644
--- a/man/fbdev.man
+++ b/man/fbdev.man
@@ -60,4 +60,4 @@ Enable rotation of the display. The supported values are "CW" (clockwise,
__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__),
X(__miscmansuffix__), fbdevhw(__drivermansuffix__)
.SH AUTHORS
-Authors include: Gerd Knorr, Michel Dänzer, Geert Uytterhoeven
+Authors include: Gerd Knorr, Michel D\(:anzer, Geert Uytterhoeven
commit c119da55b257ecec96c6a59505c1be0b83261924
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Sat Apr 28 17:13:34 2007 +0200
Miscellaneous fixed in debian/control and debian/rules.
* Install the upstream changelog.
* Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
(needed to let xsfbs get access to serverminver).
* Add XS-Vcs-*.
* Add a link to www.X.org and a reference to the xf86-video-fbdev
module in the long description.
* Remove Fabio from uploaders with his permission. He's always welcome back.
diff --git a/debian/changelog b/debian/changelog
index 7de14c4..ea8990b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,16 @@ xserver-xorg-video-fbdev (1:0.3.1-3) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* Replaces/Conflicts: xserver-xorg-driver-fbdev.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 13:15:40 +0300
+ [ Brice Goglin ]
+ * Install the upstream changelog.
+ * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
+ (needed to let xsfbs get access to serverminver).
+ * Add XS-Vcs-*.
+ * Add a link to www.X.org and a reference to the xf86-video-fbdev
+ module in the long description.
+ * Remove Fabio from uploaders with his permission. He's always welcome back.
+
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Sat, 28 Apr 2007 17:12:35 +0200
xserver-xorg-video-fbdev (1:0.3.1-2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 158c8c5..7255d07 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,11 @@ Source: xserver-xorg-video-fbdev
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>
-Build-Depends: debhelper (>= 4.0.0), quilt, pkg-config, xserver-xorg-dev (>= 2:1.2.0), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-video-dev
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>
+Build-Depends: debhelper (>= 4.0.0), quilt, pkg-config, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-video-dev
Standards-Version: 3.6.1
+XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-fbdev
+XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-fbdev.git
Package: xserver-xorg-video-fbdev
Architecture: any
@@ -17,8 +19,8 @@ Description: X.Org X server -- fbdev display driver
'fbdev').
.
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 module can be found as the module 'driver/xf86-video-fbdev' at
- :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
+ This package is built from the X.org xf86-video-fbdev driver module.
diff --git a/debian/rules b/debian/rules
index 153ccb4..3c0f22c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,7 @@ binary-arch: build install serverabi
dh_testroot
dh_installdocs
- dh_installchangelogs
+ dh_installchangelogs ChangeLog
dh_install --sourcedir=debian/tmp --list-missing
dh_link
dh_strip
commit 887485c2bb62daeed12420b2dd35b6ebae29e185
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Tue Apr 24 13:16:58 2007 +0300
Replaces/Conflicts: xserver-xorg-driver-fbdev.
diff --git a/debian/changelog b/debian/changelog
index a09bec9..7de14c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
xserver-xorg-video-fbdev (1:0.3.1-3) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Add patch to fix minor warnings from man in fbdev(4).
- -- Julien Cristau <jcristau@debian.org> Sun, 22 Apr 2007 03:06:39 +0200
+ [ Timo Aaltonen ]
+ * Replaces/Conflicts: xserver-xorg-driver-fbdev.
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 13:15:40 +0300
xserver-xorg-video-fbdev (1:0.3.1-2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index f9aa4df..158c8c5 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Package: xserver-xorg-video-fbdev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
Provides: ${xviddriver:Provides}
-Replaces: xserver-xorg (<< 6.8.2-35)
+Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-fbdev
+Conflicts: xserver-xorg-driver-fbdev
Description: X.Org X server -- fbdev display driver
This package provides the driver for the Linux framebuffer device (aka
'fbdev').
commit 470fdb106245b029a5d5b62b51496e6b2bf35336
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 22 04:00:46 2007 +0200
Add patch to fix minor warnings from man in fbdev(4).
diff --git a/debian/changelog b/debian/changelog
index 07fefbd..a09bec9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-fbdev (1:0.3.1-3) UNRELEASED; urgency=low
+
+ * Add patch to fix minor warnings from man in fbdev(4).
+
+ -- Julien Cristau <jcristau@debian.org> Sun, 22 Apr 2007 03:06:39 +0200
+
xserver-xorg-video-fbdev (1:0.3.1-2) experimental; urgency=low
* Pull some minor fixes from upstream
diff --git a/debian/control b/debian/control
index 76184be..f9aa4df 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ 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>
-Build-Depends: debhelper (>= 4.0.0), pkg-config, xserver-xorg-dev (>= 2:1.2.0), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-video-dev
+Build-Depends: debhelper (>= 4.0.0), quilt, pkg-config, xserver-xorg-dev (>= 2:1.2.0), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-video-dev
Standards-Version: 3.6.1
Package: xserver-xorg-video-fbdev
diff --git a/debian/patches/01_fbdev_man.diff b/debian/patches/01_fbdev_man.diff
new file mode 100644
index 0000000..a976055
--- /dev/null
+++ b/debian/patches/01_fbdev_man.diff
@@ -0,0 +1,21 @@
+Index: xserver-xorg-video-fbdev/man/fbdev.man
+===================================================================
+--- xserver-xorg-video-fbdev.orig/man/fbdev.man 2007-04-22 03:52:00.000000000 +0200
++++ xserver-xorg-video-fbdev/man/fbdev.man 2007-04-22 03:52:49.000000000 +0200
+@@ -38,8 +38,8 @@
+ driver and will use it if there are no video modes configured.
+ .PP
+ For PCI boards you might have to add a BusID line to the Device
+-section. See above for a sample line. You can use \*q\__xservername__
+--scanpci\*q
++section. See above for a sample line. You can use \*q__xservername__
++\-scanpci\*q
+ to figure out the correct values.
+ .PP
+ The following driver
+@@ -60,4 +60,4 @@
+ __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__),
+ X(__miscmansuffix__), fbdevhw(__drivermansuffix__)
+ .SH AUTHORS
+-Authors include: Gerd Knorr, Michel Dänzer, Geert Uytterhoeven
++Authors include: Gerd Knorr, Michel D\(:anzer, Geert Uytterhoeven
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f6e5688
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_fbdev_man.diff
diff --git a/debian/rules b/debian/rules
index ae58780..153ccb4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ endif
# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
confflags += --disable-static
-build: build-stamp
+build: patch build-stamp
build-stamp:
dh_testdir
@@ -44,7 +44,7 @@ build-stamp:
touch build-stamp
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
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
Reply to: