debian/changelog | 20 ++++++++++++++++---- debian/control | 6 +++--- debian/copyright | 3 +++ debian/patches/01_fbdev_man.diff | 6 ------ man/fbdev.man | 2 +- 5 files changed, 23 insertions(+), 14 deletions(-)
New commits: commit d66a3504a8c9f3795f3fad8c65b92304235b8211 Author: David Nusinow <[EMAIL PROTECTED]> Date: Sun Sep 16 16:31:05 2007 -0400 * Upload to unstable diff --git a/debian/changelog b/debian/changelog index cd31a3f..bb54910 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-fbdev (1:0.3.1-4) unstable; urgency=low + + * Upload to unstable + + -- David Nusinow <[EMAIL PROTECTED]> Sun, 16 Sep 2007 16:30:50 -0400 + xserver-xorg-video-fbdev (1:0.3.1-3) experimental; urgency=low [ Julien Cristau ] commit c9f0e2fb7665ea3f1228125764b8474e1879ab28 Author: Brice Goglin <[EMAIL PROTECTED]> 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 <[EMAIL PROTECTED]> Wed, 12 Sep 2007 10:11:44 +0200 + -- Brice Goglin <[EMAIL PROTECTED]> 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 <[EMAIL PROTECTED]> 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 <[EMAIL PROTECTED]> 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 <[EMAIL PROTECTED]> 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 <[EMAIL PROTECTED]> Sat, 28 Apr 2007 17:12:35 +0200 + -- Brice Goglin <[EMAIL PROTECTED]> 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 <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL PROTECTED]> -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 <[EMAIL PROTECTED]>, Brice Goglin <[EMAIL PROTECTED]> +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 <[EMAIL PROTECTED]> 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 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]