xorg-server: Changes to 'ubuntu'
debian/changelog | 15 +++++++++++++++
debian/rules | 14 ++++++++++----
2 files changed, 25 insertions(+), 4 deletions(-)
New commits:
commit 452ce4d5439532823e7b006ebc4cb759794891ec
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Fri Sep 26 12:08:07 2008 +0300
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index 60eebee..c96a0f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.5.1-1ubuntu2) intrepid; urgency=low
+
+ * Merge with Debian experimental:
+ - debian/rules: define PCI_TXT_IDS_DIR to unbreak the pci id matching
+ using plain text files provided by drivers. (LP: #261977)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Fri, 26 Sep 2008 12:05:12 +0300
+
xorg-server (2:1.5.1-1ubuntu1) intrepid; urgency=low
* Merge with Debian experimental. (LP: #269388)
commit 44451bb21a9843113255ab352d917e2c4b7b399e
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Sep 25 19:06:29 2008 +0200
debian/rules: define PCI_TXT_IDS_DIR when running configure
This unbreaks the pci id matching using plain text files
provided by drivers in /usr/share/xserver-xorg/pci/
diff --git a/debian/changelog b/debian/changelog
index a332a39..72a4dc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.5.1-2) UNRELEASED; urgency=low
+
+ * debian/rules: define PCI_TXT_IDS_DIR to unbreak the pci id matching using
+ plain text files provided by drivers.
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 25 Sep 2008 18:50:19 +0200
+
xorg-server (2:1.5.1-1) experimental; urgency=low
* New upstream bugfix release.
diff --git a/debian/rules b/debian/rules
index 4d8c13c..c04a817 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,10 +78,16 @@ obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
dh_testdir
mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
cd obj-$(DEB_BUILD_GNU_TYPE) && \
- ../configure --prefix=/usr --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info --sysconfdir=/etc \
- --localstatedir=/var $(confflags) CFLAGS="$(CFLAGS)" \
- CPPFLAGS="$(CPPFLAGS)"
+ ../configure \
+ --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ $(confflags) \
+ CFLAGS="$(CFLAGS)" \
+ CPPFLAGS="$(CPPFLAGS)" \
+ PCI_TXT_IDS_DIR="/usr/share/xserver-xorg/pci"
build: build-stamp
Reply to: