xserver-xorg-video-neomagic: Changes to 'debian-unstable'
debian/changelog | 8 ++++++++
debian/control | 1 -
debian/patches/02_gen_pci_ids.diff | 25 -------------------------
debian/patches/series | 1 -
debian/rules | 4 ++--
5 files changed, 10 insertions(+), 29 deletions(-)
New commits:
commit 1d1179868686e09907b7cf9b4badda6d573d54c1
Author: David Nusinow <dnusinow@debian.org>
Date: Mon May 4 22:20:51 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-deps.
diff --git a/debian/changelog b/debian/changelog
index bf6dceb..ad35200 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-neomagic (1:1.2.2-3) UNRELEASED; urgency=low
+
+ * 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-deps.
+
+ -- David Nusinow <dnusinow@debian.org> Mon, 04 May 2009 22:19:41 -0400
+
xserver-xorg-video-neomagic (1:1.2.2-2) unstable; urgency=low
* Drop patch 01_implicit_declaration.diff. The warning is gone.
diff --git a/debian/control b/debian/control
index bf2e4f5..9925cab 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
- quilt,
pkg-config,
xserver-xorg-dev (>= 2:1.5.99.901),
x11proto-video-dev,
diff --git a/debian/patches/02_gen_pci_ids.diff b/debian/patches/02_gen_pci_ids.diff
deleted file mode 100644
index 7bb2860..0000000
--- a/debian/patches/02_gen_pci_ids.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: xserver-xorg-video-neomagic/src/Makefile.am
-===================================================================
---- xserver-xorg-video-neomagic.orig/src/Makefile.am
-+++ xserver-xorg-video-neomagic/src/Makefile.am
-@@ -45,3 +45,6 @@
- neo_video.c \
- neo_video.h \
- neo_pcirename.h
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = neomagic.ids
-Index: xserver-xorg-video-neomagic/src/neomagic.ids
---- /dev/null
-+++ xserver-xorg-video-neomagic/src/neomagic.ids
-===================================================================
-@@ -0,0 +1,9 @@
-+10C80001
-+10C80002
-+10C80003
-+10C80083
-+10C80004
-+10C80005
-+10C80025
-+10C80006
-+10C80016
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 84a6b5c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-02_gen_pci_ids.diff
diff --git a/debian/rules b/debian/rules
index c725a81..088e815 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ endif
# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
confflags += --disable-static
-configure: $(STAMP_DIR)/patch
+configure:
dh_testdir
autoreconf -vfi
@@ -48,7 +48,7 @@ build-stamp: configure
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
>$@
-clean: xsfclean
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
Reply to: