xserver-xorg-video-openchrome: Changes to 'debian-unstable'
debian/control | 4 ++--
debian/install | 1 -
debian/rules | 6 +++++-
3 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit eb4516a7936c9063231ec9d7e626482d53119034
Author: Raphael Geissert <atomo64@gmail.com>
Date: Fri Apr 25 20:19:35 2008 -0500
Added hurd-i386, kfreebsd-i386, and kfreebsd-amd64, to Architectures.
Prevent installation of .la files
diff --git a/debian/control b/debian/control
index 475123e..22588db 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-openchrome
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-openchrome.git
Package: xserver-xorg-video-openchrome
-Architecture: i386 amd64
+Architecture: i386 amd64 hurd-i386 kfreebsd-i386 kfreebsd-amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
Provides: ${xviddriver:Provides}
Conflicts: libchromexvmc1, libchromexvmcpro1
diff --git a/debian/install b/debian/install
deleted file mode 100644
index f8bf603..0000000
--- a/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-debian/overrides/xserver-xorg-video-openchrome usr/share/lintian/overrides
diff --git a/debian/rules b/debian/rules
index 42f622a..0406496 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,13 @@
#!/usr/bin/make -f
PACKAGE = xserver-xorg-video-openchrome
+
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+export DH_ALWAYS_EXCLUDE=.la
+
include debian/xsfbs/xsfbs.mk
DEB_CONFIGURE_EXTRA_FLAGS := \
@@ -34,7 +37,8 @@ debian/build-stamp: $(DEB_BUILDDIR)/config.status
install: build
dh_testdir
dh_testroot
- $(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/$(PACKAGE)/
+ $(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp/
+ dh_install debian/tmp/*
$(DEB_BUILDDIR)/config.status: configure
mkdir $(DEB_BUILDDIR)
commit a1fd8fc1a87369b27eb92df20cf2ec1773d6e58e
Author: Raphael Geissert <atomo64@gmail.com>
Date: Fri Apr 25 16:25:45 2008 -0500
Dropped useless Replaces
diff --git a/debian/control b/debian/control
index 9fbbc58..475123e 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Architecture: i386 amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
Provides: ${xviddriver:Provides}
Conflicts: libchromexvmc1, libchromexvmcpro1
-Replaces: xserver-xorg-video-via, xserver-xorg-video-unichrome, libchromexvmc1, libchromexvmcpro1
+Replaces: libchromexvmc1, libchromexvmcpro1
Description: X.Org X server -- VIA display driver
OpenChrome is a project for the development of free and open-source drivers
for the VIA UniChrome video chipsets.
Reply to: