mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/patches/102_remove_flip.diff |   40 
 1 file changed, 40 insertions(+)

New commits:
commit a8d7fcd947e93eaccd011adc9aaac1c0bc61c637
Author: Timo Aaltonen 
Date:   Sun Jan 25 17:52:13 2009 +0200

Really add the patch this time.

diff --git a/debian/patches/102_remove_flip.diff 
b/debian/patches/102_remove_flip.diff
new file mode 100644
index 000..f37c375
--- /dev/null
+++ b/debian/patches/102_remove_flip.diff
@@ -0,0 +1,40 @@
+From 194d039f1efee0e666c2d1b1116fd5adea8cb942 Mon Sep 17 00:00:00 2001
+From: Kristian Høgsberg
+Date: Wed, 21  Jan  2009  16:47:01  +
+Subject: [intel] Remove remaining references to intel_wait_flips().
+
+Oops.
+---
+diff --git a/src/mesa/drivers/dri/i915/intel_tris.c 
b/src/mesa/drivers/dri/i915/intel_tris.c
+index c4708dc..e809965 100644
+--- a/src/mesa/drivers/dri/i915/intel_tris.c
 b/src/mesa/drivers/dri/i915/intel_tris.c
+@@ -92,7 +92,6 @@ static void intel_start_inline(struct intel_context *intel, 
uint32_t prim)
+BATCH_LOCALS;
+uint32_t batch_flags = LOOP_CLIPRECTS;
+ 
+-   intel_wait_flips(intel);
+intel->vtbl.emit_state(intel);
+ 
+intel->no_batch_wrap = GL_TRUE;
+@@ -214,8 +213,7 @@ void intel_flush_prim(struct intel_context *intel)
+   return;
+ 
+/* Clear the current prims out of the context state so that a batch flush
+-* flush triggered by wait_flips or emit_state doesn't loop back to
+-* flush_prim again.
++* flush triggered by emit_state doesn't loop back to flush_prim again.
+ */
+vb_bo = intel->prim.vb_bo;
+dri_bo_reference(vb_bo);
+@@ -227,8 +225,6 @@ void intel_flush_prim(struct intel_context *intel)
+   intel->prim.start_offset = ALIGN(intel->prim.start_offset, 128);
+intel->prim.flush = NULL;
+ 
+-   intel_wait_flips(intel);
+-
+intel->vtbl.emit_state(intel);
+ 
+aper_array[0] = intel->batch->buf;
+--
+cgit v0.8.1-24-ge5fb


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

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 docs/contents.html  |2 
 docs/envvars.html   |2 
 docs/helpwanted.html|   31 
 docs/news.html  |3 
 docs/relnotes-7.3.html  |4 
 docs/systems.html   |   25 
 src/glx/x11/glxcurrent.c|   46 
 src/mesa/drivers/dri/i915/i915_fragprog.c   |4 
 src/mesa/drivers/dri/i915/intel_tris.c  |6 
 src/mesa/drivers/dri/i965/brw_vs_emit.c |2 
 src/mesa/drivers/dri/i965/brw_wm.c  |   57 
 src/mesa/drivers/dri/i965/brw_wm_debug.c|4 
 src/mesa/drivers/dri/i965/brw_wm_fp.c   |4 
 src/mesa/drivers/dri/intel/intel_decode.c   |  485 ++
 src/mesa/main/texobj.c  |   14 
 src/mesa/main/texstate.c|8 
 src/mesa/swrast/s_triangle.c|   10 
 windows/VC8/mesa/gdi/gdi.vcproj |  220 ++
 windows/VC8/mesa/gdi/gdi_staticCRT.vcproj   |  261 ---
 windows/VC8/mesa/glu/glu.vcproj |  229 ++-
 windows/VC8/mesa/glu/glu_staticCRT.vcproj   | 1019 -
 windows/VC8/mesa/mesa.sln   |   18 
 windows/VC8/mesa/mesa/dosfile   | 1761 ---
 windows/VC8/mesa/mesa/dosfile2  | 1762 ---
 windows/VC8/mesa/mesa/mesa.vcproj   |  212 ++
 windows/VC8/mesa/mesa/mesa_staticCRT.vcproj | 1768 
 windows/VC8/mesa/mesa_staticCRT.sln |   46 
 windows/VC8/mesa/osmesa/osmesa.vcproj   |  228 ++-
 windows/VC8/mesa/osmesa/osmesa_staticCRT.vcproj |  240 ---
 windows/VC8/progs/demos/gears.vcproj|  213 ++
 windows/VC8/progs/demos/gears_staticCRT.vcproj  |  238 ---
 windows/VC8/progs/glut/glut.vcproj  |  219 ++
 windows/VC8/progs/glut/glut_staticCRT.vcproj|  454 --
 windows/VC8/progs/progs.sln |   10 
 windows/VC8/progs/progs_staticCRT.sln   |   31 
 35 files changed, 1821 insertions(+), 7815 deletions(-)

New commits:
commit faa6d8af59c69b0c0239f64363b170619e2a9827
Author: Brian Paul 
Date:   Thu Jan 22 09:59:04 2009 -0700

docs: set 7.3 release date

diff --git a/docs/news.html b/docs/news.html
index 784aea3..b177f3b 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -11,10 +11,11 @@
 News
 
 
-January TBD, 2009
+January 22, 2009
 
 Mesa 7.3 is released.
 This is a new development release.
+Mesa 7.4 will follow and will have bug fixes relative to 7.3.
 
 
 
diff --git a/docs/relnotes-7.3.html b/docs/relnotes-7.3.html
index 78ae00d..c083fcb 100644
--- a/docs/relnotes-7.3.html
+++ b/docs/relnotes-7.3.html
@@ -8,7 +8,7 @@
 
 
 
-Mesa 7.3 Release Notes / TBD January 2009
+Mesa 7.3 Release Notes / 22 January 2009
 
 
 Mesa 7.3 is a new development release.

commit b6c41fd9335eade8fdfc66d43a32fbf9994e4983
Author: Brian Paul 
Date:   Thu Jan 22 09:58:52 2009 -0700

docs: assorted updates, link fixes

diff --git a/docs/contents.html b/docs/contents.html
index b348d3d..1dca3a2 100644
--- a/docs/contents.html
+++ b/docs/contents.html
@@ -48,7 +48,7 @@ a:visited {
 Mailing Lists
 Bug Database
 Webmaster
-http://dri.freedesktop.org/"; target="MainFrame">Wiki
+http://dri.freedesktop.org/"; target="_parent">Mesa/DRI Wiki
 
 
 User Topics
diff --git a/docs/envvars.html b/docs/envvars.html
index 7b64dc9..7fd9fe7 100644
--- a/docs/envvars.html
+++ b/docs/envvars.html
@@ -29,7 +29,7 @@ Setting this variable automatically sets the MESA_TEX_PROG 
variable as well.
 
 
 The following are only applicable to the Xlib software driver.
-See README.X11 for details.
+See the Xlib software driver page for details.
 
 
 MESA_RGB_VISUAL - specifies the X visual and depth for RGB mode
diff --git a/docs/helpwanted.html b/docs/helpwanted.html
index 4cd92b9..34afe49 100644
--- a/docs/helpwanted.html
+++ b/docs/helpwanted.html
@@ -15,17 +15,40 @@ Here are some specific ideas and areas where help would be 
appreciated:
 
 
 
-Enable -Wstrict-aliasing=2 -fstrict-aliasing and track down aliasing
+Driver patching and testing.
+Patches are often posted to the mesa3d-dev mailing list, but aren't
+immediately checked into git because not enough people are testing them.
+Just applying patches, testing and reporting back is helpful.
+
+Driver debugging.
+There are plenty of open bugs in the bug database.
+
+Remove aliasing warnings.
+Enable gcc -Wstrict-aliasing=2 -fstrict-aliasing and track down aliasing
 issues in the code.
 
-Windows 98/NT driver building, maintenance and testing
+Windows driver building, testing and maintenance.
+The Visual Studio project files aren't always updated in a timely manner
+when new source files are added or old ones are removed.
+Fixing these tends to delay new Mesa releases.
+
+Maintenance and testing of lesser-used drivers.
+Drivers such as DOS/DJGPP, GGI, etc that aren't bein

mesa: Changes to 'debian-experimental'

[Timo Aaltonen]

 debian/changelog|6 
 docs/contents.html  |2 
 docs/envvars.html   |2 
 docs/helpwanted.html|   31 
 docs/news.html  |3 
 docs/relnotes-7.3.html  |4 
 docs/systems.html   |   25 
 src/glx/x11/glxcurrent.c|   46 
 src/mesa/drivers/dri/i915/i915_fragprog.c   |4 
 src/mesa/drivers/dri/i915/intel_tris.c  |6 
 src/mesa/drivers/dri/i965/brw_vs_emit.c |2 
 src/mesa/drivers/dri/i965/brw_wm.c  |   57 
 src/mesa/drivers/dri/i965/brw_wm_debug.c|4 
 src/mesa/drivers/dri/i965/brw_wm_fp.c   |4 
 src/mesa/drivers/dri/intel/intel_decode.c   |  485 ++
 src/mesa/main/texobj.c  |   14 
 src/mesa/main/texstate.c|8 
 src/mesa/swrast/s_triangle.c|   10 
 windows/VC8/mesa/gdi/gdi.vcproj |  220 ++
 windows/VC8/mesa/gdi/gdi_staticCRT.vcproj   |  261 ---
 windows/VC8/mesa/glu/glu.vcproj |  229 ++-
 windows/VC8/mesa/glu/glu_staticCRT.vcproj   | 1019 -
 windows/VC8/mesa/mesa.sln   |   18 
 windows/VC8/mesa/mesa/dosfile   | 1761 ---
 windows/VC8/mesa/mesa/dosfile2  | 1762 ---
 windows/VC8/mesa/mesa/mesa.vcproj   |  212 ++
 windows/VC8/mesa/mesa/mesa_staticCRT.vcproj | 1768 
 windows/VC8/mesa/mesa_staticCRT.sln |   46 
 windows/VC8/mesa/osmesa/osmesa.vcproj   |  228 ++-
 windows/VC8/mesa/osmesa/osmesa_staticCRT.vcproj |  240 ---
 windows/VC8/progs/demos/gears.vcproj|  213 ++
 windows/VC8/progs/demos/gears_staticCRT.vcproj  |  238 ---
 windows/VC8/progs/glut/glut.vcproj  |  219 ++
 windows/VC8/progs/glut/glut_staticCRT.vcproj|  454 --
 windows/VC8/progs/progs.sln |   10 
 windows/VC8/progs/progs_staticCRT.sln   |   31 
 36 files changed, 1827 insertions(+), 7815 deletions(-)

New commits:
commit a2dce491582c58673f19e55a98f0bb697ba00b40
Author: Timo Aaltonen 
Date:   Sun Jan 25 17:51:16 2009 +0200

New changelog entry for 7.3

diff --git a/debian/changelog b/debian/changelog
index b40e25b..7b5b11b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (7.3-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Timo Aaltonen   Sun, 25 Jan 2009 17:31:25 +0200
+
 mesa (7.3~rc3-1) experimental; urgency=low
 
   [ Timo Aaltonen ]

commit faa6d8af59c69b0c0239f64363b170619e2a9827
Author: Brian Paul 
Date:   Thu Jan 22 09:59:04 2009 -0700

docs: set 7.3 release date

diff --git a/docs/news.html b/docs/news.html
index 784aea3..b177f3b 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -11,10 +11,11 @@
 News
 
 
-January TBD, 2009
+January 22, 2009
 
 Mesa 7.3 is released.
 This is a new development release.
+Mesa 7.4 will follow and will have bug fixes relative to 7.3.
 
 
 
diff --git a/docs/relnotes-7.3.html b/docs/relnotes-7.3.html
index 78ae00d..c083fcb 100644
--- a/docs/relnotes-7.3.html
+++ b/docs/relnotes-7.3.html
@@ -8,7 +8,7 @@
 
 
 
-Mesa 7.3 Release Notes / TBD January 2009
+Mesa 7.3 Release Notes / 22 January 2009
 
 
 Mesa 7.3 is a new development release.

commit b6c41fd9335eade8fdfc66d43a32fbf9994e4983
Author: Brian Paul 
Date:   Thu Jan 22 09:58:52 2009 -0700

docs: assorted updates, link fixes

diff --git a/docs/contents.html b/docs/contents.html
index b348d3d..1dca3a2 100644
--- a/docs/contents.html
+++ b/docs/contents.html
@@ -48,7 +48,7 @@ a:visited {
 Mailing Lists
 Bug Database
 Webmaster
-http://dri.freedesktop.org/"; target="MainFrame">Wiki
+http://dri.freedesktop.org/"; target="_parent">Mesa/DRI Wiki
 
 
 User Topics
diff --git a/docs/envvars.html b/docs/envvars.html
index 7b64dc9..7fd9fe7 100644
--- a/docs/envvars.html
+++ b/docs/envvars.html
@@ -29,7 +29,7 @@ Setting this variable automatically sets the MESA_TEX_PROG 
variable as well.
 
 
 The following are only applicable to the Xlib software driver.
-See README.X11 for details.
+See the Xlib software driver page for details.
 
 
 MESA_RGB_VISUAL - specifies the X visual and depth for RGB mode
diff --git a/docs/helpwanted.html b/docs/helpwanted.html
index 4cd92b9..34afe49 100644
--- a/docs/helpwanted.html
+++ b/docs/helpwanted.html
@@ -15,17 +15,40 @@ Here are some specific ideas and areas where help would be 
appreciated:
 
 
 
-Enable -Wstrict-aliasing=2 -fstrict-aliasing and track down aliasing
+Driver patching and testing.
+Patches are often posted to the mesa3d-dev mailing list, but aren't
+immediately checked into git because not enough people are testing them.
+Just applying patches, testing and reporting back is helpful.
+
+Driver debugging.
+There are plenty of open bugs in t

xserver-xorg-video-intel 2:2.3.2-2+lenny6 MIGRATED to testing

[Debian testing watch]

FYI: The status of the xserver-xorg-video-intel source package
in Debian's testing distribution has changed.

  Previous version: 2:2.3.2-2+lenny5
  Current version:  2:2.3.2-2+lenny6

-- 
This email is automatically generated; the Debian Release Team
 is responsible.
See http://release.debian.org/testing-watch/ for more information.


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

xserver-xorg-video-apm: Changes to 'refs/tags/xserver-xorg-video-apm-1_1.2.1-1'

[Julien Cristau]

Tag 'xserver-xorg-video-apm-1_1.2.1-1' created by Julien Cristau 
 at 2009-01-25 18:57 +

Tagging upload of xserver-xorg-video-apm 1:1.2.1-1 to experimental.

Changes since xserver-xorg-video-apm-1_1.2.0-2:
Adam Jackson (4):
  Uninclude xf86Version.h
  Actually use the DDC results we get.
  Make ISA optional
  Stop using XVCALL macro

Dave Airlie (1):
  apm 1.2.1

Julien Cristau (7):
  Merge tag 'xf86-video-apm-1.2.1' into debian-experimental
  update changelogs for new upstream
  debian/control: wrap build-depends
  Run autoreconf at build time, and handle parallel builds.
  Delete generated files
  Build against xserver 1.6 rc1.
  Prepare changelog for upload

Paulo Cesar Pereira de Andrade (1):
  Protect xf86rush dependent code around #ifdef XF86RUSH

---
 ChangeLog|   41 
 Makefile.in  |  686 -
 aclocal.m4   | 8256 ---
 config.guess | 1526 ---
 config.h.in  |   72 
 config.sub   | 1658 ---
 configure|23584 ---
 configure.ac |   10 
 debian/changelog |   10 
 debian/control   |   16 
 debian/rules |   22 
 depcomp  |  589 -
 install-sh   |  519 -
 ltmain.sh| 6964 
 man/Makefile.in  |  435 -
 missing  |  367 
 mkinstalldirs|  161 
 src/Makefile.in  |  564 -
 src/apm.h|5 
 src/apm_driver.c |   18 
 src/apm_rush.c   |6 
 21 files changed, 109 insertions(+), 45400 deletions(-)
---


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

xserver-xorg-video-apm: Changes to 'upstream-experimental'

[Julien Cristau]

 configure.ac |   10 +-
 src/apm.h|5 ++---
 src/apm_driver.c |   18 +++---
 src/apm_rush.c   |6 +++---
 4 files changed, 29 insertions(+), 10 deletions(-)

New commits:
commit aa1df17848f6238def86a41eadb662b4480ee762
Author: Dave Airlie 
Date:   Mon Dec 22 14:12:50 2008 +1000

apm 1.2.1

diff --git a/configure.ac b/configure.ac
index d8ca647..b15f61e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-apm],
-1.2.0,
+1.2.1,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-apm)
 

commit ba440693cb40cb6eb414bbad86fea8d444bd0cac
Author: Adam Jackson 
Date:   Fri Dec 19 10:18:44 2008 -0500

Stop using XVCALL macro

diff --git a/src/apm_rush.c b/src/apm_rush.c
index 74d85a3..47645d6 100644
--- a/src/apm_rush.c
+++ b/src/apm_rush.c
@@ -569,7 +569,7 @@ ProcXF86RushOverlayPixmap(ClientPtr client)
return (BadMatch);
 }
 
-status = XVCALL(diMatchPort)(pPort, pDraw);
+status = XvdiMatchPort(pPort, pDraw);
 if (status != Success)
return status;
 
@@ -580,7 +580,7 @@ ProcXF86RushOverlayPixmap(ClientPtr client)
client->errorValue = stuff->pixmap;
return (BadPixmap);
 }
-status = XVCALL(diMatchPort)(pPort, (DrawablePtr)pPixmap);
+status = XvdiMatchPort(pPort, (DrawablePtr)pPixmap);
 if (status != Success)
return status;
 pPriv = APM_GET_PIXMAP_PRIVATE(pPixmap);
@@ -604,7 +604,7 @@ ProcXF86RushOverlayPixmap(ClientPtr client)
return BadMatch;
 
 pApm->PutImageStride = pPixmap->devKind;
-status = XVCALL(diPutImage)(client, pDraw, pPort, pGC,
+status = XvdiPutImage(client, pDraw, pPort, pGC,
stuff->src_x, stuff->src_y,
stuff->src_w, stuff->src_h,
stuff->drw_x, stuff->drw_y,

commit c0a4a2528dbaba95fec181552ccb0f00e1ede2ea
Author: Adam Jackson 
Date:   Sun Nov 23 17:50:37 2008 -0500

Make ISA optional

diff --git a/configure.ac b/configure.ac
index 9363fca..d8ca647 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,14 @@ INCLUDES="$XORG_INCS -I${sdkdir} $XF86RUSH_INCS 
"'-I$(top_srcdir)/src -I$(prefix
 AC_SUBST([CFLAGS])
 AC_SUBST([INCLUDES])
 
+save_CFLAGS="$CFLAGS"
+CFLAGS="$XORG_CFLAGS"
+AC_CHECK_DECL(xf86ConfigIsaEntity,
+ [AC_DEFINE(HAVE_ISA, 1, [Have ISA support])],
+ [],
+ [#include "xf86.h"])
+CFLAGS="$save_CFLAGS"
+
 # Checks for libraries.
 SAVE_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
diff --git a/src/apm_driver.c b/src/apm_driver.c
index 443c191..cbb2f43 100644
--- a/src/apm_driver.c
+++ b/src/apm_driver.c
@@ -82,10 +82,12 @@ static PciChipsets ApmPciChipsets[] = {
 { -1,  -1, RES_UNDEFINED }
 };
 
+#ifdef HAVE_ISA
 static IsaChipsets ApmIsaChipsets[] = {
 { PCI_CHIP_AP6422, RES_EXCLUSIVE_VGA},
 {-1,   RES_UNDEFINED}
 };
+#endif
 
 typedef enum {
 OPTION_SET_MCLK,
@@ -328,6 +330,7 @@ ApmAvailableOptions(int chipid, int busid)
 return ApmOptions;
 }
 
+#ifdef HAVE_ISA
 static int
 ApmFindIsaDevice(GDevPtr dev)
 {
@@ -376,6 +379,7 @@ ApmFindIsaDevice(GDevPtr dev)
 
 return apmChip;
 }
+#endif
 
 static void
 ApmAssignFPtr(ScrnInfoPtr pScrn)
@@ -447,6 +451,7 @@ ApmProbe(DriverPtr drv, int flags)
}
 }
 
+#ifdef HAVE_ISA
 /* Check for non-PCI cards */
 numUsed = xf86MatchIsaInstances(APM_NAME, ApmChipsets,
ApmIsaChipsets, drv, ApmFindIsaDevice, DevSections,
@@ -467,6 +472,8 @@ ApmProbe(DriverPtr drv, int flags)
}
}
 }
+#endif
+
 xfree(DevSections);
 return foundScreen;
 }

commit 33edd3514fbfbd8b36a8568dbe021d0df99e6743
Author: Adam Jackson 
Date:   Fri Aug 15 15:20:16 2008 -0400

Actually use the DDC results we get.

diff --git a/src/apm_driver.c b/src/apm_driver.c
index 9106d1f..443c191 100644
--- a/src/apm_driver.c
+++ b/src/apm_driver.c
@@ -975,8 +975,10 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
}
if (0 && !MonInfo)
MonInfo = 
xf86DoEDID_DDC1(pScrn->scrnIndex,vgaHWddc1SetSpeed,ddc1Read);
-   if (MonInfo)
+   if (MonInfo) {
xf86PrintEDID(MonInfo);
+   xf86SetDDCproperties(pScrn, MonInfo);
+   }
pScrn->monitor->DDC = MonInfo;
 }
 

commit 51ac7b1d182730ab1b9aaac412ac6cc40904bce3
Author: Adam Jackson 
Date:   Fri Aug 15 13:58:29 2008 -0400

Uninclude xf86Version.h

diff --git a/src/apm.h b/src/apm.h
index 7c0bfda..c57e9ba 100644
--- a/src/apm.h
+++ b/src/apm.h
@@ -11,9 +11,6 @@
 /* Everything using inb/outb, etc needs "compiler.h" */
 #include "compiler.h"
 
-/* This is used for module versioning */
-#include "xf86Version.h"
-
 /* Drivers for PCI hardware need this */
 #include "xf86PciInfo.h"
 

commit 230858d8b3dfc18098cb89cdee3599714ac95375
Author: Paulo Cesar Pereira de Andrade 
Date:   Mon J

xserver-xorg-video-apm: Changes to 'debian-experimental'

[Julien Cristau]

 ChangeLog|   41 
 Makefile.in  |  686 -
 aclocal.m4   | 8256 ---
 config.guess | 1526 ---
 config.h.in  |   72 
 config.sub   | 1658 ---
 configure|23584 ---
 configure.ac |   10 
 debian/changelog |   10 
 debian/control   |   16 
 debian/rules |   22 
 depcomp  |  589 -
 install-sh   |  519 -
 ltmain.sh| 6964 
 man/Makefile.in  |  435 -
 missing  |  367 
 mkinstalldirs|  161 
 src/Makefile.in  |  564 -
 src/apm.h|5 
 src/apm_driver.c |   18 
 src/apm_rush.c   |6 
 21 files changed, 109 insertions(+), 45400 deletions(-)

New commits:
commit 7fb5747fbb87980eee840d3e7c27ec38c19a9463
Author: Julien Cristau 
Date:   Sun Jan 25 19:54:47 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index ea29d97..c45a383 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-apm (1:1.2.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-apm (1:1.2.1-1) experimental; urgency=low
 
   * New upstream release.
   * Run autoreconf at build time.  Build-depend on xutils-dev, automake and
@@ -6,7 +6,7 @@ xserver-xorg-video-apm (1:1.2.1-1) UNRELEASED; urgency=low
   * Handle parallel builds.
   * Build against xserver 1.6 rc1.
 
- -- Julien Cristau   Sun, 25 Jan 2009 19:46:08 +0100
+ -- Julien Cristau   Sun, 25 Jan 2009 19:54:44 +0100
 
 xserver-xorg-video-apm (1:1.2.0-2) experimental; urgency=low
 

commit 85e4f760239683975e25691a897ff721908ebab9
Author: Julien Cristau 
Date:   Sun Jan 25 19:53:45 2009 +0100

Build against xserver 1.6 rc1.

diff --git a/debian/changelog b/debian/changelog
index a45c216..ea29d97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-apm (1:1.2.1-1) UNRELEASED; urgency=low
   * Run autoreconf at build time.  Build-depend on xutils-dev, automake and
 libtool.
   * Handle parallel builds.
+  * Build against xserver 1.6 rc1.
 
  -- Julien Cristau   Sun, 25 Jan 2009 19:46:08 +0100
 
diff --git a/debian/control b/debian/control
index addf6b7..0f99a74 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (>= 5),
  pkg-config,
  quilt,
- xserver-xorg-dev (>= 2:1.5),
+ xserver-xorg-dev (>= 2:1.5.99.901),
  x11proto-xext-dev,
  x11proto-video-dev,
  x11proto-core-dev,

commit 75cc3f589238cdbcde8030df72e410d530927d89
Author: Julien Cristau 
Date:   Sun Jan 25 19:51:05 2009 +0100

Delete generated files

diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index bc0aa46..000
--- a/Makefile.in
+++ /dev/null
@@ -1,686 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-...@set_make@
-
-#  Copyright 2005 Adam Jackson.
-#
-#  Permission is hereby granted, free of charge, to any person obtaining a
-#  copy of this software and associated documentation files (the "Software"),
-#  to deal in the Software without restriction, including without limitation
-#  on the rights to use, copy, modify, merge, publish, distribute, sub
-#  license, and/or sell copies of the Software, and to permit persons to whom
-#  the Software is furnished to do so, subject to the following conditions:
-#
-#  The above copyright notice and this permission notice (including the next
-#  paragraph) shall be included in all copies or substantial portions of the
-#  Software.
-#
-#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#  FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
-#  ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-#  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-#  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :

Processing of xserver-xorg-video-apm_1.2.1-1_amd64.changes

[Archive Administrator]

xserver-xorg-video-apm_1.2.1-1_amd64.changes uploaded successfully to localhost
along with the files:
  xserver-xorg-video-apm_1.2.1-1.dsc
  xserver-xorg-video-apm_1.2.1.orig.tar.gz
  xserver-xorg-video-apm_1.2.1-1.diff.gz
  xserver-xorg-video-apm_1.2.1-1_amd64.deb

Greetings,

Your Debian queue daemon


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

xserver-xorg-video-ark: Changes to 'upstream-experimental'

[Julien Cristau]

 configure.ac |2 +-
 src/ark_driver.c |1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit e686088ac1c4517184bbd676ec16c9bf5d010469
Author: Dave Airlie 
Date:   Mon Dec 22 15:24:57 2008 +1000

ark 0.7.1

diff --git a/configure.ac b/configure.ac
index 987ae70..5d8ec8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-ark],
-0.7.0,
+0.7.1,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-ark)
 

commit b8dc5d7f4529dfddaa0ddeac68d96de4361b05cb
Author: Adam Jackson 
Date:   Fri Aug 15 14:02:34 2008 -0400

Uninclude xf86Version.h

diff --git a/src/ark_driver.c b/src/ark_driver.c
index 9b0f797..67eb076 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -35,7 +35,6 @@
 #include "xf86_OSproc.h"
 #include "xf86Pci.h"
 #include "xf86PciInfo.h"
-#include "xf86Version.h"
 #include "xf86Resources.h"
 #include "xf86fbman.h"
 #include "xf86cmap.h"


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

xserver-xorg-video-ark: Changes to 'refs/tags/xserver-xorg-video-ark-1_0.7.1-1'

[Julien Cristau]

Tag 'xserver-xorg-video-ark-1_0.7.1-1' created by Julien Cristau 
 at 2009-01-25 19:13 +

Tagging upload of xserver-xorg-video-ark 1:0.7.1-1 to experimental.

Changes since xserver-xorg-video-ark-1_0.7.0-2:
Adam Jackson (1):
  Uninclude xf86Version.h

Dave Airlie (1):
  ark 0.7.1

Julien Cristau (7):
  Merge tag 'xf86-video-ark-0.7.1' into debian-experimental
  update changelogs for new release
  debian/control: wrap the Build-Depends field
  Run autoreconf on build and handle parallel builds.
  Delete generated files
  Build against xserver 1.6 rc1.
  Prepare changelog for upload

---
 ChangeLog|   12 
 Makefile.in  |  674 -
 aclocal.m4   | 8256 ---
 config.guess | 1526 ---
 config.h.in  |   66 
 config.sub   | 1658 ---
 configure|22964 ---
 configure.ac |2 
 debian/changelog |   10 
 debian/control   |   15 
 debian/rules |   23 
 depcomp  |  589 -
 install-sh   |  519 -
 ltmain.sh| 6964 
 missing  |  367 
 mkinstalldirs|  161 
 src/Makefile.in  |  545 -
 src/ark_driver.c |1 
 18 files changed, 52 insertions(+), 44300 deletions(-)
---


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

xserver-xorg-video-ark: Changes to 'debian-experimental'

[Julien Cristau]

 ChangeLog|   12 
 Makefile.in  |  674 -
 aclocal.m4   | 8256 ---
 config.guess | 1526 ---
 config.h.in  |   66 
 config.sub   | 1658 ---
 configure|22964 ---
 configure.ac |2 
 debian/changelog |   10 
 debian/control   |   15 
 debian/rules |   23 
 depcomp  |  589 -
 install-sh   |  519 -
 ltmain.sh| 6964 
 missing  |  367 
 mkinstalldirs|  161 
 src/Makefile.in  |  545 -
 src/ark_driver.c |1 
 18 files changed, 52 insertions(+), 44300 deletions(-)

New commits:
commit b78d8f5b8efccc04a8d3def7f26a6e9902df50e6
Author: Julien Cristau 
Date:   Sun Jan 25 20:12:51 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index df5ffab..e13ddf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-ark (1:0.7.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-ark (1:0.7.1-1) experimental; urgency=low
 
   * New upstream release.
   * Run autoreconf on build.  Build-depend on automake, libtool and
@@ -6,7 +6,7 @@ xserver-xorg-video-ark (1:0.7.1-1) UNRELEASED; urgency=low
   * Handle parallel builds.
   * Build against xserver 1.6 rc1.
 
- -- Julien Cristau   Sun, 25 Jan 2009 20:05:26 +0100
+ -- Julien Cristau   Sun, 25 Jan 2009 20:12:46 +0100
 
 xserver-xorg-video-ark (1:0.7.0-2) experimental; urgency=low
 

commit d7eb0f186e2c099fbf7e505a25e404aba8d60483
Author: Julien Cristau 
Date:   Sun Jan 25 20:12:43 2009 +0100

Build against xserver 1.6 rc1.

diff --git a/debian/changelog b/debian/changelog
index 3782e4d..df5ffab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-ark (1:0.7.1-1) UNRELEASED; urgency=low
   * Run autoreconf on build.  Build-depend on automake, libtool and
 xutils-dev.
   * Handle parallel builds.
+  * Build against xserver 1.6 rc1.
 
  -- Julien Cristau   Sun, 25 Jan 2009 20:05:26 +0100
 
diff --git a/debian/control b/debian/control
index 5e300df..60580b8 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (>= 5),
  pkg-config,
  quilt,
- xserver-xorg-dev (>= 2:1.5),
+ xserver-xorg-dev (>= 2:1.5.99.901),
  x11proto-core-dev,
  x11proto-fonts-dev,
  x11proto-randr-dev,

commit f187c6ef8dd44111ea2038cb2c554f8faa17927f
Author: Julien Cristau 
Date:   Sun Jan 25 20:12:03 2009 +0100

Delete generated files

diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 5c47de6..000
--- a/Makefile.in
+++ /dev/null
@@ -1,674 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-...@set_make@
-
-#  Copyright 2005 Adam Jackson.
-#
-#  Permission is hereby granted, free of charge, to any person obtaining a
-#  copy of this software and associated documentation files (the "Software"),
-#  to deal in the Software without restriction, including without limitation
-#  on the rights to use, copy, modify, merge, publish, distribute, sub
-#  license, and/or sell copies of the Software, and to permit persons to whom
-#  the Software is furnished to do so, subject to the following conditions:
-#
-#  The above copyright notice and this permission notice (including the next
-#  paragraph) shall be included in all copies or substantial portions of the
-#  Software.
-#
-#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#  FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
-#  ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-#  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-#  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = .
-DIST_COMMON

Processing of xserver-xorg-video-ark_0.7.1-1_amd64.changes

[Archive Administrator]

xserver-xorg-video-ark_0.7.1-1_amd64.changes uploaded successfully to localhost
along with the files:
  xserver-xorg-video-ark_0.7.1-1.dsc
  xserver-xorg-video-ark_0.7.1.orig.tar.gz
  xserver-xorg-video-ark_0.7.1-1.diff.gz
  xserver-xorg-video-ark_0.7.1-1_amd64.deb

Greetings,

Your Debian queue daemon


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

xserver-xorg-video-apm_1.2.1-1_amd64.changes ACCEPTED

[Debian Installer]

Accepted:
xserver-xorg-video-apm_1.2.1-1.diff.gz
  to pool/main/x/xserver-xorg-video-apm/xserver-xorg-video-apm_1.2.1-1.diff.gz
xserver-xorg-video-apm_1.2.1-1.dsc
  to pool/main/x/xserver-xorg-video-apm/xserver-xorg-video-apm_1.2.1-1.dsc
xserver-xorg-video-apm_1.2.1-1_amd64.deb
  to pool/main/x/xserver-xorg-video-apm/xserver-xorg-video-apm_1.2.1-1_amd64.deb
xserver-xorg-video-apm_1.2.1.orig.tar.gz
  to pool/main/x/xserver-xorg-video-apm/xserver-xorg-video-apm_1.2.1.orig.tar.gz


Override entries for your package:
xserver-xorg-video-apm_1.2.1-1.dsc - source x11
xserver-xorg-video-apm_1.2.1-1_amd64.deb - optional x11

Announcing to debian-devel-chan...@lists.debian.org


Thank you for your contribution to Debian.


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

xserver-xorg-video-ark_0.7.1-1_amd64.changes ACCEPTED

[Debian Installer]

Accepted:
xserver-xorg-video-ark_0.7.1-1.diff.gz
  to pool/main/x/xserver-xorg-video-ark/xserver-xorg-video-ark_0.7.1-1.diff.gz
xserver-xorg-video-ark_0.7.1-1.dsc
  to pool/main/x/xserver-xorg-video-ark/xserver-xorg-video-ark_0.7.1-1.dsc
xserver-xorg-video-ark_0.7.1-1_amd64.deb
  to pool/main/x/xserver-xorg-video-ark/xserver-xorg-video-ark_0.7.1-1_amd64.deb
xserver-xorg-video-ark_0.7.1.orig.tar.gz
  to pool/main/x/xserver-xorg-video-ark/xserver-xorg-video-ark_0.7.1.orig.tar.gz


Override entries for your package:
xserver-xorg-video-ark_0.7.1-1.dsc - source x11
xserver-xorg-video-ark_0.7.1-1_amd64.deb - optional x11

Announcing to debian-devel-chan...@lists.debian.org


Thank you for your contribution to Debian.


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

xserver-xorg-video-chips: Changes to 'refs/tags/xserver-xorg-video-chips-1_1.2.1-1'

[Julien Cristau]

Tag 'xserver-xorg-video-chips-1_1.2.1-1' created by Julien Cristau 
 at 2009-01-25 19:44 +

Tagging upload of xserver-xorg-video-chips 1:1.2.1-1 to experimental.

Changes since xserver-xorg-video-chips-1_1.2.0-2:
Adam Jackson (2):
  Uninclude xf86Version.h, remove some dead code.
  Make ISA optional

Dave Airlie (1):
  chips 1.2.1

Julien Cristau (8):
  Compiler warning fixes
  Merge commit '6380f6ac5924397c0be27198e9779971eb9b0086' into 
debian-experimental
  update changelogs for new upstream
  debian/control: wrap the Build-Depends field
  Run autoreconf on build, and handle parallel builds.
  Delete generated files
  Build against xserver 1.6 rc1.
  Prepare changelog for upload

---
 ChangeLog|   27 
 Makefile.in  |  683 -
 aclocal.m4   | 8256 ---
 compile  |  142 
 config.guess | 1526 ---
 config.h.in  |   72 
 config.sub   | 1658 ---
 configure|23565 ---
 configure.ac |   10 
 debian/changelog |   10 
 debian/control   |   16 
 debian/rules |   23 
 depcomp  |  589 -
 install-sh   |  519 -
 ltmain.sh| 6964 
 man/Makefile.in  |  432 -
 missing  |  367 
 mkinstalldirs|  161 
 src/Makefile.in  |  621 -
 src/ct_driver.c  |   18 
 src/ct_driver.h  |7 
 src/ct_regs.c|3 
 util/Makefile.in |  483 -
 23 files changed, 86 insertions(+), 46066 deletions(-)
---


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

xserver-xorg-video-chips: Changes to 'upstream-experimental'

[Julien Cristau]

 configure.ac|   10 +-
 src/ct_driver.c |   18 --
 src/ct_driver.h |7 ++-
 src/ct_regs.c   |3 ---
 4 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 6380f6ac5924397c0be27198e9779971eb9b0086
Author: Dave Airlie 
Date:   Mon Dec 22 14:27:11 2008 +1000

chips 1.2.1

diff --git a/configure.ac b/configure.ac
index 7dc6f0b..b4120a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-chips],
-1.2.0,
+1.2.1,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-chips)
 

commit d791ee9897108fe301e39f7daba145130d78939d
Author: Adam Jackson 
Date:   Sun Nov 23 17:48:00 2008 -0500

Make ISA optional

diff --git a/configure.ac b/configure.ac
index 776f250..7dc6f0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,14 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
 fi
 AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
 
+save_CFLAGS="$CFLAGS"
+CFLAGS="$XORG_CFLAGS"
+AC_CHECK_DECL(xf86ConfigIsaEntity,
+ [AC_DEFINE(HAVE_ISA, 1, [Have ISA support])],
+ [],
+ [#include "xf86.h"])
+CFLAGS="$save_CFLAGS"
+
 # Checks for header files.
 AC_HEADER_STDC
 
diff --git a/src/ct_driver.c b/src/ct_driver.c
index 1c791c8..4bc5e68 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 1993 by Jon Block 
  * Modified by Mike Hollick 
@@ -555,6 +554,7 @@ static PciChipsets CHIPSPCIchipsets[] = {
 { -1,   -1, RES_UNDEFINED}
 };
 
+#ifdef HAVE_ISA
 static IsaChipsets CHIPSISAchipsets[] = {
 { CHIPS_CT65520,   RES_EXCLUSIVE_VGA },
 { CHIPS_CT65525,   RES_EXCLUSIVE_VGA },
@@ -574,6 +574,7 @@ static IsaChipsets CHIPSISAchipsets[] = {
 { CHIPS_CT64300,   RES_EXCLUSIVE_VGA },
 { -1,  RES_UNDEFINED }
 };
+#endif
 
 /* The options supported by the Chips and Technologies Driver */
 typedef enum {
@@ -1040,7 +1041,8 @@ CHIPSProbe(DriverPtr drv, int flags)
xfree(usedChips);
}
 }
-
+
+#ifdef HAVE_ISA 
 /* Isa Bus */
 numUsed = xf86MatchIsaInstances(CHIPS_NAME,CHIPSChipsets,CHIPSISAchipsets,
drv,chipsFindIsaDevice,devSections,
@@ -1071,12 +1073,14 @@ CHIPSProbe(DriverPtr drv, int flags)
xfree(usedChips);
}
 }
+#endif
 
 xfree(devSections);
 return foundScreen;
 }
 #endif
 
+#ifdef HAVE_ISA
 static int
 chipsFindIsaDevice(GDevPtr dev)
 {
@@ -1160,6 +1164,7 @@ chipsFindIsaDevice(GDevPtr dev)
 }
 return found;
 }
+#endif
 
 /* Mandatory */
 Bool

commit 328be647a21f0da7b7beacd56398d780726b
Author: Adam Jackson 
Date:   Fri Aug 15 14:04:11 2008 -0400

Uninclude xf86Version.h, remove some dead code.

diff --git a/src/ct_driver.c b/src/ct_driver.c
index f88bef2..1c791c8 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -86,9 +86,6 @@
 /* Drivers that need to access the PCI config space directly need this */
 #include "xf86Pci.h"
 
-/* This is used for module versioning */
-#include "xf86Version.h"
-
 /* Standard resources are defined here */
 #include "xf86Resources.h"
 
@@ -1542,11 +1539,7 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
 
 hwp = VGAHWPTR(pScrn);
 vgaHWGetIOBase(hwp);
-#if XF86_VERSION_CURRENT > XF86_VERSION_NUMERIC(4,1,0,0,0)
 cPtr->PIOBase = hwp->PIOOffset;
-#else
- cPtr->PIOBase = 0 ; /* for old version the IO offset is global */
-#endif
 /*
  * Must allow ensure that storage for the 2nd set of vga registers is
  * allocated for dual channel cards
diff --git a/src/ct_driver.h b/src/ct_driver.h
index d2fa6f7..d8ce228 100644
--- a/src/ct_driver.h
+++ b/src/ct_driver.h
@@ -275,11 +275,7 @@ typedef struct _CHIPSRec {
 PCITAG PciTag;
 intChipset;
 EntityInfoPtr   pEnt;
-#if XF86_VERSION_CURRENT > XF86_VERSION_NUMERIC(4,1,0,0,0)
-  IOADDRESSPIOBase;
-#else
-intPIOBase; /* unused variable : here for 
compatibility reason with newer version */
-#endif
+IOADDRESS  PIOBase;
 CARD32 IOAddress;
 unsigned long  FbAddress;
 unsigned int   IOBase;
diff --git a/src/ct_regs.c b/src/ct_regs.c
index e2f62df..e9a4c20 100644
--- a/src/ct_regs.c
+++ b/src/ct_regs.c
@@ -64,9 +64,6 @@
 /* Drivers that need to access the PCI config space directly need this */
 #include "xf86Pci.h"
 
-/* This is used for module versioning */
-#include "xf86Version.h"
-
 /* Driver specific headers */
 #include "ct_driver.h"
 

commit fe599dbf5178a10b0021c1f33bed528ce3199af9
Author: Julien Cristau 
Date:   Mon Jun 2 21:32:17 2008 +0200

Compiler warning fixes

Include  for usleep(), and s/VERSION/CHIPS_&/ in one place
where it had been missed.

diff --git a/src/ct_driver.c b/src/ct_driver.c
index 725fcab..f88bef2 100644

xserver-xorg-video-chips: Changes to 'debian-experimental'

[Julien Cristau]

 ChangeLog|   27 
 Makefile.in  |  683 -
 aclocal.m4   | 8256 ---
 compile  |  142 
 config.guess | 1526 ---
 config.h.in  |   72 
 config.sub   | 1658 ---
 configure|23565 ---
 configure.ac |   10 
 debian/changelog |   10 
 debian/control   |   16 
 debian/rules |   23 
 depcomp  |  589 -
 install-sh   |  519 -
 ltmain.sh| 6964 
 man/Makefile.in  |  432 -
 missing  |  367 
 mkinstalldirs|  161 
 src/Makefile.in  |  621 -
 src/ct_driver.c  |   18 
 src/ct_driver.h  |7 
 src/ct_regs.c|3 
 util/Makefile.in |  483 -
 23 files changed, 86 insertions(+), 46066 deletions(-)

New commits:
commit d6b5d328ac0e709836bfc81bd00526c636915441
Author: Julien Cristau 
Date:   Sun Jan 25 20:43:47 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 01f70a2..ff7203a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-chips (1:1.2.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-chips (1:1.2.1-1) experimental; urgency=low
 
   * New upstream release.
   * Run autoreconf on build.  Build-depend on automake, libtool and
@@ -6,7 +6,7 @@ xserver-xorg-video-chips (1:1.2.1-1) UNRELEASED; urgency=low
   * Handle parallel builds.
   * Build against xserver 1.6 rc1.
 
- -- Julien Cristau   Sun, 25 Jan 2009 20:19:32 +0100
+ -- Julien Cristau   Sun, 25 Jan 2009 20:43:45 +0100
 
 xserver-xorg-video-chips (1:1.2.0-2) experimental; urgency=low
 

commit e292d0c8f0b178ac2431a1c1b2b336668c87598c
Author: Julien Cristau 
Date:   Sun Jan 25 20:43:43 2009 +0100

Build against xserver 1.6 rc1.

diff --git a/debian/changelog b/debian/changelog
index 2dfec9a..01f70a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-chips (1:1.2.1-1) UNRELEASED; urgency=low
   * Run autoreconf on build.  Build-depend on automake, libtool and
 xutils-dev.
   * Handle parallel builds.
+  * Build against xserver 1.6 rc1.
 
  -- Julien Cristau   Sun, 25 Jan 2009 20:19:32 +0100
 
diff --git a/debian/control b/debian/control
index 411172d..0b07d76 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (>= 5),
  pkg-config,
  quilt,
- xserver-xorg-dev (>= 2:1.5),
+ xserver-xorg-dev (>= 2:1.5.99.901),
  x11proto-video-dev,
  x11proto-core-dev,
  x11proto-fonts-dev,

commit 35c66b05eebfda8c6fa2dbdc483eec5b0e300ace
Author: Julien Cristau 
Date:   Sun Jan 25 20:36:43 2009 +0100

Delete generated files

diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 8f1a31f..000
--- a/Makefile.in
+++ /dev/null
@@ -1,683 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-...@set_make@
-
-#  Copyright 2005 Adam Jackson.
-#
-#  Permission is hereby granted, free of charge, to any person obtaining a
-#  copy of this software and associated documentation files (the "Software"),
-#  to deal in the Software without restriction, including without limitation
-#  on the rights to use, copy, modify, merge, publish, distribute, sub
-#  license, and/or sell copies of the Software, and to permit persons to whom
-#  the Software is furnished to do so, subject to the following conditions:
-#
-#  The above copyright notice and this permission notice (including the next
-#  paragraph) shall be included in all copies or substantial portions of the
-#  Software.
-#
-#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#  FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
-#  ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-#  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-#  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INS

Processing of xserver-xorg-video-chips_1.2.1-1_amd64.changes

[Archive Administrator]

xserver-xorg-video-chips_1.2.1-1_amd64.changes uploaded successfully to 
localhost
along with the files:
  xserver-xorg-video-chips_1.2.1-1.dsc
  xserver-xorg-video-chips_1.2.1.orig.tar.gz
  xserver-xorg-video-chips_1.2.1-1.diff.gz
  xserver-xorg-video-chips_1.2.1-1_amd64.deb

Greetings,

Your Debian queue daemon


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

xserver-xorg-video-chips_1.2.1-1_amd64.changes ACCEPTED

[Debian Installer]

Accepted:
xserver-xorg-video-chips_1.2.1-1.diff.gz
  to 
pool/main/x/xserver-xorg-video-chips/xserver-xorg-video-chips_1.2.1-1.diff.gz
xserver-xorg-video-chips_1.2.1-1.dsc
  to pool/main/x/xserver-xorg-video-chips/xserver-xorg-video-chips_1.2.1-1.dsc
xserver-xorg-video-chips_1.2.1-1_amd64.deb
  to 
pool/main/x/xserver-xorg-video-chips/xserver-xorg-video-chips_1.2.1-1_amd64.deb
xserver-xorg-video-chips_1.2.1.orig.tar.gz
  to 
pool/main/x/xserver-xorg-video-chips/xserver-xorg-video-chips_1.2.1.orig.tar.gz


Override entries for your package:
xserver-xorg-video-chips_1.2.1-1.dsc - source x11
xserver-xorg-video-chips_1.2.1-1_amd64.deb - optional x11

Announcing to debian-devel-chan...@lists.debian.org


Thank you for your contribution to Debian.


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

xorg: Changes to 'debian-experimental'

[Timo Aaltonen]

 debian/changelog|4 
 debian/rules|2 --
 debian/scripts/vars |   15 ---
 debian/scripts/vars.alpha   |2 --
 debian/scripts/vars.amd64   |2 --
 debian/scripts/vars.arm |2 --
 debian/scripts/vars.armeb   |2 --
 debian/scripts/vars.armel   |2 --
 debian/scripts/vars.hppa|2 --
 debian/scripts/vars.i386|2 --
 debian/scripts/vars.ia64|2 --
 debian/scripts/vars.m32r|2 --
 debian/scripts/vars.m68k|2 --
 debian/scripts/vars.mips|2 --
 debian/scripts/vars.mipsel  |2 --
 debian/scripts/vars.powerpc |2 --
 debian/scripts/vars.ppc64   |2 --
 debian/scripts/vars.s390|3 ---
 debian/scripts/vars.sh4 |2 --
 debian/scripts/vars.sparc   |2 --
 20 files changed, 4 insertions(+), 52 deletions(-)

New commits:
commit f559a6be53c343c6b0685019c9f282a07442cd2a
Author: Timo Aaltonen 
Date:   Sun Jan 25 21:38:19 2009 +0200

scripts/vars, rules: Remove scripts/vars, hasn't been used since it was 
split.

diff --git a/debian/changelog b/debian/changelog
index 152dc4b..db65547 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xorg (1:7.4~6) UNRELEASED; urgency=low
 support has been deleted from xserver 1.6.
   * scripts/vars.*: Drop mouse & kbd from input-all except for non-Linux
 archs.
+  * scripts/vars, rules: Remove scripts/vars, hasn't been used since
+it was split.
 
  -- Timo Aaltonen   Fri, 23 Jan 2009 14:53:45 +0200
 
diff --git a/debian/rules b/debian/rules
index 2bc22d5..b6595c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,8 +41,6 @@ else
  endif
 endif
 
-# Read in important variables.
-#include debian/scripts/vars
 # Read in architecture-specific variables of importance.
 include debian/scripts/vars.$(ARCH)
 
diff --git a/debian/scripts/vars b/debian/scripts/vars
deleted file mode 100755
index 747eeea..000
--- a/debian/scripts/vars
+++ /dev/null
@@ -1,15 +0,0 @@
-
-# This file is NOT a shell script.
-#
-# This file gets included by both debian/rules (make) AND the scripts in
-# debian/scripts (Bourne shell).
-#
-# SOURCE_DIR is where to cd to, before unpacking the source.
-#
-# SOURCE_TREE is the combination of SOURCE_DIR and the dir that is embedded
-# into the X tarballs.
-#
-# STAMP_DIR is where to place all the 'stamp' files that allows
-# debian/rules to know when certain targets are done.
-
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, 
xserver-xorg-input-mouse, xserver-xorg-input-synaptics, 
xserver-xorg-input-wacom, xserver-xorg-input-evtouch, 
xserver-xorg-input-elographics"

commit 3a21cf58d1f4011130561f62f315f4b187b37d82
Author: Timo Aaltonen 
Date:   Sun Jan 25 21:32:40 2009 +0200

scripts/vars.*: Drop mouse & kbd from input-all except for non-Linux archs.

diff --git a/debian/changelog b/debian/changelog
index 7faa8b4..152dc4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xorg (1:7.4~6) UNRELEASED; urgency=low
 
   * scripts/vars.sparc: Remove sunbw2 from video-all, since monochrome
 support has been deleted from xserver 1.6.
+  * scripts/vars.*: Drop mouse & kbd from input-all except for non-Linux
+archs.
 
  -- Timo Aaltonen   Fri, 23 Jan 2009 14:53:45 +0200
 
diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha
index 827b650..553b18a 100755
--- a/debian/scripts/vars.alpha
+++ b/debian/scripts/vars.alpha
@@ -33,7 +33,5 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
 # , xserver-xorg-video-glide,
 
 XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
-   xserver-xorg-input-kbd, \
-   xserver-xorg-input-mouse, \
xserver-xorg-input-synaptics, \
xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index d545c0c..b5d11a9 100755
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -33,8 +33,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
 
 
 XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
-   xserver-xorg-input-kbd, \
-   xserver-xorg-input-mouse, \
xserver-xorg-input-synaptics, \
xserver-xorg-input-wacom"
 
diff --git a/debian/scripts/vars.arm b/debian/scripts/vars.arm
index 9b20629..e267434 100755
--- a/debian/scripts/vars.arm
+++ b/debian/scripts/vars.arm
@@ -32,7 +32,5 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
 # xserver-xorg-video-glide,
 
 XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
-   xserver-xorg-input-kbd, \
-   xserver-xorg-input-mouse, \
xserver-xorg-input-synaptics, \
xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.armeb b/debian/scripts/vars.armeb
index 9b20629..e267434 100644
--- a/debian/scripts/vars.armeb
+++ b/debian/scripts/vars.armeb
@@ -32,7 +32,5 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
 # xserver-xorg-video-glide,
 
 XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
-   xserver-xorg-in

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

[Julien Cristau]

 debian/changelog |7 +++
 src/alp_driver.c |4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 93a3d1e7a0bccea672756f9d5c630186f1f097f6
Author: Julien Cristau 
Date:   Sun Jan 25 21:10:20 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 75dc827..debe7e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-cirrus (1:1.2.1-1.lenny1) unstable; urgency=high
+
+  * Cherry-pick from upstream:
+alpine: fix order of arguments of PCI_WRITE_LONG().
+
+ -- Julien Cristau   Sun, 25 Jan 2009 21:10:09 +0100
+
 xserver-xorg-video-cirrus (1:1.2.1-1) unstable; urgency=low
 
   * New upstream release.

commit 7fc4a9d2fde1c895303e311a0f39dadcff045e88
Author: Matthieu Herrb 
Date:   Tue Sep 16 23:48:07 2008 +0200

alpine: fix order of arguments of PCI_WRITE_LONG().
(cherry picked from commit d92459edcb8917d51435110f6b30a133d8ce7d52)

diff --git a/src/alp_driver.c b/src/alp_driver.c
index c5d2426..b7be5b2 100644
--- a/src/alp_driver.c
+++ b/src/alp_driver.c
@@ -591,8 +591,8 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
 * BIOSes tend to mess them up
 */
 
-   PCI_WRITE_LONG(pCir->PciInfo, 0x10, PCI_REGION_BASE(pCir->PciInfo, 0, 
REGION_MEM));
-   PCI_WRITE_LONG(pCir->PciInfo, 0x14, PCI_REGION_BASE(pCir->PciInfo, 1, 
REGION_MEM));
+   PCI_WRITE_LONG(pCir->PciInfo, PCI_REGION_BASE(pCir->PciInfo, 0, 
REGION_MEM), 0x10);
+   PCI_WRITE_LONG(pCir->PciInfo, PCI_REGION_BASE(pCir->PciInfo, 1, 
REGION_MEM), 0x14);

 }
 


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

Processing of xserver-xorg-video-cirrus_1.2.1-1.lenny1_amd64.changes

[Archive Administrator]

xserver-xorg-video-cirrus_1.2.1-1.lenny1_amd64.changes uploaded successfully to 
localhost
along with the files:
  xserver-xorg-video-cirrus_1.2.1-1.lenny1.dsc
  xserver-xorg-video-cirrus_1.2.1-1.lenny1.diff.gz
  xserver-xorg-video-cirrus_1.2.1-1.lenny1_amd64.deb

Greetings,

Your Debian queue daemon


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

xserver-xorg-video-cirrus: Changes to 'refs/tags/xserver-xorg-video-cirrus-1_1.2.1-3'

[Julien Cristau]

Tag 'xserver-xorg-video-cirrus-1_1.2.1-3' created by Julien Cristau 
 at 2009-01-25 20:41 +

Tagging upload of xserver-xorg-video-cirrus 1:1.2.1-3 to experimental.

Changes since xserver-xorg-video-cirrus-1_1.2.1-2:
Julien Cristau (8):
  Prepare changelog for upload
  Merge branch 'debian-unstable' into debian-experimental
  debian/control: wrap the Build-Depends field
  Run autoreconf on build, and handle parallel builds.
  Delete generated files
  Build against xserver 1.6 rc1.
  Add myself to Uploaders.
  Prepare changelog for upload

Matthieu Herrb (1):
  alpine: fix order of arguments of PCI_WRITE_LONG().

---
 Makefile.in  |  674 -
 aclocal.m4   | 8256 ---
 config.guess | 1526 ---
 config.h.in  |   72 
 config.sub   | 1658 ---
 configure|23296 ---
 debian/changelog |   18 
 debian/control   |   18 
 debian/rules |   23 
 depcomp  |  589 -
 install-sh   |  519 -
 ltmain.sh| 6964 
 man/Makefile.in  |  426 -
 missing  |  367 
 mkinstalldirs|  161 
 src/Makefile.in  |  671 -
 src/alp_driver.c |4 
 17 files changed, 51 insertions(+), 45191 deletions(-)
---


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

xserver-xorg-video-cirrus: Changes to 'debian-experimental'

[Julien Cristau]

 Makefile.in  |  674 -
 aclocal.m4   | 8256 ---
 config.guess | 1526 ---
 config.h.in  |   72 
 config.sub   | 1658 ---
 configure|23296 ---
 debian/changelog |   18 
 debian/control   |   18 
 debian/rules |   23 
 depcomp  |  589 -
 install-sh   |  519 -
 ltmain.sh| 6964 
 man/Makefile.in  |  426 -
 missing  |  367 
 mkinstalldirs|  161 
 src/Makefile.in  |  671 -
 src/alp_driver.c |4 
 17 files changed, 51 insertions(+), 45191 deletions(-)

New commits:
commit adadc6970fbf0a6afd671c31a0b31417108dfa1a
Author: Julien Cristau 
Date:   Sun Jan 25 21:39:33 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 88b63d0..f4ce803 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-cirrus (1:1.2.1-3) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.2.1-3) experimental; urgency=low
 
   * Merge changes from 1:1.2.1-1.lenny1.
   * Run autoreconf on build.  Build-depend on automake, libtool and
@@ -7,7 +7,7 @@ xserver-xorg-video-cirrus (1:1.2.1-3) UNRELEASED; urgency=low
   * Build against xserver 1.6 rc1.
   * Add myself to Uploaders.
 
- -- Julien Cristau   Sun, 25 Jan 2009 21:17:45 +0100
+ -- Julien Cristau   Sun, 25 Jan 2009 21:39:31 +0100
 
 xserver-xorg-video-cirrus (1:1.2.1-2) experimental; urgency=low
 

commit e51c61965859ff06bbc67f9d7decc6a4ad30caa0
Author: Julien Cristau 
Date:   Sun Jan 25 21:39:27 2009 +0100

Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index f6c1514..88b63d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xserver-xorg-video-cirrus (1:1.2.1-3) UNRELEASED; urgency=low
 xutils-dev.
   * Handle parallel builds.
   * Build against xserver 1.6 rc1.
+  * Add myself to Uploaders.
 
  -- Julien Cristau   Sun, 25 Jan 2009 21:17:45 +0100
 
diff --git a/debian/control b/debian/control
index 4480513..130c387 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-cirrus
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
-Uploaders: David Nusinow , Brice Goglin 

+Uploaders: David Nusinow , Brice Goglin 
, Julien Cristau 
 Build-Depends:
  debhelper (>= 5),
  pkg-config,

commit 2d3e738e3274eafcf9992e3703e5e8f9a0143595
Author: Julien Cristau 
Date:   Sun Jan 25 21:35:41 2009 +0100

Build against xserver 1.6 rc1.

diff --git a/debian/changelog b/debian/changelog
index 2aa4838..f6c1514 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-cirrus (1:1.2.1-3) UNRELEASED; urgency=low
   * Run autoreconf on build.  Build-depend on automake, libtool and
 xutils-dev.
   * Handle parallel builds.
+  * Build against xserver 1.6 rc1.
 
  -- Julien Cristau   Sun, 25 Jan 2009 21:17:45 +0100
 
diff --git a/debian/control b/debian/control
index 6a073aa..4480513 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (>= 5),
  pkg-config,
  quilt,
- xserver-xorg-dev (>= 2:1.5),
+ xserver-xorg-dev (>= 2:1.5.99.901),
  x11proto-video-dev,
  x11proto-core-dev,
  x11proto-fonts-dev,

commit 07b9d60b677f80ccd2654ee498ee34eed7bfbe88
Author: Julien Cristau 
Date:   Sun Jan 25 21:33:46 2009 +0100

Delete generated files

diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 3cc47f1..000
--- a/Makefile.in
+++ /dev/null
@@ -1,674 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-...@set_make@
-
-#  Copyright 2005 Adam Jackson.
-#
-#  Permission is hereby granted, free of charge, to any person obtaining a
-#  copy of this software and associated documentation files (the "Software"),
-#  to deal in the Software without restriction, including without limitation
-#  on the rights to use, copy, modify, merge, publish, distribute, sub
-#  license, and/or sell copies of the Software, and to permit persons to whom
-#  the Software is furnished to do so, subject to the following conditions:
-#
-#  The above copyright notice and this permission notice (including the next
-#  paragraph) shall be included in all copies or substantial portions of the
-#  Software.
-#
-#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#  IMPLIED, INCLUDING BUT NOT LIMITED TO TH

Processing of xserver-xorg-video-cirrus_1.2.1-3_amd64.changes

[Archive Administrator]

xserver-xorg-video-cirrus_1.2.1-3_amd64.changes uploaded successfully to 
localhost
along with the files:
  xserver-xorg-video-cirrus_1.2.1-3.dsc
  xserver-xorg-video-cirrus_1.2.1-3.diff.gz
  xserver-xorg-video-cirrus_1.2.1-3_amd64.deb

Greetings,

Your Debian queue daemon


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

xserver-xorg-video-cirrus_1.2.1-3_amd64.changes ACCEPTED

[Debian Installer]

Accepted:
xserver-xorg-video-cirrus_1.2.1-3.diff.gz
  to 
pool/main/x/xserver-xorg-video-cirrus/xserver-xorg-video-cirrus_1.2.1-3.diff.gz
xserver-xorg-video-cirrus_1.2.1-3.dsc
  to pool/main/x/xserver-xorg-video-cirrus/xserver-xorg-video-cirrus_1.2.1-3.dsc
xserver-xorg-video-cirrus_1.2.1-3_amd64.deb
  to 
pool/main/x/xserver-xorg-video-cirrus/xserver-xorg-video-cirrus_1.2.1-3_amd64.deb


Override entries for your package:
xserver-xorg-video-cirrus_1.2.1-3.dsc - source x11
xserver-xorg-video-cirrus_1.2.1-3_amd64.deb - optional x11

Announcing to debian-devel-chan...@lists.debian.org


Thank you for your contribution to Debian.


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

xserver-xorg-video-cirrus_1.2.1-1.lenny1_amd64.changes ACCEPTED

[Debian Installer]

Accepted:
xserver-xorg-video-cirrus_1.2.1-1.lenny1.diff.gz
  to 
pool/main/x/xserver-xorg-video-cirrus/xserver-xorg-video-cirrus_1.2.1-1.lenny1.diff.gz
xserver-xorg-video-cirrus_1.2.1-1.lenny1.dsc
  to 
pool/main/x/xserver-xorg-video-cirrus/xserver-xorg-video-cirrus_1.2.1-1.lenny1.dsc
xserver-xorg-video-cirrus_1.2.1-1.lenny1_amd64.deb
  to 
pool/main/x/xserver-xorg-video-cirrus/xserver-xorg-video-cirrus_1.2.1-1.lenny1_amd64.deb


Override entries for your package:
xserver-xorg-video-cirrus_1.2.1-1.lenny1.dsc - source x11
xserver-xorg-video-cirrus_1.2.1-1.lenny1_amd64.deb - optional x11

Announcing to debian-devel-chan...@lists.debian.org


Thank you for your contribution to Debian.


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

Bug#513037: RADEON can not read V_BIOS

[Mark Trammell]

Package: xorg
Version: 1.7.3+18


This is my first bug to report I hope I have doe it correctly.  When I
run Xorg configure it errors out and so X will not work

$ Xorg -configure

X.Org X Server 1.4.2
Release Date: 11 June 2008
X Protocol Version 11, Revision 0
Build Operating System: Linux Debian (xorg-server 2:1.4.2-10)
Current Operating System: Linux revelation 2.6.26-1-powerpc #1 Sat Jan
10 14:00:38 CET 2009 ppc
Build Date: 09 January 2009  03:09:36AM

Before reporting problems, check http://wiki.x.org
to make sure that you have the latest version.
Module Loader present
Markers: (--) probed, (**) from config file, (==) default setting,
(++) from command line, (!!) notice, (II) informational,
(WW) warning, (EE) error, (NI) not implemented, (??) unknown.
(==) Log file: "/var/log/Xorg.0.log", Time: Sun Jan 25 15:38:33 2009
List of video drivers:
radeonhd
radeon
r128
sis
ati
v4l
mach64
trident
sisusb
s3
chips
imstt
glint
tdfx
savage
s3virge
nv
mga
fbdev
vga
(++) Using config file: "/root/xorg.conf.new"
(WW) INVALID IO ALLOCATION b: 0xf400 e: 0xf4ff correcting
(EE) end of block range 0xefff < begin 0xf000
(EE) RADEON(0): Cannot read V_BIOS (5)


Xorg detected your mouse at device /dev/input/mice.
Please check your config if the mouse is still not
operational, as by default Xorg tries to autodetect
the protocol.

Your xorg.conf file is /root/xorg.conf.new

To test the server, run 'X -config /root/xorg.conf.new'

Bug#513037: RADEON can not read V_BIOS

[Brice Goglin]

Mark Trammell wrote:
> Package: xorg
> Version: 1.7.3+18
>
>
> This is my first bug to report I hope I have doe it correctly.  When I run 
> Xorg configure it errors out and so X will not work
>
> $ Xorg -configure
>   

Why do you use Xorg -configure? Installing Xorg package should have
generated a /etc/X11/xorg.conf that X should use to start properly.
Doesn't it work?

Anyway, we need the entire Xorg.0.log (and the corresponding xorg.conf
if one is used, for instance /etc/X11/xorg.conf or /root/xorg.conf or
so). Please send them.

By the way, please send the output of lspci -v as well. I suspect that
you're facing the well-known PCI resource miss-use on powerpc. If so,
upgrading to experimental may help.

Brice




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

xserver-xorg-video-dummy: Changes to 'upstream-experimental'

[Julien Cristau]

 configure.ac   |2 +-
 src/dummy_driver.c |3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit d876e719969e9d33e7e4502448a544f12eb0fab8
Author: Julien Cristau 
Date:   Sun Jan 25 23:25:33 2009 +0100

dummy 0.3.1

diff --git a/configure.ac b/configure.ac
index c0d0552..b365f8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-dummy],
-0.3.0,
+0.3.1,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-dummy)
 

commit 33e86171bd1815a23f35bb992a91c02785c22402
Author: Adam Jackson 
Date:   Fri Aug 15 14:05:04 2008 -0400

Uninclude xf86Version.h

diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index 02ba1d9..1f44d7e 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -11,9 +11,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 
-/* This is used for module versioning */
-#include "xf86Version.h"
-
 /* All drivers initialising the SW cursor need this */
 #include "mipointer.h"
 


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

xserver-xorg-video-dummy: Changes to 'refs/tags/xserver-xorg-video-dummy-1_0.3.1-1'

[Julien Cristau]

Tag 'xserver-xorg-video-dummy-1_0.3.1-1' created by Julien Cristau 
 at 2009-01-25 22:54 +

Tagging upload of xserver-xorg-video-dummy 1:0.3.1-1 to experimental.

Changes since xserver-xorg-video-dummy-1_0.3.0-2:
Adam Jackson (1):
  Uninclude xf86Version.h

Julien Cristau (8):
  dummy 0.3.1
  Merge tag 'xf86-video-dummy-0.3.1' into debian-experimental
  update changelogs for new upstream
  debian/control: wrap the Build-Depends field
  Run autoreconf on build and handle parallel builds.
  Build against xserver 1.6 rc1.
  delete generated files
  Prepare changelog for upload

---
 ChangeLog  |   12 
 Makefile.in|  672 -
 aclocal.m4 | 8256 ---
 config.guess   | 1526 ---
 config.h.in|   66 
 config.sub | 1658 ---
 configure  |22815 -
 configure.ac   |2 
 debian/changelog   |9 
 debian/control |   15 
 debian/rules   |   21 
 depcomp|  589 -
 install-sh |  519 -
 ltmain.sh  | 6964 
 missing|  367 
 mkinstalldirs  |  161 
 src/Makefile.in|  520 -
 src/dummy_driver.c |3 
 18 files changed, 50 insertions(+), 44125 deletions(-)
---


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

xserver-xorg-video-dummy: Changes to 'debian-experimental'

[Julien Cristau]

 ChangeLog  |   12 
 Makefile.in|  672 -
 aclocal.m4 | 8256 ---
 config.guess   | 1526 ---
 config.h.in|   66 
 config.sub | 1658 ---
 configure  |22815 -
 configure.ac   |2 
 debian/changelog   |9 
 debian/control |   15 
 debian/rules   |   21 
 depcomp|  589 -
 install-sh |  519 -
 ltmain.sh  | 6964 
 missing|  367 
 mkinstalldirs  |  161 
 src/Makefile.in|  520 -
 src/dummy_driver.c |3 
 18 files changed, 50 insertions(+), 44125 deletions(-)

New commits:
commit c9a1f864c34a3f29c9347e12515c73003a9ffd27
Author: Julien Cristau 
Date:   Sun Jan 25 23:53:42 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index f11adcd..bb4e8e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-dummy (1:0.3.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-dummy (1:0.3.1-1) experimental; urgency=low
 
   * New upstream release.
   * Run autoreconf on build; build-depend on automake, libtool and xutils-dev.
   * Handle parallel builds.
   * Build against xserver 1.6 rc1.
 
- -- Julien Cristau   Sun, 25 Jan 2009 23:43:27 +0100
+ -- Julien Cristau   Sun, 25 Jan 2009 23:53:40 +0100
 
 xserver-xorg-video-dummy (1:0.3.0-2) experimental; urgency=low
 

commit ee01044f0d0f0fc69f6cf4a12aca1949b2c05caa
Author: Julien Cristau 
Date:   Sun Jan 25 23:53:34 2009 +0100

delete generated files

diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 024a8f5..000
--- a/Makefile.in
+++ /dev/null
@@ -1,672 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-...@set_make@
-
-#  Copyright 2005 Adam Jackson.
-#
-#  Permission is hereby granted, free of charge, to any person obtaining a
-#  copy of this software and associated documentation files (the "Software"),
-#  to deal in the Software without restriction, including without limitation
-#  on the rights to use, copy, modify, merge, publish, distribute, sub
-#  license, and/or sell copies of the Software, and to permit persons to whom
-#  the Software is furnished to do so, subject to the following conditions:
-#
-#  The above copyright notice and this permission notice (including the next
-#  paragraph) shall be included in all copies or substantial portions of the
-#  Software.
-#
-#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#  FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
-#  ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-#  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-#  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = .
-DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
-   $(srcdir)/Makefile.in $(srcdir)/config.h.in \
-   $(top_srcdir)/configure COPYING ChangeLog config.guess \
-   config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-   $(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-   html-recursive info-recursive install-data-recursive \
-   install-dvi-recursive install-exec-recursive \
-   install-html-recursive install-info-recursive \
-  

Processing of xserver-xorg-video-dummy_0.3.1-1_amd64.changes

[Archive Administrator]

xserver-xorg-video-dummy_0.3.1-1_amd64.changes uploaded successfully to 
localhost
along with the files:
  xserver-xorg-video-dummy_0.3.1-1.dsc
  xserver-xorg-video-dummy_0.3.1.orig.tar.gz
  xserver-xorg-video-dummy_0.3.1-1.diff.gz
  xserver-xorg-video-dummy_0.3.1-1_amd64.deb

Greetings,

Your Debian queue daemon


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

xserver-xorg-video-dummy_0.3.1-1_amd64.changes ACCEPTED

[Debian Installer]

Accepted:
xserver-xorg-video-dummy_0.3.1-1.diff.gz
  to 
pool/main/x/xserver-xorg-video-dummy/xserver-xorg-video-dummy_0.3.1-1.diff.gz
xserver-xorg-video-dummy_0.3.1-1.dsc
  to pool/main/x/xserver-xorg-video-dummy/xserver-xorg-video-dummy_0.3.1-1.dsc
xserver-xorg-video-dummy_0.3.1-1_amd64.deb
  to 
pool/main/x/xserver-xorg-video-dummy/xserver-xorg-video-dummy_0.3.1-1_amd64.deb
xserver-xorg-video-dummy_0.3.1.orig.tar.gz
  to 
pool/main/x/xserver-xorg-video-dummy/xserver-xorg-video-dummy_0.3.1.orig.tar.gz


Override entries for your package:
xserver-xorg-video-dummy_0.3.1-1.dsc - source x11
xserver-xorg-video-dummy_0.3.1-1_amd64.deb - optional x11

Announcing to debian-devel-chan...@lists.debian.org


Thank you for your contribution to Debian.


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

xserver-xorg-video-vesa: Changes to 'debian-experimental'

[Julien Cristau]

 debian/changelog |5 +++--
 debian/control   |2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit d6e365b9fa048fafa49e98e39a39a93fef655821
Author: Julien Cristau 
Date:   Mon Jan 26 00:29:37 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 631d5f3..de5b9a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-vesa (1:2.1.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-vesa (1:2.1.0-1) experimental; urgency=low
 
   * New upstream release.
   * Allow parallel builds.
@@ -6,7 +6,7 @@ xserver-xorg-video-vesa (1:2.1.0-1) UNRELEASED; urgency=low
 xutils-dev.
   * Build against xserver 1.6 rc1.
 
- -- Julien Cristau   Fri, 09 Jan 2009 03:56:22 +0100
+ -- Julien Cristau   Mon, 26 Jan 2009 00:29:34 +0100
 
 xserver-xorg-video-vesa (1:2.0.0-2) experimental; urgency=low
 

commit ec357690bc8ea5406315075dc2682125e71fd9e5
Author: Julien Cristau 
Date:   Mon Jan 26 00:29:22 2009 +0100

Build against xserver 1.6 rc1.

diff --git a/debian/changelog b/debian/changelog
index 6724c9c..631d5f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-vesa (1:2.1.0-1) UNRELEASED; urgency=low
   * Allow parallel builds.
   * Run autoreconf on build; add build-deps on automake, libtool and
 xutils-dev.
+  * Build against xserver 1.6 rc1.
 
  -- Julien Cristau   Fri, 09 Jan 2009 03:56:22 +0100
 
diff --git a/debian/control b/debian/control
index 004719a..eb26b86 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow , Julien Cristau 
= 5.0.0),
  pkg-config,
- xserver-xorg-dev (>= 2:1.4.99.905),
+ xserver-xorg-dev (>= 2:1.5.99.901),
  x11proto-xext-dev,
  x11proto-core-dev,
  x11proto-fonts-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-vesa: Changes to 'refs/tags/xserver-xorg-video-vesa-1_2.1.0-1'

[Julien Cristau]

Tag 'xserver-xorg-video-vesa-1_2.1.0-1' created by Julien Cristau 
 at 2009-01-25 23:30 +

Tagging upload of xserver-xorg-video-vesa 1:2.1.0-1 to experimental.

Changes since xserver-xorg-video-vesa-1_2.0.0-2:
Adam Jackson (5):
  Use VBE services for DPMS instead of banging VGA registers manually.
  Warning cleanup.
  Add a TODO list.
  Default VESAValidMode to returning MODE_BAD.
  Make ISA support optional.

Dave Airlie (1):
  vesa 2.1.0

Julien Cristau (13):
  Properly define the driver version
  xsfbs.mk: fix the prepare target for parallel make
  xsfbs.mk: more parallel make fixing
  xsfbs.mk: update the list of releases, and drop some unused code
  xsfbs.mk: make 'log' a separate target
  Merge commit 'xf86-video-vesa-2.1.0' into debian-experimental
  Update changelogs
  Merge branch 'debian-unstable' of git.debian.org:/git/pkg-xorg/xsfbs into 
debian-experimental
  debian/control: wrap build-deps
  Run autoreconf on build
  Delete generated files
  Build against xserver 1.6 rc1.
  Prepare changelog for upload

Luc Verhaegen (1):
  VESASetMode: be verbose about the mode that's being set.

---
 ChangeLog |   51 
 Makefile.in   |  674 -
 aclocal.m4| 8256 -
 config.guess  | 1526 ---
 config.h.in   |   66 
 config.sub| 1658 ---
 configure |22964 --
 configure.ac  |   10 
 debian/changelog  |   10 
 debian/control|   14 
 debian/rules  |   25 
 debian/xsfbs/xsfbs.mk |   29 
 depcomp   |  589 -
 install-sh|  519 -
 ltmain.sh | 6964 ---
 man/Makefile.in   |  427 
 missing   |  367 
 mkinstalldirs |  161 
 src/Makefile.in   |  517 -
 src/vesa.c|   87 
 src/vesa.h|6 
 21 files changed, 135 insertions(+), 44785 deletions(-)
---


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

Processing of xserver-xorg-video-vesa_2.1.0-1_amd64.changes

[Archive Administrator]

xserver-xorg-video-vesa_2.1.0-1_amd64.changes uploaded successfully to localhost
along with the files:
  xserver-xorg-video-vesa_2.1.0-1.dsc
  xserver-xorg-video-vesa_2.1.0.orig.tar.gz
  xserver-xorg-video-vesa_2.1.0-1.diff.gz
  xserver-xorg-video-vesa_2.1.0-1_amd64.deb

Greetings,

Your Debian queue daemon


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

Re: moving keymap configuration out of xorg.conf

[Timo Aaltonen]

On Sat, 17 Jan 2009, Julien Cristau wrote:


Hi,

in order to make input-hotplug work with non-us keyboards, we need to
move the keymap configuration from xorg.conf to hal.
The way this is done in Ubuntu is to have that config
in /etc/default/console-setup, which is used for the console, and have a
callout script which runs on hal startup and reads that file.

So I'm thinking that we need to:
- have console-setup try to read xorg.conf on initial installation,
 and get its settings from there
- have xserver-xorg depend on console-setup
- remove the keymap configuration from xserver-xorg.postinst and
 dexconf
- profit!

In order for d-i to use console-setup, someone also needs to work on its
i18n.  I don't know if this is a prerequisite for X depending on
console-setup, or if we can start this right now.

Thoughts?  Things I forgot?


You also need the patch for hal to allow --direct so the callout works 
when hal starts:


http://cvs.fedoraproject.org/viewvc/rpms/hal/devel/hal-0.5.10-set-property-direct.patch?revision=1.1&view=markup

otherwise looks fine :)

t


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

xserver-xorg-video-vesa_2.1.0-1_amd64.changes ACCEPTED

[Debian Installer]

Accepted:
xserver-xorg-video-vesa_2.1.0-1.diff.gz
  to pool/main/x/xserver-xorg-video-vesa/xserver-xorg-video-vesa_2.1.0-1.diff.gz
xserver-xorg-video-vesa_2.1.0-1.dsc
  to pool/main/x/xserver-xorg-video-vesa/xserver-xorg-video-vesa_2.1.0-1.dsc
xserver-xorg-video-vesa_2.1.0-1_amd64.deb
  to 
pool/main/x/xserver-xorg-video-vesa/xserver-xorg-video-vesa_2.1.0-1_amd64.deb
xserver-xorg-video-vesa_2.1.0.orig.tar.gz
  to 
pool/main/x/xserver-xorg-video-vesa/xserver-xorg-video-vesa_2.1.0.orig.tar.gz


Override entries for your package:
xserver-xorg-video-vesa_2.1.0-1.dsc - source x11
xserver-xorg-video-vesa_2.1.0-1_amd64.deb - optional x11

Announcing to debian-devel-chan...@lists.debian.org


Thank you for your contribution to Debian.


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

Bug#513061: xserver-xorg: Half-working kbd and non-working touchpad

[Oleg Kostyuk]

Package: xserver-xorg
Version: 1:7.4~5
Severity: important

Hello,

After today's upgrade to lastest Xorg, I have two problems:

1) On Xorg login screen (without loggin into system), if I switch to
any tty and then back to Xorg, then touchpad is stop working at all,
and Alt key is stop working also (so I can't use Alt+E to restart
Xorg and Ctrl+Alt+BkSp to kill Xorg).
Restarting Xorg (by switching to tty and issue /etc/init.d/kdm restart)
fixes this problem.

2) After resume from suspend-to-disk touchpad stop working.
Restarting Xorg also fixes this problem.

Both problems 100%% reproduceable.

I use Debian Lenny with Xorg from experimental on Dell Studio 1535.

Now I use following versions:
xserver-common 2:1.5.99.901-2
xserver-xorg 1:7.4~5
xserver-xorg-core 2:1.5.99.901-1
xserver-xorg-input-evdev 1:2.1.1-1
xserver-xorg-input-kbd 1:1.3.2-2
xserver-xorg-input-mouse 1:1.4.0-1

Before upgrade versions was:
xserver-common 2:1.5.3-1
xserver-xorg 1:7.4~4
xserver-xorg-input-all 1:7.4~4
(not sure about other packages)


-- Package-specific info:
Contents of /var/lib/x11/X.roster:
xserver-xorg

/var/lib/x11/X.md5sum does not exist.

X server symlink status:
lrwxrwxrwx 1 root root 13 Янв 26 01:04 /etc/X11/X -> /usr/bin/Xorg
-rwxr-xr-x 1 root root 1868112 Янв 21 22:04 /usr/bin/Xorg

Contents of /var/lib/x11/xorg.conf.roster:
xserver-xorg

VGA-compatible devices on PCI bus:
00:02.0 VGA compatible controller: Intel Corporation Mobile GM965/GL960 
Integrated Graphics Controller (rev 03)

/var/lib/x11/xorg.conf.md5sum does not exist.

Xorg X server configuration file status:
-rw-r--r-- 1 root root 2598 Янв 26 02:08 /etc/X11/xorg.conf

Contents of /etc/X11/xorg.conf:
# xorg.conf (X.Org X Window System server configuration file)
#
# This file was generated by dexconf, the Debian X Configuration tool, using
# values from the debconf database.
#
# Edit this file with caution, and see the xorg.conf manual page.
# (Type "man xorg.conf" at the shell prompt.)
#
# This file is automatically updated on xserver-xorg package upgrades *only*
# if it has not been modified since the last upgrade of the xserver-xorg
# package.
#
# If you have edited this file but would like it to be automatically updated
# again, run the following command:
#   sudo dpkg-reconfigure -phigh xserver-xorg

Section "InputDevice"
Identifier  "Generic Keyboard"
Driver  "kbd"
Option  "XkbRules"  "xorg"
Option  "XkbModel"  "pc105"
Option  "XkbLayout" "us,ru"
Option  "XkbOptions""grp:alt_shift_toggle"
EndSection

Section "DRI"
Mode 0666
EndSection

Section "InputDevice"
Identifier  "Configured Mouse"
Driver  "mouse"
EndSection

Section "Device"
Identifier  "Configured Video Device"
#   Driver  "vesa"

Driver  "intel"
EndSection

Section "Monitor"
Identifier  "Configured Monitor"
EndSection

Section "Screen"
Identifier  "Default Screen"
Monitor "Configured Monitor"
SubSection "Display"
Viewport0 0
Depth   32
EndSubSection
EndSection


Xorg X server log files on system:
-rw-r--r-- 1 root root 24089 Янв 26 03:17 /var/log/Xorg.0.log

Contents of most recent Xorg X server log file
/var/log/Xorg.0.log:

This is a pre-release version of the X server from The X.Org Foundation.
It is not supported in any way.
Bugs may be filed in the bugzilla at http://bugs.freedesktop.org/.
Select the "xorg" product for bugs you find in this release.
Before reporting bugs in pre-release versions please check the
latest version in the X.Org Foundation git repository.
See http://wiki.x.org/wiki/GitPage for git access instructions.

X.Org X Server 1.5.99.901 (1.6.0 RC 1)
Release Date: (unreleased)
X Protocol Version 11, Revision 0
Build Operating System: Linux 2.6.28 x86_64 Debian
Current Operating System: Linux humsterbook 2.6.26-1-amd64 #1 SMP Sat Jan 10 
17:57:00 UTC 2009 x86_64
Build Date: 21 January 2009  08:00:45PM
xorg-server 2:1.5.99.901-1 (jcris...@debian.org) 
Before reporting problems, check http://wiki.x.org
to make sure that you have the latest version.
Markers: (--) probed, (**) from config file, (==) default setting,
(++) from command line, (!!) notice, (II) informational,
(WW) warning, (EE) error, (NI) not implemented, (??) unknown.
(==) Log file: "/var/log/Xorg.0.log", Time: Mon Jan 26 03:17:51 2009
(==) Using config file: "/etc/X11/xorg.conf"
(==) No Layout section.  Using the first Screen section.
(**) |-->Screen "Default Screen" (0)
(**) |   |-->Monitor "Configured Monitor"
(==) No device specified for screen "Default Screen".
Using the first device section listed.
(**) |   |-->Device "Configured Video Device"
(==) Automatically adding devices
(==) Automatically enabling devices
(==) No FontPath specified.  Using compiled-in default.
(==) FontPath 

Bug#513063: xserver-xorg-video-intel: Screen lockup on Dell Studio with AUO LVDS panel

[Oleg Kostyuk]

Package: xserver-xorg-video-intel
Version: 2:2.6.1-1local1
Severity: normal
Tags: patch

Hello,

Video driver for Intel cards have a bug that make system is unusable if
it's assembled with LVDS screen from AUO manufacturer. This bug is
present in Freedesktop bugs list:
  http://bugs.freedesktop.org/show_bug.cgi?id=18342

It well known and even had resolved, using this patch:
  http://bugs.freedesktop.org/attachment.cgi?id=21911

But for some reason it sill not applied not to 2.6.0, and not to 2.6.1 .
I tried to apply this patch and create local package, and it works just
fine without any problems (starting from some 2.5.nn version and up to
current experimental version, 2.6.1).

Please, apply this patch for new packages.

-- Package-specific info:
Contents of /var/lib/x11/X.roster:
xserver-xorg

/var/lib/x11/X.md5sum does not exist.

X server symlink status:
lrwxrwxrwx 1 root root 13 Янв 26 01:04 /etc/X11/X -> /usr/bin/Xorg
-rwxr-xr-x 1 root root 1868112 Янв 21 22:04 /usr/bin/Xorg

Contents of /var/lib/x11/xorg.conf.roster:
xserver-xorg

VGA-compatible devices on PCI bus:
00:02.0 VGA compatible controller: Intel Corporation Mobile GM965/GL960 
Integrated Graphics Controller (rev 03)

/var/lib/x11/xorg.conf.md5sum does not exist.

Xorg X server configuration file status:
-rw-r--r-- 1 root root 2598 Янв 26 02:08 /etc/X11/xorg.conf

Contents of /etc/X11/xorg.conf:
# xorg.conf (X.Org X Window System server configuration file)
#
# This file was generated by dexconf, the Debian X Configuration tool, using
# values from the debconf database.
#
# Edit this file with caution, and see the xorg.conf manual page.
# (Type "man xorg.conf" at the shell prompt.)
#
# This file is automatically updated on xserver-xorg package upgrades *only*
# if it has not been modified since the last upgrade of the xserver-xorg
# package.
#
# If you have edited this file but would like it to be automatically updated
# again, run the following command:
#   sudo dpkg-reconfigure -phigh xserver-xorg

Section "InputDevice"
Identifier  "Generic Keyboard"
Driver  "kbd"
Option  "XkbRules"  "xorg"
Option  "XkbModel"  "pc105"
Option  "XkbLayout" "us,ru"
Option  "XkbOptions""grp:alt_shift_toggle"
EndSection

Section "DRI"
Mode 0666
EndSection

Section "InputDevice"
Identifier  "Configured Mouse"
Driver  "mouse"
EndSection

Section "Device"
Identifier  "Configured Video Device"
#   Driver  "vesa"

Driver  "intel"

#   BusID   "PCI:0:2:0"
#   Option  "RenderAccel" "true"
#   Option  "AllowGLXWithComposite" "true"
#   Option  "HWCursor" "true"
#   Option  "DRI" "true"
#   Option  "monitor-VGA" "VGA"
#   Option  "monitor-LVDS" "LVDS"
#   Option  "DPMS" "true"

#   Option  "CacheLines" "256"
#   Option  "AccelMethod" "EXA"
#   Option  "XvMCSurfaces" "7"
#   Option  "ExaNoComposite" "true"
#   Option  "MigrationHeuristic" "greedy"
#   Option  "DRI" "true"

#   Option  "EXANoComposite" "true"
#   Option  "AccelMethod" "XAA"
#   BusID   "PCI:0:2:0"
#   Option  "MonitorLayout" "NONE,LFP+CRT"
#   Option  "DevicePresence" "true"
#   Option  "CheckLid" "false"
EndSection

Section "Monitor"
Identifier  "Configured Monitor"
#   HorizSync   31.5-125.5
#   VertRefresh 43.0-125.0
#   Option  "MaxClock"   "115.0 MHz"
#   ModeLine "1024x...@0" 64.56 1024 1056 1296 1328 768 783 791 807
#   ModeLine "1280x...@0" 83.91 1280 1312 1624 1656 800 816 824 841
#
#   ModeLine "1024x...@1"  60.80 1024 1056 1128 1272 768 768 770 796
#   ModeLine "1024x...@2"  64.56 1024 1056 1296 1328 768 783 791 807
#   ModeLine "1024x...@3"  68.25 1024 1072 1312 1408 768 770 782 808
#   ModeLine "1280x...@1"  83.46 1280 1328 1360 1337 800 803 809 810 -hsync 
+vsync
#   ModeLine "1280x...@2"  83.46 1280 1344 1480 1680 800 801 804 828 -hsync 
+vsync
#   ModeLine "1280x...@3" 108.77 1280 1360 1496 1712 800 801 804 836 -HSync 
+Vsync
EndSection

Section "Screen"
Identifier  "Default Screen"
Monitor "Configured Monitor"
SubSection "Display"
Viewport0 0
Depth   32
#FbBpp  24
#Virtual1280 800
#Modes  "1280x...@3" "1024x...@0"
EndSubSection
EndSection


Xorg X server log files on system:
-rw-r--r-- 1 root root 24089 Янв 26 03:17 /var/log/Xorg.0.log

Contents of most recent Xorg X server log file
/var/log/Xorg.0.log:

This is a pre-release version of the X server from The X.Org Foundation.
It is not supported in any way.
Bugs may be filed in the bugzilla 

Bug#513061: xserver-xorg: Half-working kbd and non-working touchpad

[Oleg Kostyuk]

Second problem seems fixed.
For some reason after installing bunch of *-dev packages (for
compiling patched video-intel driver) package
xserver-xorg-input-synaptics was deleted by aptitude. Why it was
deleted - this is another, but still interesting question. After
removing *-dev packages and reinstalling xserver-xorg-input-synaptics
touchpad working without any problems.

But first problem (non-working Alt after switching to tty and
returning to Xorg logon screen) is still here.
Btw, after logging to X behavior of Alt key is not affected by
switching to tty and back.

-- 
Sincerely yours,
Oleg Kostyuk (CUB-UANIC)



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

xserver-xorg-input-synaptics: Changes to 'refs/tags/xfree86-driver-synaptics-0.99.3-2'

[Julien Cristau]

Tag 'xfree86-driver-synaptics-0.99.3-2' created by Julien Cristau 
 at 2009-01-26 03:46 +

Tagging upload of xfree86-driver-synaptics 0.99.3-2 to experimental.

Changes since xfree86-driver-synaptics-0.99.3-1:
Brice Goglin (1):
  Update xsfbs/quilt patching rules to be compatible with the

David Nusinow (1):
  Kill the manifest code.

Julien Cristau (13):
  xsfbs.mk: make 'serverabi' depend on 'install'
  Remove xsfbs-autoreconf.mk
  Remove the .pc directory properly
  xsfbs.sh: add remove_conffile_lookup
  xsfbs.sh: use 'local' now that policy allows it
  xsfbs.mk: fix the prepare target for parallel make
  xsfbs.mk: more parallel make fixing
  xsfbs.mk: update the list of releases, and drop some unused code
  xsfbs.mk: make 'log' a separate target
  Merge branch 'debian-unstable' of git.debian.org:/git/pkg-xorg/xsfbs into 
debian-experimental
  update changelog
  Refresh patch 01-synaptics-dont-grab-if-not-on-current-VT.patch.
  Prepare changelog for upload

---
 debian/changelog |8 
 debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch |6 
 debian/xsfbs/xsfbs-autoreconf.mk |  150 ---
 debian/xsfbs/xsfbs.mk|  104 --
 debian/xsfbs/xsfbs.sh|  387 
+-
 5 files changed, 236 insertions(+), 419 deletions(-)
---


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

xserver-xorg-input-synaptics: Changes to 'debian-experimental'

[Julien Cristau]

 debian/changelog |8 
 debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch |6 
 debian/xsfbs/xsfbs-autoreconf.mk |  150 ---
 debian/xsfbs/xsfbs.mk|  104 --
 debian/xsfbs/xsfbs.sh|  387 
+-
 5 files changed, 236 insertions(+), 419 deletions(-)

New commits:
commit 4af01418b344b5bf005a6cdd7250bd27cccaaa6e
Author: Julien Cristau 
Date:   Mon Jan 26 04:43:21 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index d45f12b..51a632e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xfree86-driver-synaptics (0.99.3-2) UNRELEASED; urgency=low
+xfree86-driver-synaptics (0.99.3-2) experimental; urgency=low
 
   * Update our copy of xsfbs to get a fixed serverabi rule and generate
 Provides/Depends correctly.
   * Refresh patch 01-synaptics-dont-grab-if-not-on-current-VT.patch.
 
- -- Julien Cristau   Mon, 26 Jan 2009 04:36:36 +0100
+ -- Julien Cristau   Mon, 26 Jan 2009 04:43:08 +0100
 
 xfree86-driver-synaptics (0.99.3-1) experimental; urgency=low
 

commit 590f770c1ae474a74237301da0a414f71add87d1
Author: Julien Cristau 
Date:   Mon Jan 26 04:43:06 2009 +0100

Refresh patch 01-synaptics-dont-grab-if-not-on-current-VT.patch.

diff --git a/debian/changelog b/debian/changelog
index 4953bb0..d45f12b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xfree86-driver-synaptics (0.99.3-2) UNRELEASED; urgency=low
 
   * Update our copy of xsfbs to get a fixed serverabi rule and generate
 Provides/Depends correctly.
+  * Refresh patch 01-synaptics-dont-grab-if-not-on-current-VT.patch.
 
  -- Julien Cristau   Mon, 26 Jan 2009 04:36:36 +0100
 
diff --git a/debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch 
b/debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch
index 76be1f9..16562d0 100644
--- a/debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch
+++ b/debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch
@@ -1,8 +1,8 @@
 Index: xserver-xorg-input-synaptics/src/synaptics.c
 ===
 xserver-xorg-input-synaptics.orig/src/synaptics.c  2008-08-23 
20:07:18.227433722 +0900
-+++ xserver-xorg-input-synaptics/src/synaptics.c   2008-08-24 
12:06:27.626422532 +0900
-@@ -563,6 +563,9 @@ DeviceOn(DeviceIntPtr dev)
+--- xserver-xorg-input-synaptics.orig/src/synaptics.c
 xserver-xorg-input-synaptics/src/synaptics.c
+@@ -691,6 +691,9 @@
  
  DBG(3, ErrorF("Synaptics DeviceOn called\n"));
  

commit 35b2043f4052b35043fb88dd26d1a0c504ba55b2
Author: Julien Cristau 
Date:   Mon Jan 26 04:42:04 2009 +0100

update changelog

diff --git a/debian/changelog b/debian/changelog
index c80822e..4953bb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xfree86-driver-synaptics (0.99.3-2) UNRELEASED; urgency=low
+
+  * Update our copy of xsfbs to get a fixed serverabi rule and generate
+Provides/Depends correctly.
+
+ -- Julien Cristau   Mon, 26 Jan 2009 04:36:36 +0100
+
 xfree86-driver-synaptics (0.99.3-1) experimental; urgency=low
 
   [ Timo Aaltonen ]

commit 86e7669f5d912824e341ea487a6257ec5433eb90
Author: Julien Cristau 
Date:   Thu Jul 17 15:44:45 2008 +0200

xsfbs.mk: make 'log' a separate target

'prepare' runs genscripts, and we don't want that in unpatch,
so create stampdir/log in a separate target, and make unpatch
depend on that instead of prepare.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 984e81c..f0f8953 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -110,10 +110,15 @@ $(STAMP_DIR)/stampdir:
 .PHONY: prepare
 stampdir_targets+=prepare
 prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts
-   mkdir -p $(STAMP_DIR)/log
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
>$@
 
+.PHONY: log
+stampdir_targets+=log
+log: $(STAMP_DIR)/log
+$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
+   mkdir -p $(STAMP_DIR)/log
+
 # Apply all patches to the upstream source.
 .PHONY: patch
 stampdir_targets+=patch
@@ -140,7 +145,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
 
 # Revert all patches to the upstream source.
 .PHONY: unpatch
-unpatch: $(STAMP_DIR)/prepare
+unpatch: $(STAMP_DIR)/log
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if $(QUILT) applied >/dev/null 2>/dev/null; then \

commit 50619e730fcaf422ffa4451468520526b2a830b8
Author: Julien Cristau 
Date:   Wed Jul 16 18:42:14 2008 +0200

xsfbs.mk: update the list of releases, and drop some unused code

we haven't had a separate source tree since modularization.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 2350f80..984e81c 100755
--- a/debian/xsfbs/xsfbs.mk
+++

Processing of xfree86-driver-synaptics_0.99.3-2_amd64.changes

[Archive Administrator]

xfree86-driver-synaptics_0.99.3-2_amd64.changes uploaded successfully to 
localhost
along with the files:
  xfree86-driver-synaptics_0.99.3-2.dsc
  xfree86-driver-synaptics_0.99.3-2.diff.gz
  xfree86-driver-synaptics_0.99.3-2_amd64.deb
  xserver-xorg-input-synaptics_0.99.3-2_amd64.deb

Greetings,

Your Debian queue daemon


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

xserver-xorg-input-synaptics: Changes to 'debian-experimental'

[Julien Cristau]

 debian/changelog  |7 +++
 debian/control|8 
 debian/xfree86-driver-synaptics.README.Debian |7 ---
 3 files changed, 7 insertions(+), 15 deletions(-)

New commits:
commit 75f34c1021ec2e2f2430eb47e9a835e783a69490
Author: Julien Cristau 
Date:   Mon Jan 26 04:51:37 2009 +0100

Get rid of the xfree86-driver-synaptics transitional package.

It was already a transitional package in etch.

diff --git a/debian/changelog b/debian/changelog
index 51a632e..e533a1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xfree86-driver-synaptics (0.99.3-3) UNRELEASED; urgency=low
+
+  * Get rid of the xfree86-driver-synaptics transitional package.  It was
+already a transitional package in etch.
+
+ -- Julien Cristau   Mon, 26 Jan 2009 04:50:06 +0100
+
 xfree86-driver-synaptics (0.99.3-2) experimental; urgency=low
 
   * Update our copy of xsfbs to get a fixed serverabi rule and generate
diff --git a/debian/control b/debian/control
index c987478..471c8ab 100644
--- a/debian/control
+++ b/debian/control
@@ -9,14 +9,6 @@ Vcs-Git: 
git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synaptics.git
 Homepage: http://web.telia.com/~u89404340/touchpad/index.html
 
-Package: xfree86-driver-synaptics
-Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m68k mips mipsel 
powerpc sparc
-Depends: xserver-xorg-input-synaptics (>= 0.14.4-2)
-Description: dummy package to upgrade to X.Org new modular packages
- This is a dummy package provided to smooth upgrades from 
- xfree86-driver-synaptics to xserver-xorg-input-synaptics.
- It can be safely removed once xserver-xorg-input-synaptics is installed.
-
 Package: xserver-xorg-input-synaptics
 Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m68k mips mipsel 
powerpc sparc
 Depends: ${shlibs:Depends}, ${xserver:Depends}, libxi6
diff --git a/debian/xfree86-driver-synaptics.README.Debian 
b/debian/xfree86-driver-synaptics.README.Debian
deleted file mode 100644
index 485a96c..000
--- a/debian/xfree86-driver-synaptics.README.Debian
+++ /dev/null
@@ -1,7 +0,0 @@
-xfree86-driver-synaptics for Debian

-
-This package is superseeded by xserver-xorg-driver-synaptics and 
-can be safely removed.
-
- -- Mattia Dongili , Sun, 05 Mar 2006 21:19:06 +0100


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

Bug#513066: xserver-xorg: xorg.conf Section "Device" is missing the Driver line

[George Kirkham]

Package: xserver-xorg
Version: 1:7.3+18
Severity: important



-- Package-specific info:
Contents of /var/lib/x11/X.roster:
xserver-xorg

/var/lib/x11/X.md5sum does not exist.

X server symlink status:
lrwxrwxrwx 1 root root 13 2009-01-25 15:48 /etc/X11/X -> /usr/bin/Xorg
-rwxr-xr-x 1 root root 1718484 2009-01-09 14:11 /usr/bin/Xorg

Contents of /var/lib/x11/xorg.conf.roster:
xserver-xorg

VGA-compatible devices on PCI bus:
01:00.0 VGA compatible controller: nVidia Corporation NV44A [GeForce 6200] (rev 
a1)

/etc/X11/xorg.conf does not match checksum in /var/lib/x11/xorg.conf.md5sum.

Xorg X server configuration file status:
-rw-r--r-- 1 root root 1469 2009-01-26 13:34 /etc/X11/xorg.conf

Contents of /etc/X11/xorg.conf (as originally created by install process 
-George) 
:
# xorg.conf (X.Org X Window System server configuration file)
#
# This file was generated by dexconf, the Debian X Configuration tool, using
# values from the debconf database.
#
# Edit this file with caution, and see the xorg.conf manual page.
# (Type "man xorg.conf" at the shell prompt.)
#
# This file is automatically updated on xserver-xorg package upgrades *only*
# if it has not been modified since the last upgrade of the xserver-xorg
# package.
#
# If you have edited this file but would like it to be automatically updated
# again, run the following command:
#   sudo dpkg-reconfigure -phigh xserver-xorg

Section "InputDevice"
Identifier  "Generic Keyboard"
Driver  "kbd"
Option  "XkbRules"  "xorg"
Option  "XkbModel"  "pc104"
Option  "XkbLayout" "us"
EndSection

Section "InputDevice"
Identifier  "Configured Mouse"
Driver  "mouse"
EndSection

Section "Device"
Identifier  "Configured Video Device"
EndSection

Section "Monitor"
Identifier  "Configured Monitor"
EndSection

Section "Screen"
Identifier  "Default Screen"
Monitor "Configured Monitor"
EndSection



Xorg X server log files on system:
-rw-r--r-- 1 root root 18711 2009-01-26 14:07 /var/log/Xorg.0.log

Contents of most recent Xorg X server log file
(Warning, since finding this problem, I have installed Nvidia driver, 
downloaded 
from Nvidia, so some of this info could be irrelevant- George)

/var/log/Xorg.0.log:

X.Org X Server 1.4.2
Release Date: 11 June 2008
X Protocol Version 11, Revision 0
Build Operating System: Linux Debian (xorg-server 2:1.4.2-10)
Current Operating System: Linux tuxpc11 2.6.26-1-686 #1 SMP Sat Jan 10 18:29:31 
UTC 2009 i686
Build Date: 09 January 2009  02:57:16AM
 
Before reporting problems, check http://wiki.x.org
to make sure that you have the latest version.
Module Loader present
Markers: (--) probed, (**) from config file, (==) default setting,
(++) from command line, (!!) notice, (II) informational,
(WW) warning, (EE) error, (NI) not implemented, (??) unknown.
(==) Log file: "/var/log/Xorg.0.log", Time: Mon Jan 26 13:40:22 2009
(==) Using config file: "/etc/X11/xorg.conf"
(==) ServerLayout "Layout0"
(**) |-->Screen "Screen0" (0)
(**) |   |-->Monitor "Monitor0"
(**) |   |-->Device "Device0"
(**) |-->Input Device "Keyboard0"
(**) |-->Input Device "Mouse0"
(==) Automatically adding devices
(==) Automatically enabling devices
(WW) The directory "/usr/share/fonts/X11/cyrillic" does not exist.
Entry deleted from font path.
(==) FontPath set to:
/usr/share/fonts/X11/misc,
/usr/share/fonts/X11/100dpi/:unscaled,
/usr/share/fonts/X11/75dpi/:unscaled,
/usr/share/fonts/X11/Type1,
/usr/share/fonts/X11/100dpi,
/usr/share/fonts/X11/75dpi,
/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType
(==) RgbPath set to "/etc/X11/rgb"
(==) ModulePath set to "/usr/lib/xorg/modules"
(II) Open ACPI successful (/var/run/acpid.socket)
(II) Loader magic: 0x81e38c0
(II) Module ABI versions:
X.Org ANSI C Emulation: 0.3
X.Org Video Driver: 2.0
X.Org XInput driver : 2.0
X.Org Server Extension : 0.3
X.Org Font Renderer : 0.5
(II) Loader running on linux
(II) LoadModule: "pcidata"
(II) Loading /usr/lib/xorg/modules//libpcidata.so
(II) Module pcidata: vendor="X.Org Foundation"
compiled for 1.4.2, module version = 1.0.0
ABI class: X.Org Video Driver, version 2.0
(++) using VT number 7

(II) PCI: PCI scan (all values are in hex)
(II) PCI: 00:00:0: chip 1039,0651 card 1039,0651 rev 02 class 06,00,00 hdr 80
(II) PCI: 00:01:0: chip 1039,0001 card , rev 00 class 06,04,00 hdr 01
(II) PCI: 00:02:0: chip 1039,0962 card , rev 25 class 06,01,00 hdr 80
(II) PCI: 00:02:1: chip 1039,0016 card , rev 00 class 0c,05,00 hdr 00
(II) PCI: 00:02:5: chip 1039,5513 card 1462,5332 rev 00 class 01,01,80 hdr 00
(II) PCI: 00:02:7: chip 1039,7012 card 1462,5332 rev a0 class 04,01,00 hdr 00
(II) PCI: 00:03:0: chip 1039,7001 card 1462,5332 rev 0f class 0c,03,10 hdr 80
(II) PCI: 00:03:1

Re: xserver-xorg-input-synaptics: Changes to 'debian-experimental'

[Julien Cristau]

On Mon, 2009-01-26 at 03:52 +, Julien Cristau wrote:
> commit 75f34c1021ec2e2f2430eb47e9a835e783a69490
> Author: Julien Cristau 
> Date:   Mon Jan 26 04:51:37 2009 +0100
> 
> Get rid of the xfree86-driver-synaptics transitional package.
> 
> It was already a transitional package in etch.

On that note, Timo suggested renaming the source package to match other
input drivers.  This makes sense to me, especially since the driver is
now hosted on xorg.freedesktop.org as well.  Mattia, what do you think?

Cheers,
Julien


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

Bug#513066: marked as done (xserver-xorg: xorg.conf Section "Device" is missing the Driver line)

[Debian Bug Tracking System]

Your message dated Mon, 26 Jan 2009 05:01:26 +0100
with message-id <1232942486.10296.24.ca...@radis.liafa.jussieu.fr>
and subject line Re: Bug#513066: xserver-xorg: xorg.conf Section "Device" is 
missing the Driver line
has caused the Debian Bug report #513066,
regarding xserver-xorg: xorg.conf Section "Device" is missing the Driver line
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
513066: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=513066
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: xserver-xorg
Version: 1:7.3+18
Severity: important



-- Package-specific info:
Contents of /var/lib/x11/X.roster:
xserver-xorg

/var/lib/x11/X.md5sum does not exist.

X server symlink status:
lrwxrwxrwx 1 root root 13 2009-01-25 15:48 /etc/X11/X -> /usr/bin/Xorg
-rwxr-xr-x 1 root root 1718484 2009-01-09 14:11 /usr/bin/Xorg

Contents of /var/lib/x11/xorg.conf.roster:
xserver-xorg

VGA-compatible devices on PCI bus:
01:00.0 VGA compatible controller: nVidia Corporation NV44A [GeForce 6200] (rev 
a1)

/etc/X11/xorg.conf does not match checksum in /var/lib/x11/xorg.conf.md5sum.

Xorg X server configuration file status:
-rw-r--r-- 1 root root 1469 2009-01-26 13:34 /etc/X11/xorg.conf

Contents of /etc/X11/xorg.conf (as originally created by install process 
-George) 
:
# xorg.conf (X.Org X Window System server configuration file)
#
# This file was generated by dexconf, the Debian X Configuration tool, using
# values from the debconf database.
#
# Edit this file with caution, and see the xorg.conf manual page.
# (Type "man xorg.conf" at the shell prompt.)
#
# This file is automatically updated on xserver-xorg package upgrades *only*
# if it has not been modified since the last upgrade of the xserver-xorg
# package.
#
# If you have edited this file but would like it to be automatically updated
# again, run the following command:
#   sudo dpkg-reconfigure -phigh xserver-xorg

Section "InputDevice"
Identifier  "Generic Keyboard"
Driver  "kbd"
Option  "XkbRules"  "xorg"
Option  "XkbModel"  "pc104"
Option  "XkbLayout" "us"
EndSection

Section "InputDevice"
Identifier  "Configured Mouse"
Driver  "mouse"
EndSection

Section "Device"
Identifier  "Configured Video Device"
EndSection

Section "Monitor"
Identifier  "Configured Monitor"
EndSection

Section "Screen"
Identifier  "Default Screen"
Monitor "Configured Monitor"
EndSection



Xorg X server log files on system:
-rw-r--r-- 1 root root 18711 2009-01-26 14:07 /var/log/Xorg.0.log

Contents of most recent Xorg X server log file
(Warning, since finding this problem, I have installed Nvidia driver, 
downloaded 
from Nvidia, so some of this info could be irrelevant- George)

/var/log/Xorg.0.log:

X.Org X Server 1.4.2
Release Date: 11 June 2008
X Protocol Version 11, Revision 0
Build Operating System: Linux Debian (xorg-server 2:1.4.2-10)
Current Operating System: Linux tuxpc11 2.6.26-1-686 #1 SMP Sat Jan 10 18:29:31 
UTC 2009 i686
Build Date: 09 January 2009  02:57:16AM
 
Before reporting problems, check http://wiki.x.org
to make sure that you have the latest version.
Module Loader present
Markers: (--) probed, (**) from config file, (==) default setting,
(++) from command line, (!!) notice, (II) informational,
(WW) warning, (EE) error, (NI) not implemented, (??) unknown.
(==) Log file: "/var/log/Xorg.0.log", Time: Mon Jan 26 13:40:22 2009
(==) Using config file: "/etc/X11/xorg.conf"
(==) ServerLayout "Layout0"
(**) |-->Screen "Screen0" (0)
(**) |   |-->Monitor "Monitor0"
(**) |   |-->Device "Device0"
(**) |-->Input Device "Keyboard0"
(**) |-->Input Device "Mouse0"
(==) Automatically adding devices
(==) Automatically enabling devices
(WW) The directory "/usr/share/fonts/X11/cyrillic" does not exist.
Entry deleted from font path.
(==) FontPath set to:
/usr/share/fonts/X11/misc,
/usr/share/fonts/X11/100dpi/:unscaled,
/usr/share/fonts/X11/75dpi/:unscaled,
/usr/share/fonts/X11/Type1,
/usr/share/fonts/X11/100dpi,
/usr/share/fonts/X11/75dpi,
/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType
(==) RgbPath set to "/etc/X11/rgb"
(==) ModulePath set to "/usr/lib/xorg/modules"
(II) Open ACPI successful (/var/run/acpid.socket)
(II) Loader magic: 0x81e38c0
(II) Module ABI versions:
X.Org ANSI C Emulation: 0.3
X.Org Video Driver: 2.0
X.Org XInput driver : 2.0
X.Org Server Exten

xfree86-driver-synaptics_0.99.3-2_amd64.changes ACCEPTED

[Debian Installer]

Accepted:
xfree86-driver-synaptics_0.99.3-2.diff.gz
  to 
pool/main/x/xfree86-driver-synaptics/xfree86-driver-synaptics_0.99.3-2.diff.gz
xfree86-driver-synaptics_0.99.3-2.dsc
  to pool/main/x/xfree86-driver-synaptics/xfree86-driver-synaptics_0.99.3-2.dsc
xfree86-driver-synaptics_0.99.3-2_amd64.deb
  to 
pool/main/x/xfree86-driver-synaptics/xfree86-driver-synaptics_0.99.3-2_amd64.deb
xserver-xorg-input-synaptics_0.99.3-2_amd64.deb
  to 
pool/main/x/xfree86-driver-synaptics/xserver-xorg-input-synaptics_0.99.3-2_amd64.deb


Override entries for your package:
xfree86-driver-synaptics_0.99.3-2.dsc - source x11
xfree86-driver-synaptics_0.99.3-2_amd64.deb - optional x11
xserver-xorg-input-synaptics_0.99.3-2_amd64.deb - optional x11

Announcing to debian-devel-chan...@lists.debian.org


Thank you for your contribution to Debian.


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

Bug#513063: xserver-xorg-video-intel: Screen lockup on Dell Studio with AUO LVDS panel

[Brice Goglin]

Oleg Kostyuk wrote:
> Video driver for Intel cards have a bug that make system is unusable if
> it's assembled with LVDS screen from AUO manufacturer. This bug is
> present in Freedesktop bugs list:
>   http://bugs.freedesktop.org/show_bug.cgi?id=18342
>
> It well known and even had resolved, using this patch:
>   http://bugs.freedesktop.org/attachment.cgi?id=21911
>
> But for some reason it sill not applied not to 2.6.0, and not to 2.6.1 .
> I tried to apply this patch and create local package, and it works just
> fine without any problems (starting from some 2.5.nn version and up to
> current experimental version, 2.6.1).
>
> Please, apply this patch for new packages.
>   

Well, we're talking about experimental packages so it's not bad if one
patch is missing there, and you seem to be able to rebuild packages
anyway. I'd rather spend time making sure that the patch gets applied
upstream.

Brice




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

Re: xserver-xorg-input-synaptics: Changes to 'debian-experimental'

[Mattia Dongili]

On Mon, Jan 26, 2009 at 04:56:27AM +0100, Julien Cristau wrote:
> On Mon, 2009-01-26 at 03:52 +, Julien Cristau wrote:
> > commit 75f34c1021ec2e2f2430eb47e9a835e783a69490
> > Author: Julien Cristau 
> > Date:   Mon Jan 26 04:51:37 2009 +0100
> > 
> > Get rid of the xfree86-driver-synaptics transitional package.
> > 
> > It was already a transitional package in etch.
> 
> On that note, Timo suggested renaming the source package to match other
> input drivers.  This makes sense to me, especially since the driver is
> now hosted on xorg.freedesktop.org as well.  Mattia, what do you think?

Well, my plan was to rename the source package for lenny but, as you may
have noticed already, this has been a not-so-much-spare-time year for
me.

definitely seconded
-- 
mattia
:wq!


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

xserver-xorg-input-synaptics: Changes to 'debian-experimental'

[Timo Aaltonen]

 debian/changelog  |   10 --
 debian/control|7 +++
 debian/xserver-xorg-input-synaptics.README.Debian |   11 +--
 3 files changed, 16 insertions(+), 12 deletions(-)

New commits:
commit 9601df47f8664a60d8d113baea7361e46842aaa9
Author: Timo Aaltonen 
Date:   Mon Jan 26 09:36:47 2009 +0200

Rename the source package to xserver-xorg-input-synaptics

and clean up references to XFree86 while at it.

diff --git a/debian/changelog b/debian/changelog
index e533a1a..6542835 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
-xfree86-driver-synaptics (0.99.3-3) UNRELEASED; urgency=low
+xserver-xorg-input-synaptics (0.99.3-3) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Get rid of the xfree86-driver-synaptics transitional package.  It was
 already a transitional package in etch.
 
- -- Julien Cristau   Mon, 26 Jan 2009 04:50:06 +0100
+  [ Timo Aaltonen ]
+  * Rename the source package to xserver-xorg-input-synaptics, since 
+it's hosted on freedesktop now and to be consistent with the rest
+of the input drivers.
+
+ -- Timo Aaltonen   Mon, 26 Jan 2009 09:23:23 +0200
 
 xfree86-driver-synaptics (0.99.3-2) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 471c8ab..682cb61 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: xfree86-driver-synaptics
+Source: xserver-xorg-input-synaptics
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
@@ -7,7 +7,6 @@ Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxext-dev, 
libxi-dev, x11prot
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synaptics.git
-Homepage: http://web.telia.com/~u89404340/touchpad/index.html
 
 Package: xserver-xorg-input-synaptics
 Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m68k mips mipsel 
powerpc sparc
@@ -16,8 +15,8 @@ Conflicts: xfree86-driver-synaptics (<< 0.14.4-2), 
xorg-driver-synaptics
 Replaces: xfree86-driver-synaptics (<< 0.14.4-2), xorg-driver-synaptics
 Provides: ${xinpdriver:Provides}, xfree86-driver-synaptics, 
xorg-driver-synaptics
 Suggests: gsynaptics | ksynaptics | qsynaptics
-Description: Synaptics TouchPad driver for X.Org/XFree86 server
- This package provides an input driver for the X.Org/XFree86 X server to enable
+Description: Synaptics TouchPad driver for X.Org server
+ This package provides an input driver for the X.Org X server to enable
  advanced features of the Synaptics Touchpad including:
  .
   * Movement with adjustable, non-linear acceleration and speed
diff --git a/debian/xserver-xorg-input-synaptics.README.Debian 
b/debian/xserver-xorg-input-synaptics.README.Debian
index 02e25b7..4f676b3 100644
--- a/debian/xserver-xorg-input-synaptics.README.Debian
+++ b/debian/xserver-xorg-input-synaptics.README.Debian
@@ -1,8 +1,7 @@
-xfree86-driver-synaptics for Debian
+xserver-xorg-input-synaptics for Debian
 ---
 
-This package contains the Synaptics TouchPad driver for X.Org and XFree86 X
-server.
+This package contains the Synaptics TouchPad driver for X.Org X server.
 See also the README file for details on configuration options.
 The following notes are reported from the INSTALL instructions of upstream 
 package (by Stefan Gmeiner ), but first of all a
@@ -19,8 +18,8 @@ security notice about SHMConfig:
 Configuration
 -
 
-1. Load the driver by changing the X.Org/XFree86 configuration file
-(/etc/X11/xorg.conf or /etc/X11/XF86Config-4) through adding the line 'Load
+1. Load the driver by changing the X.Org configuration file
+(/etc/X11/xorg.conf) through adding the line 'Load
 "synaptics"' in the module section.
 
 2. Add/Replace in the InputDevice section for the touchpad the
@@ -67,7 +66,7 @@ Section "ServerLayout"
devices except one to "AlwaysCore" instead of "CorePointer".
 
 4. Start/Restart the X Server. If the touchpad doesn't work:
-   a) Check the XFree Logfiles
+   a) Check the X.Org Logfiles
b) Try to start the XServer with 'startx -- -logverbose 8' for more
   Output
 


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