x11-xserver-utils: Changes to 'debian-unstable'
debian/changelog | 10 +++++++---
debian/control | 6 +++---
2 files changed, 10 insertions(+), 6 deletions(-)
New commits:
commit 47b09da8149ec2f5c62d260354676d6a7ced8e1e
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Dec 3 19:13:49 2007 +0100
xset needs libxxf86misc-dev, not x11proto-xf86misc-dev.
diff --git a/debian/changelog b/debian/changelog
index b1a1fb1..95dc449 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,7 @@
x11-xserver-utils (7.3+2) UNRELEASED; urgency=low
[ Timo Aaltonen ]
- * control: add x11proto-xf86misc-dev to build-depends, it's useful
- for xset.
+ * control: add libxxf86misc-dev to build-depends, it's useful for xset.
[ Julien Cristau ]
* Preventively relax Replaces on xutils and xbase-clients so those packages
diff --git a/debian/control b/debian/control
index efbe8ab..4b13a97 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0-1),
libxi-dev (>= 1:1.0.0-3), libxmuu-dev (>= 1:1.0.1-1),
libxrandr-dev (>= 2:1.2.0-1), libxt-dev (>= 1:1.0.0-1),
libxtrap-dev (>= 1:1.0.0-1), libxxf86vm-dev (>= 1:1.0.0-1), xbitmaps, quilt,
- x11proto-input-dev (>= 1.4), x11proto-xf86misc-dev
+ x11proto-input-dev (>= 1.4), libxxf86misc-dev
# Reasons for build-depends:
# debhelper for the packaging, pkg-config needed by configure scripts
# Individual apps:
@@ -21,7 +21,7 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0-1),
# xrdb: libxmuu-dev, libx11-dev
# xrefresh: libx11-dev
# xset: libxmuu-dev, libx11-dev, libxext-dev,
-# x11proto-xf86misc-dev, (libxfontcache-dev)
+# libxxf86misc-dev, (libxfontcache-dev)
# xsetmode: libxi-dev, libx11-dev
# xsetpointer: libxi-dev, libx11-dev, x11proto-input-dev (>= 1.4)
# xsetroot: libxmuu-dev, libx11-dev, xbitmaps
commit a92704c7e57a79836cdb84daf8ce8b654acce9d1
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Aug 17 00:44:24 2007 +0200
Relax Replaces on xutils and xbase-clients so further updates are possible.
diff --git a/debian/changelog b/debian/changelog
index 7b30b04..b1a1fb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
x11-xserver-utils (7.3+2) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* control: add x11proto-xf86misc-dev to build-depends, it's useful
for xset.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Fri, 30 Nov 2007 00:59:58 +0200
+ [ Julien Cristau ]
+ * Preventively relax Replaces on xutils and xbase-clients so those packages
+ can still be updated if needed (e.g. in stable updates).
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 03 Dec 2007 19:09:45 +0100
x11-xserver-utils (7.3+1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 956739b..efbe8ab 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (>= 1:7.0.0)
Conflicts: iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xrgb, xset,
xsetmode, xsetpointer, xsetroot, xstdcmap, xtrap, xvidtune
-Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1),
+Replaces: xbase-clients (<< 1:7.3), xutils (<< 1:7.2),
iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xrgb, xset,
xsetmode, xsetpointer, xsetroot, xstdcmap, xtrap, xvidtune
Description: X server utilities
Reply to: