xserver-xorg-video-fbdev: Changes to 'debian-unstable'

2013-09-23 Thread Julien Cristau 
 ChangeLog|   14 ++
 configure.ac |2 +-
 debian/changelog |6 ++
 src/fbdev.c  |2 --
 4 files changed, 21 insertions(+), 3 deletions(-)

New commits:
commit e9f3baaedd93c01eb18b371b4c131a9389340444
Author: Julien Cristau jcris...@debian.org
Date:   Mon Sep 23 20:23:27 2013 +0200

Bump changelogs

diff --git a/ChangeLog b/ChangeLog
index 911df67..11c783d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+commit 679ed9a4e6b54227df191c580e3ef641e075db19
+Author: Julien Cristau jcris...@debian.org
+Date:   Mon Sep 23 20:02:47 2013 +0200
+
+Bump to 0.4.4
+
+commit ac293412a01d87f87eb61f4adb9db7486a75d3fc
+Author: Adam Jackson a...@redhat.com
+Date:   Tue Sep 25 08:54:37 2012 -0400
+
+Remove mibstore.h
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
 commit 2edaad4ab2c75e6863caa529d27cd141f579914a
 Author: Dave Airlie airl...@redhat.com
 Date:   Mon Jul 2 12:47:08 2012 +0100
diff --git a/debian/changelog b/debian/changelog
index e94d699..558568b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-fbdev (1:0.4.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Julien Cristau jcris...@debian.org  Mon, 23 Sep 2013 20:23:23 +0200
+
 xserver-xorg-video-fbdev (1:0.4.3-2) unstable; urgency=low
 
   * Make sure not to enable XV support in the udeb: XV comes from

commit 679ed9a4e6b54227df191c580e3ef641e075db19
Author: Julien Cristau jcris...@debian.org
Date:   Mon Sep 23 20:02:47 2013 +0200

Bump to 0.4.4

diff --git a/configure.ac b/configure.ac
index 188ce6b..d9e4219 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-fbdev],
-[0.4.3],
+[0.4.4],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-fbdev])
 AC_CONFIG_SRCDIR([Makefile.am])

commit ac293412a01d87f87eb61f4adb9db7486a75d3fc
Author: Adam Jackson a...@redhat.com
Date:   Tue Sep 25 08:54:37 2012 -0400

Remove mibstore.h

Signed-off-by: Adam Jackson a...@redhat.com

diff --git a/src/fbdev.c b/src/fbdev.c
index cd7ebc5..f5a7378 100644
--- a/src/fbdev.c
+++ b/src/fbdev.c
@@ -14,7 +14,6 @@
 #include xf86_OSproc.h
 
 #include mipointer.h
-#include mibstore.h
 #include micmap.h
 #include colormapst.h
 #include xf86cmap.h
@@ -845,7 +844,6 @@ FBDevScreenInit(SCREEN_INIT_ARGS_DECL)
}
 
xf86SetBlackWhitePixels(pScreen);
-   miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
 
/* software cursor */


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1voat4-0007by...@vasks.debian.org

xserver-xorg-video-fbdev: Changes to 'debian-unstable'

2013-08-20 Thread Cyril Brulebois 
 debian/changelog|   10 +++
 debian/patches/02-support-building-without-xv.patch |   27 +---
 2 files changed, 33 insertions(+), 4 deletions(-)

New commits:
commit 6734a2f8a6c0ef09dcb5685d2abc22b48417b107
Author: Cyril Brulebois k...@debian.org
Date:   Tue Aug 20 15:20:20 2013 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 357139b..e94d699 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-fbdev (1:0.4.3-2) UNRELEASED; urgency=low
+xserver-xorg-video-fbdev (1:0.4.3-2) unstable; urgency=low
 
   * Make sure not to enable XV support in the udeb: XV comes from
 xorg-server.h and tells us whether the regular server was built with
@@ -6,7 +6,7 @@ xserver-xorg-video-fbdev (1:0.4.3-2) UNRELEASED; urgency=low
 the driver should be built with XV support (Closes: #720313). Thanks,
 Steven Chamberlain!
 
- -- Cyril Brulebois k...@debian.org  Tue, 20 Aug 2013 14:46:26 +0200
+ -- Cyril Brulebois k...@debian.org  Tue, 20 Aug 2013 15:19:49 +0200
 
 xserver-xorg-video-fbdev (1:0.4.3-1) unstable; urgency=low
 

commit 9ab5f84a1413ae275c66b264b07230359b64bffb
Author: Cyril Brulebois k...@debian.org
Date:   Tue Aug 20 15:19:03 2013 +0200

Make sure not to enable XV support in the udeb (Closes: #720313).

XV comes from xorg-server.h and tells us whether the regular server was
built with XV support. USE_XV is used to determine whether a given
flavour of the driver should be built with XV support. Thanks, Steven
Chamberlain!

diff --git a/debian/changelog b/debian/changelog
index 7f24458..357139b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xserver-xorg-video-fbdev (1:0.4.3-2) UNRELEASED; urgency=low
+
+  * Make sure not to enable XV support in the udeb: XV comes from
+xorg-server.h and tells us whether the regular server was built with
+XV support. USE_XV is used to determine whether a given flavour of
+the driver should be built with XV support (Closes: #720313). Thanks,
+Steven Chamberlain!
+
+ -- Cyril Brulebois k...@debian.org  Tue, 20 Aug 2013 14:46:26 +0200
+
 xserver-xorg-video-fbdev (1:0.4.3-1) unstable; urgency=low
 
   [ Maarten Lankhorst ]
diff --git a/debian/patches/02-support-building-without-xv.patch 
b/debian/patches/02-support-building-without-xv.patch
index 35414f0..ce12cb6 100644
--- a/debian/patches/02-support-building-without-xv.patch
+++ b/debian/patches/02-support-building-without-xv.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] Support building without XV.
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -55,6 +55,10 @@
+@@ -55,6 +55,10 @@ AC_ARG_WITH(xorg-module-dir,
  AC_ARG_ENABLE(pciaccess, AS_HELP_STRING([--enable-pciaccess],
   [Enable use of libpciaccess (default: 
disabled)]),
 [PCIACCESS=$enableval], [PCIACCESS=no])
@@ -21,7 +21,7 @@ Subject: [PATCH] Support building without XV.
  
  # Store the list of server defined optional extensions in REQUIRED_MODULES
  XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
-@@ -79,6 +83,13 @@
+@@ -79,6 +83,13 @@ if test x$PCIACCESS = xyes; then
  XORG_CFLAGS=$XORG_CFLAGS $PCIACCESS_CFLAGS
  fi
  
@@ -37,7 +37,7 @@ Subject: [PATCH] Support building without XV.
  
 --- a/src/fbdev.c
 +++ b/src/fbdev.c
-@@ -456,6 +456,7 @@
+@@ -456,6 +456,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flag
return FALSE;
}
  
@@ -45,7 +45,7 @@ Subject: [PATCH] Support building without XV.
{
Gamma zeros = {0.0, 0.0, 0.0};
  
-@@ -463,6 +464,7 @@
+@@ -463,6 +464,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flag
return FALSE;
}
}
@@ -53,3 +53,22 @@ Subject: [PATCH] Support building without XV.
  
pScrn-progClock = TRUE;
pScrn-rgbBits   = 8;
+@@ -897,7 +899,10 @@ FBDevScreenInit(SCREEN_INIT_ARGS_DECL)
+   fPtr-CloseScreen = pScreen-CloseScreen;
+   pScreen-CloseScreen = FBDevCloseScreen;
+ 
++/* Whether the server was built with XV support */
+ #if XV
++/* Whether the driver should be built with XV support */
++#if USE_XV
+   {
+   XF86VideoAdaptorPtr *ptr;
+ 
+@@ -907,6 +912,7 @@ FBDevScreenInit(SCREEN_INIT_ARGS_DECL)
+   }
+   }
+ #endif
++#endif
+ 
+   TRACE_EXIT(FBDevScreenInit);
+ 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vbm3z-0007tn...@vasks.debian.org

xserver-xorg-video-fbdev: Changes to 'debian-unstable'

2013-08-16 Thread Julien Cristau 
 ChangeLog   |  195 
 configure.ac|   40 +---
 debian/changelog|   29 ++
 debian/control  |4 
 debian/patches/01_fbdev_man.diff|   13 -
 debian/patches/02-support-building-without-xv.patch |   37 +--
 debian/patches/series   |1 
 man/Makefile.am |   22 --
 man/fbdev.man   |5 
 src/Makefile.am |1 
 src/compat-api.h|  101 ++
 src/fbdev.c |  105 +-
 12 files changed, 422 insertions(+), 131 deletions(-)

New commits:
commit 5099881775ae1da2147e6ffd74339db8e3b2184d
Author: Julien Cristau jcris...@debian.org
Date:   Fri Aug 16 11:35:19 2013 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 4b29403..7f24458 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-xserver-xorg-video-fbdev (1:0.4.3-1) UNRELEASED; urgency=low
+xserver-xorg-video-fbdev (1:0.4.3-1) unstable; urgency=low
 
+  [ Maarten Lankhorst ]
   * New upstream release 0.4.3
   * Remove 01_fbdev_man.diff
 - No longer applies/valid
   * Refresh 02-support-building-without-xv.patch
   * Bump Standards-Version to 3.9.3 (no changes needed).
 
- -- Maarten Lankhorst maarten.lankho...@canonical.com  Wed, 18 Jul 2012 
14:22:37 +0200
+ -- Julien Cristau jcris...@debian.org  Fri, 16 Aug 2013 11:35:04 +0200
 
 xserver-xorg-video-fbdev (1:0.4.2-7) experimental; urgency=low
 

commit 0352d8734e2966fbd0b22ccd195833e70a0da498
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 18 14:28:34 2012 +0200

Refresh

* Remove 01_fbdev_man.diff
  - No longer applies/valid
* Refresh 02-support-building-without-xv.patch
* Bump Standards-Version to 3.9.3 (no changes needed).

diff --git a/debian/changelog b/debian/changelog
index 4d0935c..4b29403 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 xserver-xorg-video-fbdev (1:0.4.3-1) UNRELEASED; urgency=low
 
   * New upstream release 0.4.3
+  * Remove 01_fbdev_man.diff
+- No longer applies/valid
+  * Refresh 02-support-building-without-xv.patch
+  * Bump Standards-Version to 3.9.3 (no changes needed).
 
  -- Maarten Lankhorst maarten.lankho...@canonical.com  Wed, 18 Jul 2012 
14:22:37 +0200
 
diff --git a/debian/control b/debian/control
index 514bb6f..9fba913 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  x11proto-render-dev,
  x11proto-video-dev,
  xutils-dev (= 1:7.5+1),
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-fbdev
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-fbdev.git
 
diff --git a/debian/patches/01_fbdev_man.diff b/debian/patches/01_fbdev_man.diff
deleted file mode 100644
index 10413c3..000
--- a/debian/patches/01_fbdev_man.diff
+++ /dev/null
@@ -1,13 +0,0 @@
 xserver-xorg-video-fbdev.orig/man/fbdev.man
-+++ xserver-xorg-video-fbdev/man/fbdev.man
-@@ -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 
diff --git a/debian/patches/02-support-building-without-xv.patch 
b/debian/patches/02-support-building-without-xv.patch
index 34fa88a..35414f0 100644
--- a/debian/patches/02-support-building-without-xv.patch
+++ b/debian/patches/02-support-building-without-xv.patch
@@ -8,22 +8,20 @@ Subject: [PATCH] Support building without XV.
  src/fbdev.c  |2 ++
  2 files changed, 13 insertions(+), 0 deletions(-)
 
-diff --git a/configure.ac b/configure.ac
-index f76cca0..8fa2204 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -50,6 +50,10 @@ AC_ARG_ENABLE(pciaccess, 
AS_HELP_STRING([--enable-pciaccess],
+@@ -55,6 +55,10 @@
+ AC_ARG_ENABLE(pciaccess, AS_HELP_STRING([--enable-pciaccess],
   [Enable use of libpciaccess (default: 
disabled)]),
 [PCIACCESS=$enableval], [PCIACCESS=no])
- 
 +AC_ARG_ENABLE(xv,AS_HELP_STRING([--enable-xv],
 + [Enable use of xv (default: enabled)]),
 + [USE_XV=$enableval], [USE_XV=yes])
 +
- # Checks for extensions
+ 
+ # Store the list of server defined optional extensions in REQUIRED_MODULES
  XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
-@@ -74,6 +78,13 @@ if test x$PCIACCESS = xyes; then

xserver-xorg-video-fbdev: Changes to 'debian-unstable'

2011-02-05 Thread Cyril Brulebois 
 debian/README.source   |   24 -
 debian/changelog   |   21 +
 debian/compat  |2 
 debian/control |   22 -
 debian/rules   |  137 ++
 debian/xsfbs/repack.sh |   32 --
 debian/xsfbs/xsfbs.mk  |  285 --
 debian/xsfbs/xsfbs.sh  |  622 -
 8 files changed, 67 insertions(+), 1078 deletions(-)

New commits:
commit 7edcf58276b1bae125f0d74fa5ef7fe9728498f5
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 5 14:44:43 2011 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 534f028..deaead5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-fbdev (1:0.4.2-4) UNRELEASED; urgency=low
+xserver-xorg-video-fbdev (1:0.4.2-4) unstable; urgency=low
 
   * Switch to dh:
 - Use debhelper 8.
@@ -11,7 +11,7 @@ xserver-xorg-video-fbdev (1:0.4.2-4) UNRELEASED; urgency=low
   * Wrap Depends/Provides.
   * Bump Standards-Version to 3.9.1 (no changes needed).
 
- -- Cyril Brulebois k...@debian.org  Fri, 04 Feb 2011 13:13:17 +0100
+ -- Cyril Brulebois k...@debian.org  Sat, 05 Feb 2011 14:44:43 +0100
 
 xserver-xorg-video-fbdev (1:0.4.2-3) experimental; urgency=low
 

commit 451d64028ec6c2908b5ab76fd1a413df80e307ca
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 4 13:57:42 2011 +0100

Fix spacing.

diff --git a/debian/rules b/debian/rules
index 1a3ebb8..34a61ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
-PACKAGE  = xserver-xorg-video-fbdev
-OOT  = --builddirectory=build
+PACKAGE = xserver-xorg-video-fbdev
+OOT = --builddirectory=build
 
 # Clean:
 override_dh_auto_clean:

commit 6107ec4acd31a61616fdaf02e1751f3ffb794333
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 4 13:52:23 2011 +0100

Make make $(MAKE).

diff --git a/debian/rules b/debian/rules
index d7f512a..1a3ebb8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,13 +16,13 @@ override_dh_auto_configure:
 
 # Build:
 override_dh_auto_build:
-   make -C build-main/
-   make -C build-udeb/
+   $(MAKE) -C build-main/
+   $(MAKE) -C build-udeb/
 
 # Install:
 override_dh_auto_install:
-   make -C build-main/ install DESTDIR=$(CURDIR)/debian/tmp-main
-   make -C build-udeb/ install DESTDIR=$(CURDIR)/debian/tmp-udeb
+   $(MAKE) -C build-main/ install DESTDIR=$(CURDIR)/debian/tmp-main
+   $(MAKE) -C build-udeb/ install DESTDIR=$(CURDIR)/debian/tmp-udeb
 
 # Kill *.la files, and forget no-one:
 override_dh_install:

commit 3549c7e51314faf306d2dbc4f3589e48bfbeb5fc
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 4 13:38:22 2011 +0100

Fix missing cleaning.

diff --git a/debian/rules b/debian/rules
index 0fb3dd5..d7f512a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,12 @@
 PACKAGE  = xserver-xorg-video-fbdev
 OOT  = --builddirectory=build
 
+# Clean:
+override_dh_auto_clean:
+   dh_auto_clean
+   rm -rf build-main/ debian/tmp-main/
+   rm -rf build-udeb/ debian/tmp-udeb/
+
 # Configuration, with or without xv:
 override_dh_auto_configure:
dh_auto_configure $(OOT)-main/ -- --enable-xv

commit 7738c006964f87b4ab3a5aa4369de1cefb4372a1
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 4 13:35:36 2011 +0100

Bump Standards-Version to 3.9.1 (no changes needed).

diff --git a/debian/changelog b/debian/changelog
index 87a4ec9..534f028 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xserver-xorg-video-fbdev (1:0.4.2-4) UNRELEASED; urgency=low
   * Update Uploaders list. Thanks, David  Brice!
   * Remove long obsolete Replaces/Conflicts.
   * Wrap Depends/Provides.
+  * Bump Standards-Version to 3.9.1 (no changes needed).
 
  -- Cyril Brulebois k...@debian.org  Fri, 04 Feb 2011 13:13:17 +0100
 
diff --git a/debian/control b/debian/control
index 32eaa9f..576eb9d 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  x11proto-render-dev,
  x11proto-video-dev,
  xutils-dev (= 1:7.5+1),
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-fbdev
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-fbdev.git
 

commit f0f99e74476d9549fe3abd6f2cc8f6fe0b331c18
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 4 13:35:19 2011 +0100

Wrap Depends/Provides.

diff --git a/debian/changelog b/debian/changelog
index 52a8ee4..87a4ec9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xserver-xorg-video-fbdev (1:0.4.2-4) UNRELEASED; urgency=low
   * Remove xsfbs accordingly.
   * Update Uploaders list. Thanks, David  Brice!
   * Remove long obsolete Replaces/Conflicts.
+  * Wrap Depends/Provides.
 
  -- Cyril Brulebois k...@debian.org  Fri, 04 Feb 2011 13:13:17 +0100
 
diff --git a/debian/control b/debian/control
index 269fd05..32eaa9f 100644
--- a/debian/control
+++ b/debian/control
@@ -21,8 +21,12 @@

xserver-xorg-video-fbdev: Changes to 'debian-unstable'

2010-05-07 Thread Mikhail Gusarov 
 debian/control |2 --
 1 file changed, 2 deletions(-)

New commits:
commit ac535ab502e4e07a47ce88e9c86e188b808a6f62
Author: Mikhail Gusarov dotted...@debian.org
Date:   Fri May 7 18:58:57 2010 +0700

Remove duplicate xorg.fd.o URL and confusing mailing list URL from 
debian/control

diff --git a/debian/control b/debian/control
index d92a4d4..9702548 100644
--- a/debian/control
+++ b/debian/control
@@ -33,8 +33,6 @@ Description: X.Org X server -- fbdev display driver
  .
  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 package is built from the X.org xf86-video-fbdev driver module.
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1oamoe-0008n2...@alioth.debian.org

xserver-xorg-video-fbdev: Changes to 'debian-unstable'

2010-05-03 Thread Cyril Brulebois 
 debian/README.source  |2 +-
 debian/changelog  |8 
 debian/control|6 +++---
 debian/xsfbs/xsfbs.mk |   35 ++-
 4 files changed, 34 insertions(+), 17 deletions(-)

New commits:
commit cdf21cc989d1162fa95b6d3bd91adaa5d2c53bf8
Author: Cyril Brulebois k...@debian.org
Date:   Mon May 3 23:14:03 2010 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index d328a62..784797c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-fbdev (1:0.4.2-2) UNRELEASED; urgency=low
+xserver-xorg-video-fbdev (1:0.4.2-2) unstable; urgency=low
 
   * Update to new xsfbs, replace deprecated ${xserver:Depends} with
 ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev
 accordingly.
 
- -- Cyril Brulebois k...@debian.org  Mon, 03 May 2010 23:13:23 +0200
+ -- Cyril Brulebois k...@debian.org  Mon, 03 May 2010 23:13:56 +0200
 
 xserver-xorg-video-fbdev (1:0.4.2-1) unstable; urgency=low
 

commit 6a0df76512c0de10e4dd9b7ca8309fa92dbc74d2
Author: Cyril Brulebois k...@debian.org
Date:   Mon May 3 23:09:13 2010 +0200

Update to new xsfbs, replace deprecated ${xserver:Depends} with 
${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev accordingly.

diff --git a/debian/changelog b/debian/changelog
index 0e6f3b1..d328a62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-fbdev (1:0.4.2-2) UNRELEASED; urgency=low
+
+  * Update to new xsfbs, replace deprecated ${xserver:Depends} with
+${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev
+accordingly.
+
+ -- Cyril Brulebois k...@debian.org  Mon, 03 May 2010 23:13:23 +0200
+
 xserver-xorg-video-fbdev (1:0.4.2-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 523d60a..d92a4d4 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (= 5.0.0),
  quilt,
  pkg-config,
- xserver-xorg-dev (= 2:1.7),
+ xserver-xorg-dev (= 2:1.7.6.901),
  x11proto-core-dev,
  x11proto-fonts-dev,
  x11proto-randr-dev,
@@ -23,7 +23,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-fbdev.g
 
 Package: xserver-xorg-video-fbdev
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
 Provides: ${xviddriver:Provides}
 Replaces: xserver-xorg ( 6.8.2-35), xserver-xorg-driver-fbdev
 Conflicts: xserver-xorg-driver-fbdev
@@ -42,7 +42,7 @@ Package: xserver-xorg-video-fbdev-udeb
 XC-Package-Type: udeb
 Section: debian-installer
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
 Provides: ${xviddriver:Provides}
 Description: X.Org X server -- fbdev display driver
  This is a udeb, or a microdeb, for the debian-installer.

commit 81fc271788605b52e85c2d11635a0371fb44605e
Author: Cyril Brulebois k...@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 jcris...@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-video-fbdev: Changes to 'debian-unstable'

2010-04-06 Thread Cyril Brulebois 
 .gitignore   |   74 +-
 ChangeLog|  105 +++
 Makefile.am  |   12 +-
 configure.ac |   14 ---
 debian/changelog |8 
 debian/control   |2 -
 man/Makefile.am  |   41 +
 src/fbdev.c  |   46 +---
 8 files changed, 218 insertions(+), 84 deletions(-)

New commits:
commit 3c6f962e28c558769912db010a4cadbf5994fcf3
Author: Cyril Brulebois k...@debian.org
Date:   Tue Apr 6 14:39:38 2010 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index d55e045..0e6f3b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-fbdev (1:0.4.2-1) UNRELEASED; urgency=low
+xserver-xorg-video-fbdev (1:0.4.2-1) unstable; urgency=low
 
   * New upstream release.
   * Use xutils-dev (= 1:7.5+1) in Build-Depends, since xorg-macros 1.4 is
 needed for XORG_INSTALL.
 
- -- Cyril Brulebois k...@debian.org  Tue, 06 Apr 2010 05:01:51 +0200
+ -- Cyril Brulebois k...@debian.org  Tue, 06 Apr 2010 14:38:31 +0200
 
 xserver-xorg-video-fbdev (1:0.4.1-2) unstable; urgency=low
 

commit 18ea174d9983c08d45fcac919048f0774be319c0
Author: Cyril Brulebois k...@debian.org
Date:   Tue Apr 6 05:15:25 2010 +0200

Use xutils-dev (= 1:7.5+1) in Build-Depends, since xorg-macros 1.4 is 
needed for XORG_INSTALL.

diff --git a/debian/changelog b/debian/changelog
index 87d06a5..d55e045 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xserver-xorg-video-fbdev (1:0.4.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Use xutils-dev (= 1:7.5+1) in Build-Depends, since xorg-macros 1.4 is
+needed for XORG_INSTALL.
 
  -- Cyril Brulebois k...@debian.org  Tue, 06 Apr 2010 05:01:51 +0200
 
diff --git a/debian/control b/debian/control
index b8608d6..523d60a 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
  dpkg-dev (= 1.14.17),
  automake,
  libtool,
- xutils-dev
+ xutils-dev (= 1:7.5+1),
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-fbdev
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-fbdev.git

commit df38d4760e296255c971623cd322a8673a097af2
Author: Cyril Brulebois k...@debian.org
Date:   Tue Apr 6 05:03:31 2010 +0200

Update ChangeLog (and remove it from .gitignore).

diff --git a/.gitignore b/.gitignore
index 1c9de22..3badb18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,6 @@
 aclocal.m4
 autom4te.cache/
 autoscan.log
-ChangeLog
 compile
 config.guess
 config.h
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 000..8f1a4c9
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,539 @@
+commit 7ec9d466e55e6366bf35639610b14a149f6e7b45
+Author: Julien Cristau jcris...@debian.org
+Date:   Sat Apr 3 18:05:21 2010 +0200
+
+Bump to 0.4.2
+
+commit b3220bf63ee39ce3aecdb3e4151b3f4521bd2107
+Author: Julien Cristau jcris...@debian.org
+Date:   Wed Feb 10 02:09:17 2010 +0100
+
+configure: require xorg-macros 1.4 for XORG_INSTALL
+
+Signed-off-by: Julien Cristau jcris...@debian.org
+
+commit a9df47d6d018fdde8d28ec7c5237967e26413f1b
+Author: Julien Cristau jcris...@debian.org
+Date:   Thu Feb 4 22:23:34 2010 +0100
+
+fbdev: add missing shadowRemove in CloseScreen()
+
+Fixes crash in CloseScreen().
+
+Signed-off-by: Julien Cristau jcris...@debian.org
+Tested-by: Cyril Brulebois k...@debian.org
+
+commit a5b035414d3234ae278c09b34641bb1c68da86d4
+Author: Alan Coopersmith alan.coopersm...@sun.com
+Date:   Fri Jan 15 15:44:54 2010 -0800
+
+Update Sun license notices to current X.Org standard form
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@sun.com
+
+commit 5ec41a8b2ebee7f922c633a83ee8bea77aefaf3e
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Dec 15 22:01:02 2009 -0500
+
+configure.ac: remove unused sdkdir=$(pkg-config...) statement
+
+The sdkdir variable isn't use, so remove the statement.
+
+Acked-by: Dan Nicholson dbn.li...@gmail.com
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 69f82077fda16106e534c1ea4c48f0dbdd5576e7
+Author: Adam Jackson a...@redhat.com
+Date:   Mon Dec 14 13:38:44 2009 -0500
+
+Remove afb support
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit 4e8a6ac78d0a89bfc831d4c82ee47d02312beb84
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Mon Nov 23 09:25:05 2009 -0500
+
+Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+Now that the INSTALL file is generated.
+Allows running make maintainer-clean.
+
+commit d868015c9cb08276164054419a4083d6c5cf4dbb
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Oct 28 14:41:41 2009 -0400
+
+INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+Automake 'foreign' option is specified in configure.ac.
+Remove from Makefile.am
+
+commit

xserver-xorg-video-fbdev: Changes to 'debian-unstable'

2010-03-11 Thread Cyril Brulebois 
 debian/changelog|   15 
 debian/control  |   13 +++-
 debian/patches/02-support-building-without-xv.patch |   62 
 debian/patches/series   |1 
 debian/rules|   21 --
 debian/xserver-xorg-video-fbdev-udeb.install|1 
 src/fbdev.c |1 
 7 files changed, 104 insertions(+), 10 deletions(-)

New commits:
commit dc4fc787dc0e1fed1b7705759c564035a2a477e7
Author: Cyril Brulebois k...@debian.org
Date:   Fri Mar 12 01:33:02 2010 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 4db48d2..93bca69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-fbdev (1:0.4.1-2) UNRELEASED; urgency=low
+xserver-xorg-video-fbdev (1:0.4.1-2) unstable; urgency=low
 
   [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -15,7 +15,7 @@ xserver-xorg-video-fbdev (1:0.4.1-2) UNRELEASED; urgency=low
   * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
   * Add myself to Uploaders.
 
- -- Julien Cristau jcris...@debian.org  Sat, 23 Jan 2010 02:05:49 +0100
+ -- Cyril Brulebois k...@debian.org  Fri, 12 Mar 2010 01:32:16 +0100
 
 xserver-xorg-video-fbdev (1:0.4.1-1) experimental; urgency=low
 

commit 6ae8f98ed44a0f06a3c74c21b4ceb1cc923c0277
Author: Cyril Brulebois k...@debian.org
Date:   Fri Mar 12 01:32:11 2010 +0100

Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index d186fa4..4db48d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ xserver-xorg-video-fbdev (1:0.4.1-2) UNRELEASED; urgency=low
 built with XV disabled).
   * Build two flavours, one for the main package and one for the udeb.
   * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
+  * Add myself to Uploaders.
 
  -- Julien Cristau jcris...@debian.org  Sat, 23 Jan 2010 02:05:49 +0100
 
diff --git a/debian/control b/debian/control
index a169edf..b8608d6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-fbdev
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org
+Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org, Cyril Brulebois k...@debian.org
 Build-Depends:
  debhelper (= 5.0.0),
  quilt,

commit 81c91ed0fa105ef4b265b8f7ac03836caaec5c1d
Author: Cyril Brulebois k...@debian.org
Date:   Fri Mar 12 01:30:42 2010 +0100

Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).

diff --git a/debian/changelog b/debian/changelog
index 7e5f895..d186fa4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ xserver-xorg-video-fbdev (1:0.4.1-2) UNRELEASED; urgency=low
   * Add patch to support building with XV disabled (the server might be
 built with XV disabled).
   * Build two flavours, one for the main package and one for the udeb.
+  * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
 
  -- Julien Cristau jcris...@debian.org  Sat, 23 Jan 2010 02:05:49 +0100
 
diff --git a/debian/control b/debian/control
index a12e4f9..a169edf 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-fbdev
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-fbdev.git
 

commit 6ea8b9d22d2b7a7e8fcaf4d09a7e44d285e6b0bd
Author: Cyril Brulebois k...@debian.org
Date:   Sun Feb 28 00:07:28 2010 +0100

Use XC-Package-Type to save some memory.

diff --git a/debian/control b/debian/control
index 10b97e1..a12e4f9 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,7 @@ Description: X.Org X server -- fbdev display driver
  This package is built from the X.org xf86-video-fbdev driver module.
 
 Package: xserver-xorg-video-fbdev-udeb
-Package-Type: udeb
+XC-Package-Type: udeb
 Section: debian-installer
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}

commit 97f609305828a21cdaa54f66965a7b8da275fb23
Author: Cyril Brulebois k...@debian.org
Date:   Sun Feb 14 05:17:28 2010 +

Build an XV-free flavour for the udeb.

diff --git a/debian/changelog b/debian/changelog
index 8f231dc..7e5f895 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ xserver-xorg-video-fbdev (1:0.4.1-2) UNRELEASED; urgency=low
   * Backport “Fixes crash in CloseScreen().” by Julien Cristau.
   * Add patch to support building with XV disabled (the server might be
 built with XV disabled).
+  * Build two flavours, one for the main package and one for the udeb.
 
  -- Julien Cristau jcris...@debian.org  Sat, 23

xserver-xorg-video-fbdev: Changes to 'debian-unstable'

2010-01-22 Thread Julien Cristau 
 debian/changelog |   17 -
 debian/control   |2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 87b784b73a3f93a30d350d6a4dc98933cf6c8812
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 23 01:46:30 2010 +0100

Remove myself from Uploaders

diff --git a/debian/changelog b/debian/changelog
index dde39a4..6a49404 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xserver-xorg-video-fbdev (1:0.4.1-1) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
+  * Remove myself from Uploaders
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:06 +0200
 
diff --git a/debian/control b/debian/control
index 612c3e9..21201cf 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-fbdev
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org, Julien Cristau jcris...@debian.org
+Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org
 Build-Depends:
  debhelper (= 5.0.0),
  quilt,

commit 1775a37555f379a2787171d6f921ee75682d89b8
Author: Cyril Brulebois k...@debian.org
Date:   Sun Dec 6 03:09:37 2009 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 1353c0f..b16e0ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-xserver-xorg-video-fbdev (1:0.4.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-fbdev (1:0.4.1-1) experimental; urgency=low
 
+  [ Timo Aaltonen ]
   * New upstream release.
   * Bump Standards-Version to 3.8.3.
   * Build against Xserver 1.7.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:06 +0200
+  [ Cyril Brulebois ]
+  * Upload to experimental.
+
+ -- Cyril Brulebois k...@debian.org  Sun, 06 Dec 2009 03:09:35 +0100
 
 xserver-xorg-video-fbdev (1:0.4.0-4) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xserver-xorg-video-fbdev: Changes to 'debian-unstable'

2010-01-16 Thread Julien Cristau 
 debian/changelog |5 +
 debian/rules |   10 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 1ebbcfd3ede6c285d6abd4212929918bc00fd3d2
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 16 16:48:42 2010 +

Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good 
reason.  Thanks, Colin Watson!

diff --git a/debian/changelog b/debian/changelog
index 1353c0f..dde39a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 xserver-xorg-video-fbdev (1:0.4.1-1) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * New upstream release.
   * Bump Standards-Version to 3.8.3.
   * Build against Xserver 1.7.
 
+  [ Julien Cristau ]
+  * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+good reason.  Thanks, Colin Watson!
+
  -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:06 +0200
 
 xserver-xorg-video-fbdev (1:0.4.0-4) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 5d979b2..e0809de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,12 +40,12 @@ build: build-stamp
 build-stamp: configure
dh_testdir
 
-   test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE)
-   cd obj-$(DEB_BUILD_GNU_TYPE)  \
+   test -d build || mkdir build
+   cd build  \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
 --infodir=\$${prefix}/share/info $(confflags) \
 CFLAGS=$(CFLAGS) 
-   cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
+   cd build  $(MAKE)
$@
 
 clean: xsfclean
@@ -57,7 +57,7 @@ clean: xsfclean
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
-   rm -rf obj-*
+   rm -rf build
rm -f aclocal.m4 config.guess config.sub config.h.in configure
rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
rm -f $$(find -name Makefile.in)
@@ -70,7 +70,7 @@ install: build
dh_clean -k
dh_installdirs
 
-   cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE) DESTDIR=$(CURDIR)/debian/tmp 
install
+   cd build  $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
 # Build architecture-dependent files here.
 binary-arch: build install serverabi


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xserver-xorg-video-fbdev: Changes to 'debian-unstable'

2009-12-04 Thread Timo Aaltonen 
 debian/changelog |3 ++-
 debian/control   |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit c4b1dba4f4f5a16c5dc806bc31c5134dcecfca21
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Sat Dec 5 02:09:26 2009 +0200

Build against Xserver 1.7.

diff --git a/debian/changelog b/debian/changelog
index a97cd7e..1353c0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-video-fbdev (1:0.4.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Bump Standards-Version to 3.8.3.
+  * Build against Xserver 1.7.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Mon, 30 Nov 2009 16:13:23 +0200
+ -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:06 +0200
 
 xserver-xorg-video-fbdev (1:0.4.0-4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index f0519a1..612c3e9 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (= 5.0.0),
  quilt,
  pkg-config,
- xserver-xorg-dev (= 2:1.5.99.901),
+ xserver-xorg-dev (= 2:1.7),
  x11proto-core-dev,
  x11proto-fonts-dev,
  x11proto-randr-dev,


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xserver-xorg-video-fbdev: Changes to 'debian-unstable'

2009-11-30 Thread Timo Aaltonen 
 ChangeLog |   48 +
 README|   20 
 configure.ac  |2 
 debian/README.source  |   73 ++
 debian/changelog  |7 +
 debian/control|2 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  245 --
 man/fbdev.man |2 
 src/fbdev.c   |   83 +---
 10 files changed, 162 insertions(+), 341 deletions(-)

New commits:
commit 38d398015e42339a0d159ccb79a14c96a1a42555
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Mon Nov 30 16:17:03 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index f3e0f6b..a97cd7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-fbdev (1:0.4.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump Standards-Version to 3.8.3.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Mon, 30 Nov 2009 16:13:23 +0200
 
diff --git a/debian/control b/debian/control
index 15aa608..f0519a1 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-fbdev
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-fbdev.git
 

commit f3bea4899b8d8cc66c0ae31ab42c534f742d3c93
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Mon Nov 30 16:16:40 2009 +0200

Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
index 53cdcb1..14479be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,51 @@
+commit e233c12c97233f8842c77cb6324c19fcdb06bfa7
+Author: Dave Airlie airl...@redhat.com
+Date:   Thu Jul 30 12:04:27 2009 +1000
+
+fbdev: bump for release 0.4.1
+
+commit dfe51de9923c5436b039f246cf2fc4bfff9329e8
+Author: Dave Airlie airl...@redhat.com
+Date:   Tue Jul 28 15:22:40 2009 +1000
+
+fbdev: change to using ABI version check
+
+commit fe00991326bbf6f0944543fda3856bedaa916a09
+Author: Dave Airlie airl...@redhat.com
+Date:   Tue Jul 28 13:32:29 2009 +1000
+
+fbdev: update for resources/RAC API removal
+
+commit 16ea2bb46c9acc881f66a1f498d63586071aa9b7
+Author: Adam Jackson a...@redhat.com
+Date:   Thu May 28 14:55:08 2009 -0400
+
+Remove useless loader symbol lists.
+
+commit c3434c86252428a93861daa8ba1161391576cd88
+Author: Adam Jackson a...@redhat.com
+Date:   Wed Mar 4 10:09:47 2009 -0500
+
+Allow building against a non-DGA server.
+
+commit db33e337a867c5be8f21c7ebf6fdafaa00d02abc
+Author: Alan Coopersmith alan.coopersm...@sun.com
+Date:   Fri Jan 30 20:38:47 2009 -0800
+
+Add README with pointers to mailing list, bugzilla  git repos
+
+commit f9b88908fc94d03d91d948a67c0dc87d30f2a6a9
+Author: Alan Coopersmith alan.coopersm...@sun.com
+Date:   Fri Jan 9 16:27:44 2009 -0800
+
+Remove xorgconfig  xorgcfg from See Also list in man page
+
+commit 092f0f10cb243ef011a38a92e4eb48d424de80fa
+Author: Adam Jackson a...@redhat.com
+Date:   Sun Nov 23 20:04:30 2008 -0500
+
+Make ISA optional
+
 commit 73ff2d0cd72a165ecfb30b1620bda3b445d04409
 Author: Adam Jackson a...@redhat.com
 Date:   Wed Mar 19 13:51:44 2008 -0400
diff --git a/debian/changelog b/debian/changelog
index 73140e0..f3e0f6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-fbdev (1:0.4.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Mon, 30 Nov 2009 16:13:23 +0200
+
 xserver-xorg-video-fbdev (1:0.4.0-4) unstable; urgency=low
 
   * Upload to unstable.

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau jcris...@debian.org
Date:   Fri Sep 25 16:39:23 2009 +0200

xsfbs.mk: remove more obsolete code

We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
-   rm -rf imports
-   dh_clean debian/shlibs.local \
-debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
-   sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date +%F %X%z/)' $ $@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
-   debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+   dh_clean
 
 # Remove files from the upstream source tree that we don't need, or which have
 # licensing problems.  It must be run before creating the .orig.tar.gz.

commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau jcris...@debian.org
Date:   Fri Sep 25 15:43:28 2009 +0200

xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR

xserver-xorg-video-fbdev: Changes to 'debian-unstable'

2009-04-09 Thread Julien Cristau 
 Makefile.in|  673 -
 aclocal.m4 | 8256 -
 config.guess   | 1526 ---
 config.h.in|   69 
 config.sub | 1658 ---
 configure  |22911 -
 configure.ac   |8 
 debian/changelog   |   21 
 debian/control |   15 
 debian/rules   |   21 
 debian/xsfbs/repack.sh |   32 
 debian/xsfbs/xsfbs.mk  |   29 
 debian/xsfbs/xsfbs.sh  |   66 
 depcomp|  589 -
 install-sh |  519 -
 ltmain.sh  | 6964 --
 man/Makefile.in|  427 
 missing|  367 
 mkinstalldirs  |  161 
 src/Makefile.in|  517 -
 src/fbdev.c|   13 
 21 files changed, 108 insertions(+), 44734 deletions(-)

New commits:
commit 92bdaeeaacf3afd60024ac43d7b3cdadba0e37c1
Author: Julien Cristau jcris...@debian.org
Date:   Thu Apr 9 10:00:17 2009 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 46db0e2..73140e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-fbdev (1:0.4.0-4) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Julien Cristau jcris...@debian.org  Thu, 09 Apr 2009 10:00:03 +0100
+
 xserver-xorg-video-fbdev (1:0.4.0-3) experimental; urgency=low
 
   * Cherry-pick from upstream git: Make ISA optional.

commit 2ed171f9f390de4e97141c0016d3ba615e8c943e
Author: Julien Cristau jcris...@debian.org
Date:   Tue Feb 17 17:20:42 2009 +0100

xsfbs.sh: kill {,de}register_x_lib_dir_with_ld_so

libx11's postinst was the only post-sarge user, and it's gone now.

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 72efa95..8840ff9 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -719,72 +719,6 @@ run () {
   fi
 }
 
-register_x_lib_dir_with_ld_so () {
-  # syntax: register_x_lib_dir_with_ld_so
-  #
-  # Configure the dynamic loader ld.so to search /usr/X11R6/lib for shared
-  # libraries.
-  #
-  # Call this function from the postinst script of a package that places a
-  # shared library in /usr/X11R6/lib, before invoking ldconfig.
-
-  local dir ldsoconf
-
-  dir=/usr/X11R6/lib
-  ldsoconf=/etc/ld.so.conf
-
-  # is the line not already present?
-  if ! fgrep -qsx $dir $ldsoconf; then
-observe adding $dir directory to $ldsoconf
-echo $dir  $ldsoconf
-  fi
-}
-
-deregister_x_lib_dir_with_ld_so () {
-  # syntax: deregister_x_lib_dir_with_ld_so
-  #
-  # Configure dynamic loader ld.so to not search /usr/X11R6/lib for shared
-  # libraries, if and only if no shared libaries remain there.
-  #
-  # Call this function from the postrm script of a package that places a shared
-  # library in /usr/X11R6/lib, in the event $1 is remove, and before
-  # invoking ldconfig.
-
-  local dir ldsoconf fgrep_status cmp_status
-
-  dir=/usr/X11R6/lib
-  ldsoconf=/etc/ld.so.conf
-
-  # is the line present?
-  if fgrep -qsx $dir $ldsoconf; then
-# are there any shared objects in the directory?
-if [ $(echo $dir/lib*.so.*.*) = $dir/lib*.so.*.* ]; then
-  # glob expansion produced nothing, so no shared libraries are present
-  observe removing $dir directory from $ldsoconf
-  # rewrite the file (very carefully)
-  set +e
-  fgrep -svx $dir $ldsoconf  $ldsoconf.dpkg-tmp
-  fgrep_status=$?
-  set -e
-  case $fgrep_status in
-0|1) ;; # we don't actually care if any lines matched or not
-*) die error reading \$ldsoconf\; fgrep exited with status \
-  $fgrep_status ;;
-  esac
-  set +e
-  cmp -s $ldsoconf.dpkg-tmp $ldsoconf
-  cmp_status=$?
-  set -e
-  case $cmp_status in
-0) rm $ldsoconf.dpkg-tmp ;; # files are identical
-1) mv $ldsoconf.dpkg-tmp $ldsoconf ;; # files differ
-*) die error comparing \$ldsoconf.dpkg-tmp\ to \$ldsoconf\; \
-  cmp exited with status $cmp_status ;;
-  esac
-fi
-  fi
-}
-
 make_symlink_sane () {
   # syntax: make_symlink_sane symlink target
   #

commit 4f2833202cdf3c1b00b9fdeeb126c64b62cc8c9a
Author: Julien Cristau jcris...@debian.org
Date:   Mon Feb 2 22:04:46 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 099ae7d..46db0e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-fbdev (1:0.4.0-3) UNRELEASED; urgency=low
+xserver-xorg-video-fbdev (1:0.4.0-3) experimental; urgency=low
 
   * Cherry-pick from upstream git: Make ISA optional.
   * Run autoreconf on build; build-depend on automake, libtool, xutils-dev.
   * Handle parallel builds.
   * Build against xserver 1.6 rc.
 
- -- Julien Cristau jcris...@debian.org  Mon, 02 Feb 2009 21:47:46 +0100
+ -- Julien Cristau jcris...@debian.org  Mon, 02 Feb 2009 22:01:22 +0100
 
 xserver-xorg-video-fbdev (1:0.4.0-2) experimental; urgency=low
 

commit 8dbf389fb67f63c5aeecfea21826d27b21522262
Author: Julien Cristau

xserver-xorg-video-fbdev: Changes to 'debian-unstable'

2008-06-05 Thread Julien Cristau 
 ChangeLog|  406 +++-
 Makefile.in  |  154 +--
 aclocal.m4   |  911 ---
 config.guess |   60 -
 config.sub   |   66 +
 configure| 1845 ++-
 configure.ac |2 
 debian/changelog |   15 
 debian/compat|2 
 debian/control   |   10 
 debian/patches/01_fbdev_man.diff |8 
 debian/rules |2 
 debian/xsfbs/xsfbs-autoreconf.mk |  150 ---
 debian/xsfbs/xsfbs.mk|  121 --
 debian/xsfbs/xsfbs.sh|  394 
 depcomp  |   93 +
 install-sh   |  514 +++---
 ltmain.sh|  277 +++--
 man/Makefile.in  |   96 +-
 missing  |   61 -
 mkinstalldirs|5 
 src/Makefile.in  |  150 +--
 src/fbdev.c  |   16 
 23 files changed, 3454 insertions(+), 1904 deletions(-)

New commits:
commit 110ccde5be6ffe4b21fe4d0e041d856792a4dea6
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Jun 5 15:59:06 2008 +0200

Run dpkg-shlibdeps with --warnings=6.

Drivers reference symbols from /usr/bin/Xorg and other modules,
and that's not a bug, so we want dpkg-shlibdeps to shut up about
symbols it can't find.  Build-depend on dpkg-dev = 1.14.17.

diff --git a/debian/changelog b/debian/changelog
index cfa6d63..3afc73c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ xserver-xorg-video-fbdev (1:0.4.0-1) UNRELEASED; urgency=low
   * Drop the XS- prefix from Vcs-* control fields.
   * Add myself to Uploaders.
   * Bump debhelper compat level to 5.
+  * Run dpkg-shlibdeps with --warnings=6.  Drivers reference symbols from
+/usr/bin/Xorg and other modules, and that's not a bug, so we want
+dpkg-shlibdeps to shut up about symbols it can't find.  Build-depend on
+dpkg-dev = 1.14.17.
 
  -- Julien Cristau [EMAIL PROTECTED]  Wed, 19 Mar 2008 21:23:38 +0100
 
diff --git a/debian/control b/debian/control
index e862c1a..745b86c 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 [EMAIL PROTECTED], Brice Goglin [EMAIL 
PROTECTED], Julien Cristau [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5.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
+Build-Depends: debhelper (= 5.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, dpkg-dev (= 1.14.17)
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-fbdev
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-fbdev.git
diff --git a/debian/rules b/debian/rules
index 3c0f22c..5105d38 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,7 +78,7 @@ binary-arch: build install serverabi
dh_compress
dh_fixperms
dh_installdeb
-   dh_shlibdeps
+   dh_shlibdeps -- --warnings=6
dh_gencontrol
dh_md5sums
dh_builddeb

commit 3e0a59f6a06b404067f302e71b25e6b810b48c6a
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Jun 5 15:53:27 2008 +0200

Bump debhelper compat level to 5.

diff --git a/debian/changelog b/debian/changelog
index 1bb5a20..cfa6d63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xserver-xorg-video-fbdev (1:0.4.0-1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.7.3.
   * Drop the XS- prefix from Vcs-* control fields.
   * Add myself to Uploaders.
+  * Bump debhelper compat level to 5.
 
  -- Julien Cristau [EMAIL PROTECTED]  Wed, 19 Mar 2008 21:23:38 +0100
 
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index ccd3387..e862c1a 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 [EMAIL PROTECTED], Brice Goglin [EMAIL 
PROTECTED], Julien Cristau [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
+Build-Depends: debhelper (= 5.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.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-fbdev
 Vcs-Browser:

xserver-xorg-video-fbdev: Changes to 'debian-unstable'

2008-06-05 Thread Julien Cristau 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e57f9e7a1e99af55513962b8fcec992faa255077
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Jun 5 20:48:06 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 3afc73c..fe60dec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-fbdev (1:0.4.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-fbdev (1:0.4.0-1) unstable; urgency=low
 
   * New upstream release.
   * Refresh patch 01_fbdev_man.diff.
@@ -11,7 +11,7 @@ xserver-xorg-video-fbdev (1:0.4.0-1) UNRELEASED; urgency=low
 dpkg-shlibdeps to shut up about symbols it can't find.  Build-depend on
 dpkg-dev = 1.14.17.
 
- -- Julien Cristau [EMAIL PROTECTED]  Wed, 19 Mar 2008 21:23:38 +0100
+ -- Julien Cristau [EMAIL PROTECTED]  Thu, 05 Jun 2008 20:47:48 +0200
 
 xserver-xorg-video-fbdev (1:0.3.1-4) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

xserver-xorg-video-fbdev: Changes to 'debian-unstable'

2007-09-16 Thread David Nusinow 
 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

xserver-xorg-video-fbdev: Changes to 'debian-unstable'

2007-04-28 Thread Brice Goglin 
 debian/changelog |   11 ++-
 debian/control   |   10 ++
 debian/rules |2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)

New commits:
commit c119da55b257ecec96c6a59505c1be0b83261924
Author: Brice Goglin [EMAIL PROTECTED]
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 [EMAIL PROTECTED]  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 [EMAIL PROTECTED]  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 [EMAIL PROTECTED], Branden Robinson [EMAIL 
PROTECTED], Fabio M. Di Nitto [EMAIL PROTECTED]
-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 [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
+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:[EMAIL PROTECTED]:/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


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

xserver-xorg-video-fbdev: Changes to 'debian-unstable'

2007-04-24 Thread Timo Aaltonen 
 debian/changelog |6 +-
 debian/control   |3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 887485c2bb62daeed12420b2dd35b6ebae29e185
Author: Timo Aaltonen [EMAIL PROTECTED]
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 [EMAIL PROTECTED]  Sun, 22 Apr 2007 03:06:39 +0200
+  [ Timo Aaltonen ]
+  * Replaces/Conflicts: xserver-xorg-driver-fbdev.
+
+ -- Timo Aaltonen [EMAIL PROTECTED]  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').


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

xserver-xorg-video-fbdev: Changes to 'debian-unstable'

2007-04-21 Thread Julien Cristau 
 .gitignore   |   23 
 Makefile.in  |8 +
 aclocal.m4   |  126 +++
 autogen.sh   |   12 ++
 config.h.in  |3 
 configure|  209 ++-
 configure.ac |   10 +
 debian/changelog |   13 ++
 debian/control   |6 -
 debian/patches/01_fbdev_man.diff |   21 +++
 debian/patches/series|1 
 debian/rules |6 -
 debian/xsfbs/xsfbs.mk|   28 -
 man/Makefile.in  |   10 +
 mkinstalldirs|   89 
 src/Makefile.in  |   10 +
 src/fbdev.c  |  109 ++--
 17 files changed, 545 insertions(+), 139 deletions(-)

New commits:
commit 470fdb106245b029a5d5b62b51496e6b2bf35336
Author: Julien Cristau [EMAIL PROTECTED]
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 [EMAIL PROTECTED]  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 [EMAIL PROTECTED], Branden Robinson [EMAIL 
PROTECTED], Fabio M. Di Nitto [EMAIL PROTECTED]
-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 000..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.man2007-04-22 
03:52:00.0 +0200
 xserver-xorg-video-fbdev/man/fbdev.man 2007-04-22 03:52:49.0 
+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 000..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 [EMAIL PROTECTED](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

xserver-xorg-video-fbdev: Changes to 'debian-unstable'

2007-02-01 Thread David Nusinow 
New branch 'debian-unstable' available with the following commits:
commit a3596a2e475151b597e2744a87aff9697916fff9
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sat Dec 30 01:07:57 2006 +

* New upstream release
  + Fixes Shadowfb and rotation. Closes: #389433

commit b6665070afcec4c55e128b226c8671c800e0c7b2
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Tue Nov 7 06:46:29 2006 +

For each driver, add a symlink to xserver-xorg-core's bug script, so that 
each
new bugreport contains the user's config and log files.  Bump dependencies 
on
xserver-xorg-core to = 2:1.1.1-11, to make sure that the bug script is
present.

commit 93fb6d445e724be5d641f1e03fa8eb23203c80ff
Author: Thierry Reding [EMAIL PROTECTED]
Date:   Tue Sep 26 10:26:34 2006 +

Add some more watch files.

commit 29ef99f2ede2aab959c1335feb00e17f1818a80d
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue Sep 19 00:37:31 2006 +

Prepare changelog for upload to unstable

commit e1eb187d5937c93b1d24f75db96525d8ab9b8974
Author: Steve Langasek [EMAIL PROTECTED]
Date:   Mon Sep 18 10:49:01 2006 +

merge fbdev 7.1 video driver to trunk for upload to unstable

commit 41906a2f205375adfcbe53f20002ec027af4725b
Author: Steve Langasek [EMAIL PROTECTED]
Date:   Mon Sep 18 06:33:05 2006 +

more fixes for unversioned directory names

commit ae1e6fd22154871c7266d841fd9a1a5d69a2656d
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed Apr 5 00:10:22 2006 +

Prepare changelogs for upload to unstable

commit e5af9b2e55e09ccef1b0f948df8fb553d9ce5826
Author: David Nusinow [EMAIL PROTECTED]
Date:   Mon Feb 13 03:46:16 2006 +

Fix Branden's email address

commit a436a7dbab992d8f9e02005a36e661b1bb77de07
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Feb 12 16:24:02 2006 +

Move all install files for renaming scheme and delete v4l driver which 
doesn't currently have packaging

commit ce6150ba8a37d4aa0dfb33d20d844a8d093489d4
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Feb 10 03:40:14 2006 +

Change driver package names to new scheme

commit 53c1254b8ec061550f1f4fabe668bf2885ad4fd0
Author: David Nusinow [EMAIL PROTECTED]
Date:   Mon Jan 30 02:24:55 2006 +

Move .install files to new naming scheme for drivers

commit f6de2aa72e1d511333dd65f707c988a14d888731
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Jan 29 21:21:32 2006 +

Pull in and use xsfbs

commit 6734a99e2f34fea701629adf43ea837583d12cac
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Jan 29 20:36:06 2006 +

* Rename driver packages to be more consistent and intuitive
  + Video drivers are now named xorg-video-driver-foo and input drivers are
now named xorg-input-driver-foo
  + Video drivers provide xorg-video-driver and input drivers provide
xorg-input-driver
  + xorg-server-core depends on xorg-video-drivers-all | xorg-video-driver
and also xorg-input-drivers-all | xorg-input-drivers

commit 522cdf72933043ae1ba5eaf2ebf98573cab56cb7
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Jan 20 04:31:26 2006 +

Fix maintainer and uploader fields. God, I love sed.

commit 090c47efc496a0e100940becef362ac593f48e8a
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Jan 13 05:48:42 2006 +

Add packaging for various drivers

commit 03e8418e862b294aae67a910b32887318cff84a6
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Jan 13 04:05:21 2006 +

Update drivers in modular branch. We'll re-pull the ubuntu packaging 
properly

commit 508007844f277220850c2b616c8677357f0f57e8
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Dec 30 18:14:25 2005 +

Vendor drop of the rest of 7.0


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]