xserver-xorg-video-intel: Changes to 'debian-experimental'
debian/changelog | 2 +
debian/control | 4 +--
debian/copyright | 37 ----------------------------
debian/rules | 2 -
debian/xserver-xorg-video-intel-dbg.install | 1
5 files changed, 4 insertions(+), 42 deletions(-)
New commits:
commit 9113291f5b7bbd33746937d56fe9654d887c2e0b
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Mar 16 20:48:16 2010 +0100
intel_reg_dumper is not built from xf86-video-intel anymore
* Drop the relevant code and copyrights
* Recommends intel-gpu-tools in xserver-xorg-video-intel-dbg
diff --git a/debian/changelog b/debian/changelog
index 6c88e00..093eefe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ xserver-xorg-video-intel (2:2.10.902-1) UNRELEASED; urgency=low
* Bump libdrm build dependency to 2.4.18-3 for latest i915 drm headers.
* Build depend on libx11-xcb-dev, libxcb-aux0-dev and libxcb-dri2-0-dev
for XVMC.
+ * Recommends intel-gpu-tools since intel_reg_dumper is not provided
+ by xserver-xorg-video-intel-dbg anymore.
-- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:17 +0000
diff --git a/debian/control b/debian/control
index f870c14..2f08f17 100644
--- a/debian/control
+++ b/debian/control
@@ -62,11 +62,11 @@ Description: X.Org X server -- Intel i8xx, i9xx display driver
Package: xserver-xorg-video-intel-dbg
Architecture: amd64 hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 netbsd-i386
Depends: xserver-xorg-video-intel (= ${binary:Version}), ${shlibs:Depends}
+Recommends: intel-gpu-tools
Section: debug
Priority: extra
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.
.
- This package provides debugging symbols for this Xorg X driver, and the
- intel_reg_dumper helper.
+ This package provides debugging symbols for this Xorg X driver.
diff --git a/debian/copyright b/debian/copyright
index a4c83af..3c1e367 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -210,10 +210,6 @@ src/i830_hwmc.c
src/i830_quirks.c
src/xvmc/intel_xvmc.c
src/xvmc/intel_xvmc.h
-src/reg_dumper/idle.c
-src/reg_dumper/stepping.c
-src/reg_dumper/main.c
-src/reg_dumper/reg_dumper.h
* Copyright 2007 Dave Mueller
src/tfp410/tfp410.c
@@ -356,38 +352,6 @@ but with an additional advertising clause:
====
-src/reg_dumper/xprintf.c is covered by a license similar to the MIT/X11 license,
-but with an additional advertising clause:
-
--
- * Copyright (c) 2004 Alexander Gottwald
- *
- * 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
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * 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 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 NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) 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.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
--
-
-====
-
All files generated by the buildsystem toolchain (e.g. autogen.sh) remain
under the copyright of their authors from the respective tools.
@@ -397,7 +361,6 @@ under the copyright of their authors from the respective tools.
A couple of files are without explicit copyright:
Some tiny Makefile.am:
-src/reg_dumper/Makefile.am
src/xvmc/Makefile.am
src/ch7017/Makefile.am
src/tfp410/Makefile.am
diff --git a/debian/rules b/debian/rules
index f1c550f..4597ee3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,8 +75,6 @@ install: build
dh_installdirs
cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
- install -d $(CURDIR)/debian/tmp/usr/bin
- install -m 755 build/src/reg_dumper/intel_reg_dumper $(CURDIR)/debian/tmp/usr/bin/
# Build architecture-dependent files here.
binary-arch: DH_OPTIONS=-s
diff --git a/debian/xserver-xorg-video-intel-dbg.install b/debian/xserver-xorg-video-intel-dbg.install
deleted file mode 100644
index 3335671..0000000
--- a/debian/xserver-xorg-video-intel-dbg.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/intel_reg_dumper
Reply to: