xserver-xorg-video-imstt: Changes to 'debian-unstable'
debian/changelog | 8 +++++++-
debian/control | 2 +-
debian/patches/01_gen_pci_ids.diff | 14 --------------
debian/patches/series | 1 -
debian/rules | 4 ++--
5 files changed, 10 insertions(+), 19 deletions(-)
New commits:
commit 8218ce2efc9449fb6ea9b0a2ba1c1cf8a2f73033
Author: David Nusinow <dnusinow@debian.org>
Date: Mon May 4 22:12:05 2009 -0400
Remove 01_gen_pci_ids.diff.
The X server now uses an internal table to choose a driver during
autoconfiguration.
Disable the patch system and remove quilt from the build-depends
diff --git a/debian/changelog b/debian/changelog
index d5ccbd4..741c9d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
xserver-xorg-video-imstt (1:1.1.0-8) UNRELEASED; urgency=low
+ [ Brice Goglin ]
* Add upstream URL to debian/copyright.
- -- Brice Goglin <bgoglin@debian.org> Sat, 15 Sep 2007 01:56:47 +0200
+ [ David Nusinow ]
+ * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
+ choose a driver during autoconfiguration.
+ + Disable the patch system and remove quilt from the build-depends
+
+ -- David Nusinow <dnusinow@debian.org> Mon, 04 May 2009 22:11:12 -0400
xserver-xorg-video-imstt (1:1.1.0-7) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 467d46f..236078c 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>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.4), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev
+Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev
Standards-Version: 3.7.2.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-imstt
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-imstt.git
diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index cb4ed29..0000000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: xserver-xorg-video-imstt/src/Makefile.am
-===================================================================
---- xserver-xorg-video-imstt.orig/src/Makefile.am 2007-09-13 22:42:39.000000000 -0400
-+++ xserver-xorg-video-imstt/src/Makefile.am 2007-09-13 22:44:21.000000000 -0400
-@@ -33,3 +33,9 @@
- imstt_driver.c \
- imstt.h \
- imstt_reg.h
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = imstt.ids
-+
-+imstt.ids : imstt.h
-+ awk '/PCI_/ {print $$3 }' $(srcdir)/imstt.h | sed 's/^0x/10E0/' > imstt.ids
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b55d79f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_gen_pci_ids.diff
diff --git a/debian/rules b/debian/rules
index c150638..305b500 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ endif
# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
confflags += --disable-static
-build: patch build-stamp
+build: build-stamp
build-stamp:
dh_testdir
@@ -44,7 +44,7 @@ build-stamp:
touch build-stamp
-clean: xsfclean
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
Reply to: