[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xorg-server: Changes to 'debian-experimental'



 debian/changelog                   |    7 +++++++
 debian/control                     |    2 ++
 debian/xserver-xorg-core.install   |    2 --
 debian/xserver-xorg-legacy.install |    2 ++
 4 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit cc1e94cb5a7e7172974be98103f0af4170c8dc22
Author: Laurent Bigonville <bigon@bigon.be>
Date:   Sat Aug 22 16:30:03 2015 +0200

    Move Xorg.wrap.1 man page from the xserver-xorg-core to xserver-xorg-legacy package

diff --git a/debian/changelog b/debian/changelog
index eb80147..417b174 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.17.2-3) UNRELEASED; urgency=medium
+
+  * Move Xorg.wrap.1 man page from the xserver-xorg-core to
+    xserver-xorg-legacy package
+
+ -- Laurent Bigonville <bigon@debian.org>  Sat, 22 Aug 2015 16:29:11 +0200
+
 xorg-server (2:1.17.2-2) experimental; urgency=medium
 
   [ Laurent Bigonville ]
diff --git a/debian/control b/debian/control
index ca9e18e..a837aeb 100644
--- a/debian/control
+++ b/debian/control
@@ -398,8 +398,10 @@ Depends:
  ${misc:Depends},
 Breaks:
  x11-common (<< 1:7.7+10~),
+ xserver-xorg-core (<< 2:1.17.2-3~),
 Replaces:
  x11-common (<< 1:7.7+10~),
+ xserver-xorg-core (<< 2:1.17.2-3~),
 Description: setuid root Xorg server wrapper
  This package provides a wrapper for the Xorg X server, which is
  necessary for legacy drivers and non-Linux kernels.
diff --git a/debian/xserver-xorg-core.install b/debian/xserver-xorg-core.install
index 856b615..e16f9d6 100644
--- a/debian/xserver-xorg-core.install
+++ b/debian/xserver-xorg-core.install
@@ -2,11 +2,9 @@ main/usr/lib/xorg/modules	usr/lib/xorg
 main/usr/bin/Xorg	usr/bin
 main/usr/bin/X		usr/bin
 main/usr/share/man/man1/Xorg.1	usr/share/man/man1
-main/usr/share/man/man1/Xorg.wrap.1	usr/share/man/man1
 main/usr/share/man/man4		usr/share/man/
 main/usr/share/man/man5/xorg.conf.5	usr/share/man/man5
 main/usr/share/man/man5/xorg.conf.d.5	usr/share/man/man5
-main/usr/share/man/man5/Xwrapper.config.5	usr/share/man/man5
 main/usr/bin/cvt	usr/bin
 main/usr/bin/gtf	usr/bin
 main/usr/share/man/man1/cvt.1	usr/share/man/man1
diff --git a/debian/xserver-xorg-legacy.install b/debian/xserver-xorg-legacy.install
index 5f3eb87..44b995e 100644
--- a/debian/xserver-xorg-legacy.install
+++ b/debian/xserver-xorg-legacy.install
@@ -1 +1,3 @@
 main/usr/lib/xorg/Xorg.wrap usr/lib/xorg
+main/usr/share/man/man1/Xorg.wrap.1	usr/share/man/man1
+main/usr/share/man/man5/Xwrapper.config.5	usr/share/man/man5


Reply to: