diff -Nru xnetcardconfig-0.2.0/debian/CVS/Entries xnetcardconfig-0.2.0/debian/CVS/Entries
--- xnetcardconfig-0.2.0/debian/CVS/Entries	2004-08-09 22:48:54.000000000 +0200
+++ xnetcardconfig-0.2.0/debian/CVS/Entries	1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-/compat/1.1.1.1/Mon Aug  9 20:40:34 2004//
-/control/1.1.1.1/Mon Aug  9 20:40:34 2004//
-/copyright/1.1.1.1/Mon Aug  9 20:40:34 2004//
-/menu/1.1.1.1/Mon Aug  9 20:40:34 2004//
-/network.setup/1.1.1.1/Mon Aug  9 20:40:34 2004//
-/rules/1.1.1.1/Mon Aug  9 20:40:34 2004//
-/changelog/1.2/Mon Aug  9 20:44:42 2004//
-D
diff -Nru /tmp/6ptkxTr6ns/xnetcardconfig-0.2.0/debian/CVS/Repository /tmp/imdPyYXfye/xnetcardconfig-0.2.0/debian/CVS/Repository
--- xnetcardconfig-0.2.0/debian/CVS/Repository	2004-08-09 22:43:04.000000000 +0200
+++ xnetcardconfig-0.2.0/debian/CVS/Repository	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-xnetcardconfig/debian
diff -Nru /tmp/6ptkxTr6ns/xnetcardconfig-0.2.0/debian/CVS/Root /tmp/imdPyYXfye/xnetcardconfig-0.2.0/debian/CVS/Root
--- xnetcardconfig-0.2.0/debian/CVS/Root	2004-08-09 22:43:04.000000000 +0200
+++ xnetcardconfig-0.2.0/debian/CVS/Root	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-:ext:bmeurer@echobase.homeunix.net:/home/cvsroot
diff -Nru /tmp/6ptkxTr6ns/xnetcardconfig-0.2.0/debian/changelog /tmp/imdPyYXfye/xnetcardconfig-0.2.0/debian/changelog
--- xnetcardconfig-0.2.0/debian/changelog	2005-01-28 13:48:21.000000000 +0100
+++ xnetcardconfig-0.2.0/debian/changelog	2008-02-21 23:56:43.000000000 +0100
@@ -1,3 +1,15 @@
+xnetcardconfig (0.2.0-1ubuntu1) hardy; urgency=low
+
+  * FIX: debian/*
+    - replaced dependency on xsu by gksu
+    - Merged duplicate field Conflicts
+    - removed original maintainer since it never entered debian
+    - minor typo
+
+  * FIX: replaced usage of xsu with gksu (LP: #181494).
+	
+ -- Philippe Coval <rzr@users.sf.net>  Thu, 21 Feb 2008 22:28:29 +0100
+
 xnetcardconfig (0.2.0-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru /tmp/6ptkxTr6ns/xnetcardconfig-0.2.0/debian/control /tmp/imdPyYXfye/xnetcardconfig-0.2.0/debian/control
--- xnetcardconfig-0.2.0/debian/control	2005-01-28 14:12:22.000000000 +0100
+++ xnetcardconfig-0.2.0/debian/control	2008-02-21 23:56:43.000000000 +0100
@@ -1,17 +1,15 @@
 Source: xnetcardconfig
 Section: x11
 Priority: optional
-Maintainer: Benedikt Meurer <bm@os-cillation.de>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
 Build-Depends: debhelper (>= 4.1.26)
-Uploaders: Benedikt Meurer <bm@os-cillation.de>
 Standards-Version: 3.6.1
 
 Package: xnetcardconfig
 Architecture: all
-Depends: libgtk2-ruby, pump, ruby, xbase-clients, xsu
-Conflicts: dhcp-client
-Suggests: menu, sudo, xfld-welcome
+Depends: libgtk2-ruby, pump, ruby, xbase-clients, gksu
 Conflicts: menu (<< 2.1.12)
+Suggests: menu, sudo, xfld-welcome
 Description: A simple network card configuration for X.
  This package contains a tool that allows you to configure
  your network cards using an easy wizard.
diff -Nru /tmp/6ptkxTr6ns/xnetcardconfig-0.2.0/debian/copyright /tmp/imdPyYXfye/xnetcardconfig-0.2.0/debian/copyright
--- xnetcardconfig-0.2.0/debian/copyright	2004-08-09 22:40:34.000000000 +0200
+++ xnetcardconfig-0.2.0/debian/copyright	2008-02-21 23:56:43.000000000 +0100
@@ -4,7 +4,7 @@
 You can fetch xfdesktop from CVS only right now. Instructions can be
 found at http://xfce.sourceforge.net/
 
-Upsteeam author is Benedikt Meurer <bm@os-cillation.de>
+Upstream author is Benedikt Meurer <bm@os-cillation.de>
 
 Copyright:
 
diff -Nru /tmp/6ptkxTr6ns/xnetcardconfig-0.2.0/xnetcardconfig.in /tmp/imdPyYXfye/xnetcardconfig-0.2.0/xnetcardconfig.in
--- xnetcardconfig-0.2.0/xnetcardconfig.in	2005-01-28 14:09:42.000000000 +0100
+++ xnetcardconfig-0.2.0/xnetcardconfig.in	2008-02-21 23:56:43.000000000 +0100
@@ -27,7 +27,7 @@
 	exec "@PREFIX@/bin/xnetcardconfig.real"
 else
 	(sudo -S $0) </dev/null >/dev/null 2>&1 || {
-		(xsu -c "$0" -u root -i "@PREFIX@/share/pixmaps/xnetcardconfig.png" -t "Configure network" -d -m "Network configuration requires^superuser priveleges.") >/dev/null 2>&1 || {
+		(gksu  -D /usr/share/applications/xfld-xnetcardconfig.desktop -- "$0") >/dev/null 2>&1 || {
 			xmessage -center -file - <<EOF
 Unable to start the network configuration tool.
 Please setup sudo first!