xserver-xorg-video-openchrome: Changes to 'debian-unstable'
debian/control | 3 ++-
debian/patches/noconfigure_at_autogen.diff | 10 ----------
debian/patches/series | 1 -
debian/rules | 13 +++++++++----
4 files changed, 11 insertions(+), 16 deletions(-)
New commits:
commit 01c9fdba581813d46d6efc4994a41bc40658ecef
Author: Raphael Geissert <atomo64@gmail.com>
Date: Sat Apr 19 21:10:35 2008 -0500
Drop the autgen.sh patch and better call autoreconf directly
diff --git a/debian/control b/debian/control
index 4bfa4b4..9fbbc58 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: Raphael Geissert <atomo64@gmail.com>
-Build-Depends: debhelper (>= 5), autotools-dev, autoconf, automake, libtool, pkg-config, xserver-xorg-dev (>= 1:1.1.1), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, x11proto-xf86dri-dev, x11proto-video-dev, x11proto-gl-dev, libdrm-dev (>> 2.0), libx11-dev, libgl1-mesa-dev | libgl1-dev, libxvmc-dev, quilt
+Build-Depends: debhelper (>= 5), autotools-dev, autoconf, automake, libtool, pkg-config, xserver-xorg-dev (>= 1:1.1.1), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, x11proto-xf86dri-dev, x11proto-video-dev, x11proto-gl-dev, libdrm-dev (>> 2.0), libx11-dev, libgl1-mesa-dev | libgl1-dev, libxvmc-dev
Build-Conflicts: autoconf2.13
Standards-Version: 3.7.3
Homepage: http://www.openchrome.org
diff --git a/debian/patches/noconfigure_at_autogen.diff b/debian/patches/noconfigure_at_autogen.diff
deleted file mode 100644
index b110953..0000000
--- a/debian/patches/noconfigure_at_autogen.diff
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/autogen.sh b/autogen.sh
-index 904cd67..218197d 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -9,4 +9,4 @@ cd $srcdir
- autoreconf -v --install || exit 1
- cd $ORIGDIR || exit $?
-
--$srcdir/configure --enable-maintainer-mode "$@"
-+#$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index cffef8b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-noconfigure_at_autogen.diff
diff --git a/debian/rules b/debian/rules
index 20b31ef..42f622a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,15 +40,14 @@ $(DEB_BUILDDIR)/config.status: configure
mkdir $(DEB_BUILDDIR)
cd $(DEB_BUILDDIR) && ../configure $(DEB_CONFIGURE_EXTRA_FLAGS)
-configure: patch
- ./autogen.sh
+configure:
+ autoreconf -vif
.PHONY: clean
-clean: xsfclean unpatch
+clean: xsfclean
dh_testdir
dh_testroot
dh_clean
- [ ! -f $(DEB_BUILDDIR)/Makefile ] || $(MAKE) -C $(DEB_BUILDDIR) distclean
# remove stuff generated by autogen.sh
$(RM) aclocal.m4 compile config.guess config.h.in config.sub \
configure depcomp install-sh libxvmc/Makefile.in ltmain.sh \
commit 9d3486363b7abca872bfad85442c2f40762a9677
Author: Raphael Geissert <atomo64@gmail.com>
Date: Sat Apr 19 20:59:23 2008 -0500
Pass --build and --host to configure, the later only when BUILD and HOST differ as it enters cross
compilation mode even if equal.
Build-Conflicts: autoconf2.13, based on autotools-dev's README.Debian
diff --git a/debian/control b/debian/control
index 21b789d..4bfa4b4 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Raphael Geissert <atomo64@gmail.com>
Build-Depends: debhelper (>= 5), autotools-dev, autoconf, automake, libtool, pkg-config, xserver-xorg-dev (>= 1:1.1.1), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, x11proto-xf86dri-dev, x11proto-video-dev, x11proto-gl-dev, libdrm-dev (>> 2.0), libx11-dev, libgl1-mesa-dev | libgl1-dev, libxvmc-dev, quilt
+Build-Conflicts: autoconf2.13
Standards-Version: 3.7.3
Homepage: http://www.openchrome.org
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-openchrome
diff --git a/debian/rules b/debian/rules
index 9f29493..20b31ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,15 +2,21 @@
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)
include debian/xsfbs/xsfbs.mk
DEB_CONFIGURE_EXTRA_FLAGS := \
+ --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
--disable-maintainer-mode \
--disable-dependency-tracking
+ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+DEB_CONFIGURE_EXTRA_FLAGS += --host=$(DEB_HOST_GNU_TYPE)
+endif
+
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
DEB_CONFIGURE_EXTRA_FLAGS += \
--enable-debug=yes \
Reply to: