[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

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



 debian/changelog                   |    8 ++++++++
 debian/control                     |    1 -
 debian/patches/01_gen_pci_ids.diff |   16 ----------------
 debian/patches/series              |    1 -
 debian/rules                       |    4 ++--
 5 files changed, 10 insertions(+), 20 deletions(-)

New commits:
commit 822951b1341fb9f0f10cd05735c153cd9e366951
Author: David Nusinow <dnusinow@debian.org>
Date:   Mon May 4 22:01:55 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 0e00618..9c5d393 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-i128 (1:1.3.1-4) 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:01:04 -0400
+
 xserver-xorg-video-i128 (1:1.3.1-3) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/control b/debian/control
index a0fbcb0..48f8f06 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.
 Build-Depends:
  debhelper (>= 5.0.0),
  pkg-config,
- quilt,
  xserver-xorg-dev (>= 2:1.5.99.901),
  x11proto-video-dev,
  x11proto-core-dev,
diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index 0728c01..0000000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- xserver-xorg-video-i128.orig/src/Makefile.am
-+++ xserver-xorg-video-i128/src/Makefile.am
-@@ -40,3 +40,6 @@
-          i128reg.h \
-          IBMRGB.h \
-          Ti302X.h
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = i128.ids
---- /dev/null
-+++ xserver-xorg-video-i128/src/i128.ids
-@@ -0,0 +1,4 @@
-+105D2309
-+105D2339
-+105D493D
-+105D5348
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 d63bfba..3048dc1 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
 
@@ -47,7 +47,7 @@ build-stamp: configure
 	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
 	>$@
 
-clean: xsfclean
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp


Reply to: