Bug#335150: xdebconfigurator: incompatible debconf values for xserver-xorg

[Petter Reinholdtsen <pere@hungry.com>]

Can you try this patch and test if it work?  I do not have a etch/sid
machine to test it on myself. :(

I suspect I forgot to adjust some parts of xdebconfigurator to do the
right thing with xorg.  The xfree86 stript is used quite a lot all
over the place.

Index: debian/changelog
===================================================================
--- debian/changelog	(revisjon 4869)
+++ debian/changelog	(arbeidskopi)
@@ -3,6 +3,7 @@
   [Petter Reinholdtsen]
   * Rename default monitor and card name to use 'Xdebconfigurator'
     instead of just 'Xdevc', to make it clearer what the value mean.
+  * Try to get xdebconfigurator working with Xorg packages. (Closes: #335150)
 
  -- Petter Reinholdtsen <pere@debian.org>  Wed, 26 Oct 2005 09:44:00 +0200
 
Index: xdebconfigurator
===================================================================
--- xdebconfigurator	(revisjon 4869)
+++ xdebconfigurator	(arbeidskopi)
@@ -60,8 +60,21 @@
 my $xdriver  = "$pkgdir/Xdriver.pl";
 
 # Establish the preliminaries.
-my $THIS_PACKAGE="xserver-xfree86";
-my $THIS_SERVER="/usr/bin/X11/XFree86";
+my $THIS_PACKAGE;
+my $THIS_SERVER;
+my $DEBCONF_OWNER;
+if ( -d "/usr/share/doc/xserver-xorg/" ) {
+    $THIS_PACKAGE = "xserver-xorg";
+    $THIS_SERVER  = "/usr/bin/X11/Xorg";
+    $DEBCONF_OWNER = "xserver-xorg";
+} elsif ( -d "/usr/share/doc/xserver-xfree86/" ) {
+    $THIS_PACKAGE = "xserver-xfree86";
+    $THIS_SERVER  = "/usr/bin/X11/XFree86";
+    $DEBCONF_OWNER = "xserver-xfree86";
+} else {
+    warn "No known X server system detected!\n";
+    exit 1;
+}
 
 my $hwinfo = "/usr/sbin/hwinfo";
 my $ddcprobe = "/usr/sbin/ddcprobe";
@@ -779,7 +792,6 @@
     #$ARCH= 'dpkg --print-installation-architecture'; # ex: i386
     # uncomment for debconf
 
-    my $owner = "xserver-xfree86";
     my $deftype = "string";
 
     $xserver = 'xserver-' . $xserver; # xfree86, svga, ...
@@ -789,11 +801,11 @@
 
     Debconf::Db->load;
 
-    load_answer($owner, 'shared/default-x-server', "select", $xserver);
+    load_answer($DEBCONF_OWNER, 'shared/default-x-server', "select", $xserver);
     #boolean xserver-link already exists..; let's re-link it
-    load_answer($owner, 'shared/clobber_x-server_symlink', "boolean", 'true');
+    load_answer($DEBCONF_OWNER, 'shared/clobber_x-server_symlink', "boolean", 'true');
 
-    if($xserver !~ /xserver-xfree86/) {
+    if($xserver !~ /xserver-xfree86/ && $xserver !~ /xserver-xorg/ ) {
 	# does all v3 servers use this? or just svga?
 	$xserver = 'shared/xfree86v3';
     }
@@ -802,7 +814,7 @@
     # xserver-xfree86 with xserver shared/xfree86v3/
     foreach $key (keys %xdebc_map) {
         my $type = $xdebc_type{$key} || $deftype;
-        load_answer($owner, $xserver.'/'.$key, $type, $xdebc_map{$key});
+        load_answer($DEBCONF_OWNER, $xserver.'/'.$key, $type, $xdebc_map{$key});
     }
     Debconf::Db->save;
 }