X Strike Force X.Org X11 SVN commit: r491 - trunk/debian
Author: dnusinow
Date: 2005-08-03 12:20:51 -0500 (Wed, 03 Aug 2005)
New Revision: 491
Modified:
trunk/debian/changelog
trunk/debian/control
Log:
- Add "| debconf-2.0" to all package depends that depend on debconf so as to
unblock installation of cdebconf
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-08-03 09:59:07 UTC (rev 490)
+++ trunk/debian/changelog 2005-08-03 17:20:51 UTC (rev 491)
@@ -22,6 +22,8 @@
- Add xserver-xorg.init script that will allow people (intended for
LiveCD's) to generate an xorg.conf on the fly at bootup. Thanks Petter
Reinholdtsen
+ - Add "| debconf-2.0" to all package depends that depend on debconf so as
+ to unblock installation of cdebconf
- Apply various GNU/kFreeBSD updates. Thanks Robert Millan and Aurelien
Jarno. Closes: #318934
- Remove all the old GNU/kFreeBSD support files
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2005-08-03 09:59:07 UTC (rev 490)
+++ trunk/debian/control 2005-08-03 17:20:51 UTC (rev 491)
@@ -1950,7 +1950,7 @@
Package: xdm
Architecture: any
-Depends: debconf (>= 1.2.9), xbase-clients, cpp, libpam-modules, libpam-runtime (>= 0.76-13.1), ${shlibs:Depends}, ${misc:Depends}
+Depends: debconf (>= 1.2.9) | debconf-2.0, xbase-clients, cpp, libpam-modules, libpam-runtime (>= 0.76-13.1), ${shlibs:Depends}, ${misc:Depends}
Conflicts: cpp-3.3 (<< 1:3.3.3-0pre1)
Suggests: xutils
Replaces: xbase (<< 3.3.2.3a-2), xbase-clients (<< 4.0)
@@ -2164,7 +2164,7 @@
Package: x11-common
Architecture: all
-Depends: debconf (>= 1.2.9), debianutils (>= 1.13), lsb-base (>= 3.0-1)
+Depends: debconf (>= 1.2.9) | debconf-2.0, debianutils (>= 1.13), lsb-base (>= 3.0-1)
Suggests: x-window-system-core | x-window-system
Conflicts: xbase (<< 3.3.2.3a-2), task-x-window-system-core, task-x-window-system, xfree86-common (<< 6.8.0), x-common
Replaces: xbase (<< 3.3.2.3a-9), xlib6g-dev (<< 4.0), xmanpages (<< 3.3.4), xstd, xserver-common (<< 4.0), xfree86-common (<< 6.8.0), x-common
@@ -2495,7 +2495,7 @@
Package: xserver-common
Architecture: any
-Depends: debconf (>= 1.0.21), x11-common (>= 6.8.1), ${shlibs:Depends}, ${misc:Depends}
+Depends: debconf (>= 1.0.21) | debconf-2.0, x11-common (>= 6.8.1), ${shlibs:Depends}, ${misc:Depends}
Suggests: xserver-xorg | xserver, xfonts-base, xfonts-100dpi | xfonts-75dpi, xfonts-scalable, configlet-frontends
Conflicts: xbase (<< 3.3.2.3a-2), xsun-utils, xbase-clients (<< 3.3.6-1), suidmanager (<< 0.50), configlet (<= 0.9.22), xserver-3dlabs (<< 3.3.6-35), xserver-8514 (<< 3.3.6-35), xserver-agx (<< 3.3.6-35), xserver-common-v3 (<< 3.3.6-35), xserver-fbdev (<< 3.3.6-35), xserver-i128 (<< 3.3.6-35), xserver-mach32 (<< 3.3.6-35), xserver-mach64 (<< 3.3.6-35), xserver-mach8 (<< 3.3.6-35), xserver-mono (<< 3.3.6-35), xserver-p9000 (<< 3.3.6-35), xserver-s3 (<< 3.3.6-35), xserver-s3v (<< 3.3.6-35), xserver-svga (<< 3.3.6-35), xserver-tga (<< 3.3.6-35), xserver-vga16 (<< 3.3.6-35), xserver-w32 (<< 3.3.6-35), xserver-xsun (<< 3.3.6-35), xserver-xsun-mono (<< 3.3.6-35), xserver-xsun24 (<< 3.3.6-35), xserver-rage128, xserver-sis
Replaces: xbase (<< 3.3.2.3a-2), xserver-vga16 (<< 3.3.2.3a-2), xserver-agx (<< 3.3.2.3a-9), xserver-mach32 (<< 3.3.2.3a-9), xserver-mach64 (<< 3.3.2.3a-9), xserver-p9000 (<< 3.3.2.3a-9), xserver-s3 (<< 3.3.2.3a-9), xserver-s3v (<< 3.3.2.3a-9), xserver-tga (<< 3.3.2.3a-9), xserver-w32 (<< 3.3.2.3a-9), xsun-utils
Reply to: