xorg-server: Changes to 'debian-unstable'
debian/changelog | 8 ++++++++
debian/rules | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 7d04d89fdd6a8eb41570f0dc1acdf094f843702e
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Apr 17 18:38:22 2010 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index e6a3de1..fce68a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg-server (2:1.7.6.901-2) UNRELEASED; urgency=low
+xorg-server (2:1.7.6.901-2) unstable; urgency=low
* Fix dependency generation: Replace PKG_CONFIG_DIR with PKG_CONFIG_PATH
(/usr/share/xserver-xorg/{videodrv,xinput}dep may lack a version
otherwise).
- -- Cyril Brulebois <kibi@debian.org> Sat, 17 Apr 2010 18:28:46 +0200
+ -- Cyril Brulebois <kibi@debian.org> Sat, 17 Apr 2010 18:38:17 +0200
xorg-server (2:1.7.6.901-1) unstable; urgency=low
commit e5edb98733032282beddc862f0aac94d12542f60
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Apr 17 18:32:00 2010 +0200
Fix dependency generation: Replace PKG_CONFIG_DIR with PKG_CONFIG_PATH (/usr/share/xserver-xorg/{videodrv,xinput}dep may lack a version otherwise).
diff --git a/debian/changelog b/debian/changelog
index c87258f..e6a3de1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.7.6.901-2) UNRELEASED; urgency=low
+
+ * Fix dependency generation: Replace PKG_CONFIG_DIR with PKG_CONFIG_PATH
+ (/usr/share/xserver-xorg/{videodrv,xinput}dep may lack a version
+ otherwise).
+
+ -- Cyril Brulebois <kibi@debian.org> Sat, 17 Apr 2010 18:28:46 +0200
+
xorg-server (2:1.7.6.901-1) unstable; urgency=low
* New upstream release candidate.
diff --git a/debian/rules b/debian/rules
index 6a44ad0..6cbb19d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -276,10 +276,10 @@ binary-arch: build install
dh_install $(DH_INSTALL_OPTIONS) -s --sourcedir=debian/tmp --list-missing
$(INSTALL) -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg
# XXX might want to only extract the major ABI versions?
- abi_videodrv=`PKG_CONFIG_DIR=debian/tmp/main/usr/lib/pkgconfig pkg-config --variable=abi_videodrv xorg-server`; \
+ abi_videodrv=`PKG_CONFIG_PATH=debian/tmp/main/usr/lib/pkgconfig pkg-config --variable=abi_videodrv xorg-server`; \
echo videoabi=xorg-video-abi-$$abi_videodrv > debian/xserver-xorg-core.substvars && \
echo "xorg-video-abi-$$abi_videodrv, xserver-xorg-core (>= $(serverminver))" > debian/xserver-xorg-dev/usr/share/xserver-xorg/videodrvdep
- abi_xinput=`PKG_CONFIG_DIR=debian/tmp/main/usr/lib/pkgconfig pkg-config --variable=abi_xinput xorg-server`; \
+ abi_xinput=`PKG_CONFIG_PATH=debian/tmp/main/usr/lib/pkgconfig pkg-config --variable=abi_xinput xorg-server`; \
echo inputabi=xorg-input-abi-$$abi_xinput >> debian/xserver-xorg-core.substvars && \
echo "xorg-input-abi-$$abi_xinput, xserver-xorg-core (>= $(serverminver))" > debian/xserver-xorg-dev/usr/share/xserver-xorg/xinputdep
Reply to: