xserver-xorg-video-intel: Changes to 'debian-unstable'
debian/changelog | 28 ++++++++++++++++++++++
debian/control | 4 +--
debian/xserver-xorg-video-intel.install.hurd-i386 | 1
3 files changed, 31 insertions(+), 2 deletions(-)
New commits:
commit 0d93368115d7323ef4883e06017e35bc9eec39ef
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Sep 16 16:34:51 2007 -0400
Fix merge goof
diff --git a/debian/changelog b/debian/changelog
index 0dd233a..07ec2f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.1.1-4) unstable; urgency=low
+
+ * Upload to unstable
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 16 Sep 2007 16:34:39 -0400
+
xserver-xorg-video-intel (2:2.1.1-3) experimental; urgency=low
* Shorten the short description of the -dbg package a bit (thanks, Marc 'HE'
commit 83052a6a4fa07319dc901a65242d345ce629d2d7
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Sep 12 11:21:59 2007 +0200
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index 1412ccb..0dd233a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-intel (2:2.1.1-3) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.1.1-3) experimental; urgency=low
* Shorten the short description of the -dbg package a bit (thanks, Marc 'HE'
Brockschmidt).
* Rebuild for xserver 1.4.
- -- Julien Cristau <jcristau@debian.org> Thu, 06 Sep 2007 19:00:48 +0200
+ -- Julien Cristau <jcristau@debian.org> Wed, 12 Sep 2007 11:21:49 +0200
xserver-xorg-video-intel (2:2.1.1-2) experimental; urgency=low
commit f388a3ec0dfe75f6cd91330708addbb166b896a4
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Sep 6 19:01:10 2007 +0200
Rebuild for xserver 1.4.
diff --git a/debian/changelog b/debian/changelog
index 21d0314..1412ccb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-video-intel (2:2.1.1-3) UNRELEASED; urgency=low
* Shorten the short description of the -dbg package a bit (thanks, Marc 'HE'
Brockschmidt).
+ * Rebuild for xserver 1.4.
- -- Julien Cristau <jcristau@debian.org> Wed, 05 Sep 2007 17:13:46 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 06 Sep 2007 19:00:48 +0200
xserver-xorg-video-intel (2:2.1.1-2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index cd3b0b6..24ac723 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Drew Parsons <dparsons@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 5), quilt, pkg-config, xserver-xorg-dev (>= 2:1.3.99.0), x11proto-gl-dev, x11proto-video-dev, libgl1-mesa-dev | libgl-dev, libxvmc-dev (>= 1:1.0.1-1), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xinerama-dev, libdrm-dev (>= 2.2) [!hurd-i386], x11proto-xf86dri-dev
+Build-Depends: debhelper (>= 5), quilt, pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-gl-dev, x11proto-video-dev, libgl1-mesa-dev | libgl-dev, libxvmc-dev (>= 1:1.0.1-1), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xinerama-dev, libdrm-dev (>= 2.2) [!hurd-i386], x11proto-xf86dri-dev
Standards-Version: 3.7.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.git
commit 31d5ed26bf2a70f538517ed0354865f074386249
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Sep 5 17:14:37 2007 +0200
Shorten the description of the -dbg package to fit in changes files.
diff --git a/debian/changelog b/debian/changelog
index a2591c7..21d0314 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.1.1-3) UNRELEASED; urgency=low
+
+ * Shorten the short description of the -dbg package a bit (thanks, Marc 'HE'
+ Brockschmidt).
+
+ -- Julien Cristau <jcristau@debian.org> Wed, 05 Sep 2007 17:13:46 +0200
+
xserver-xorg-video-intel (2:2.1.1-2) experimental; urgency=low
[ Julien Cristau ]
diff --git a/debian/control b/debian/control
index f0eea0d..cd3b0b6 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Package: xserver-xorg-video-intel-dbg
Architecture: any
Depends: xserver-xorg-video-intel (= ${binary:Version})
Priority: extra
-Description: X.Org X server -- Intel i8xx, i9xx display driver (debugging symbols)
+Description: X.Org X server -- Intel i8xx, i9xx display driver (debug symbols)
This driver provides support for the Intel i8xx and i9xx family of chipsets,
including i810, i815, i830, i845, i855, i865, i915, and i945 series chips,
and XvMC (XVideo Motion Compensation) support for the same chipsets.
commit 718683163cb93e5d782eaa08dc73e9489ad5351f
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Aug 19 03:21:35 2007 +0200
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index 209cf4b..a2591c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.1.1-2) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.1.1-2) experimental; urgency=low
[ Julien Cristau ]
* Build against xserver 1.3.99.0.
@@ -10,7 +10,7 @@ xserver-xorg-video-intel (2:2.1.1-2) UNRELEASED; urgency=low
the intel driver is the proper driver to load when no driver is specified
in xorg.conf.
- -- Julien Cristau <jcristau@debian.org> Sat, 18 Aug 2007 11:01:43 +0200
+ -- Julien Cristau <jcristau@debian.org> Sun, 19 Aug 2007 03:21:24 +0200
xserver-xorg-video-intel (2:2.1.1-1) unstable; urgency=low
commit 9ea2e545aa6d5fb99321185ee911c1e16ca357d7
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Aug 19 03:21:00 2007 +0200
Also install the pci id list on hurd-i386.
diff --git a/debian/xserver-xorg-video-intel.install.hurd-i386 b/debian/xserver-xorg-video-intel.install.hurd-i386
index daf7bfe..a8fac35 100644
--- a/debian/xserver-xorg-video-intel.install.hurd-i386
+++ b/debian/xserver-xorg-video-intel.install.hurd-i386
@@ -1 +1,2 @@
usr/lib/xorg/modules/drivers/*.so
+usr/share/xserver-xorg/pci/*
commit 3935b9b414f9cd02ad83bc7c9ed933d325428a81
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Aug 18 11:03:27 2007 +0200
Build against xserver 1.3.99.0.
diff --git a/debian/changelog b/debian/changelog
index 8e67403..209cf4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+xserver-xorg-video-intel (2:2.1.1-2) UNRELEASED; urgency=low
+
+ [ Julien Cristau ]
+ * Build against xserver 1.3.99.0.
+
+ [ David Nusinow ]
+ * Add 01_gen_pci_ids.diff. This patch has the driver generate a list of pci
+ id's that it supports and installs it where the X server can find it. The
+ server with appropriate support will be able to automatically determine if
+ the intel driver is the proper driver to load when no driver is specified
+ in xorg.conf.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 18 Aug 2007 11:01:43 +0200
+
xserver-xorg-video-intel (2:2.1.1-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index eb2c2d7..f0eea0d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Drew Parsons <dparsons@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 5), quilt, pkg-config, xserver-xorg-dev (>= 2:1.3.0.0), x11proto-gl-dev, x11proto-video-dev, libgl1-mesa-dev | libgl-dev, libxvmc-dev (>= 1:1.0.1-1), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xinerama-dev, libdrm-dev (>= 2.2) [!hurd-i386], x11proto-xf86dri-dev
+Build-Depends: debhelper (>= 5), quilt, pkg-config, xserver-xorg-dev (>= 2:1.3.99.0), x11proto-gl-dev, x11proto-video-dev, libgl1-mesa-dev | libgl-dev, libxvmc-dev (>= 1:1.0.1-1), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xinerama-dev, libdrm-dev (>= 2.2) [!hurd-i386], x11proto-xf86dri-dev
Standards-Version: 3.7.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.git
Reply to: