debian/changelog | 3 +--
debian/rules | 3 +++
debian/xserver-xorg-core.install | 1 -
3 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 9ea385310b8acd993107bb5bd85dee503ba49db2
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Thu Jan 22 17:36:51 2009 +0200
update the changelog to reflect the previous change.
diff --git a/debian/changelog b/debian/changelog
index 0fd24ad..ad95bef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,7 @@
xorg-server (2:1.5.99.901-1ubuntu1) UNRELEASED; urgency=low
* Merge with Debian experimental.
- * debian/xserver-xorg-core.install: Include xorg-server.conf for dbus
- support.
+ * debian/rules: Include xorg-server.conf for dbus support.
-- Timo Aaltonen <tjaal...@ubuntu.com> Thu, 22 Jan 2009 15:37:40 +0200
commit b7df58cc273fa9749da2dfadd9ddaede927e1335
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Thu Jan 22 17:34:21 2009 +0200
Handle xorg-server.conf installation in debian/rules.
diff --git a/debian/rules b/debian/rules
index d5fde22..20f149f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -171,6 +171,9 @@ binary-arch: build install
$(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg/serverminver
$(INSTALL) -m 755 -d
debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core
$(INSTALL) -m 755 debian/xserver-xorg-core.bug.script
debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core/script
+ $(INSTALL) -d $(CURDIR)/debian/xserver-xorg-core/etc/dbus-1/system.d
+ $(INSTALL) -m644 $(CURDIR)/config/xorg-server.conf \
+
$(CURDIR)/debian/xserver-xorg-core/etc/dbus-1/system.d/xorg-server.conf
dh_installdebconf -s
dh_installman -s
dh_link -s
diff --git a/debian/xserver-xorg-core.install b/debian/xserver-xorg-core.install
index 401a272..c88d80f 100644
--- a/debian/xserver-xorg-core.install
+++ b/debian/xserver-xorg-core.install
@@ -13,4 +13,3 @@ usr/bin/cvt
usr/bin/gtf
usr/share/man/man1/cvt.1
usr/share/man/man1/gtf.1
-config/xorg-server.conf etc/dbus-1/system.d
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
