r20495 - in /desktop/unstable/sabayon/debian: changelog control control.in rules

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Jun 28 11:42:32 2009
New Revision: 20495

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20495
Log:
Revert previous change; Xephyr works bad (no keyboard) but Xnest is much 
worse.

Modified:
    desktop/unstable/sabayon/debian/changelog
    desktop/unstable/sabayon/debian/control
    desktop/unstable/sabayon/debian/control.in
    desktop/unstable/sabayon/debian/rules

Modified: desktop/unstable/sabayon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/changelog?rev=20495&op=diff
==============================================================================
--- desktop/unstable/sabayon/debian/changelog (original)
+++ desktop/unstable/sabayon/debian/changelog Sun Jun 28 11:42:32 2009
@@ -34,7 +34,7 @@
     remove empty patches.
   * Only require python-gconf, not python-gnome2.
   * Remove useless XB-Python-Version.
-  * Force XNEST_PATH to Xnest. Don’t build-depend on xnest.
+  * Force XNEST_PATH to Xephyr. Use xserver-xephyr instead of xnest.
   * 02_environ_crash.patch: new patch. Fix a crash when there is no 
     XAUTHLOCALHOSTNAME set.
   * 03_file_monitor.patch: stolen upstream. Make file monitoring 

Modified: desktop/unstable/sabayon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/control?rev=20495&op=diff
==============================================================================
--- desktop/unstable/sabayon/debian/control (original)
+++ desktop/unstable/sabayon/debian/control Sun Jun 28 11:42:32 2009
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Alan Baghumian <alan at technotux.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>
 Build-Depends: autotools-dev,
                debhelper (>= 5.0.38),
                cdbs (>= 0.4.49),
@@ -28,7 +28,7 @@
          python-gtk2 (>= 2.5.3),
          python-gconf,
          python-libxml2,
-         xnest,
+         xserver-xephyr,
          gconf2 (>=  2.10.0-0ubuntu2),
          python-ldap,
          gksu,

Modified: desktop/unstable/sabayon/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/control.in?rev=20495&op=diff
==============================================================================
--- desktop/unstable/sabayon/debian/control.in (original)
+++ desktop/unstable/sabayon/debian/control.in Sun Jun 28 11:42:32 2009
@@ -28,7 +28,7 @@
          python-gtk2 (>= 2.5.3),
          python-gconf,
          python-libxml2,
-         xnest,
+         xserver-xephyr,
          gconf2 (>=  2.10.0-0ubuntu2),
          python-ldap,
          gksu,

Modified: desktop/unstable/sabayon/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/rules?rev=20495&op=diff
==============================================================================
--- desktop/unstable/sabayon/debian/rules (original)
+++ desktop/unstable/sabayon/debian/rules Sun Jun 28 11:42:32 2009
@@ -11,7 +11,7 @@
 				--with-prototype-user=sabayon-admin \
 				--with-distro=debian
 
-DEB_CONFIGURE_SCRIPT_ENV += XNEST_PATH=/usr/bin/Xnest
+DEB_CONFIGURE_SCRIPT_ENV += XNEST_PATH=/usr/bin/Xephyr
 
 binary-install/sabayon::
 	find debian/sabayon -name '*.a' -exec rm -f '{}' \;