Update package names and fix library FTBFS

4 files changed, 19 insertions, 19 deletions

diff --git a/servers/admin_sys_ctl_server_lin/debian/changelog b/servers/admin_sys_ctl_server_lin/debian/changelog
index 3b91574..f1de5f2 100644
--- a/servers/admin_sys_ctl_server_lin/debian/changelog
+++ b/servers/admin_sys_ctl_server_lin/debian/changelog
@@ -1,4 +1,4 @@
-remotefpga-adminsysctlserver (0.5-0ubuntu0) karmic; urgency=low
+ulab-adminsysctlserver (0.5-0ubuntu0) karmic; urgency=low
 
   * Karmic rebuild
 
diff --git a/servers/admin_sys_ctl_server_lin/debian/control b/servers/admin_sys_ctl_server_lin/debian/control
index fc7149a..bdef1d4 100644
--- a/servers/admin_sys_ctl_server_lin/debian/control
+++ b/servers/admin_sys_ctl_server_lin/debian/control
@@ -1,15 +1,15 @@
-Source: remotefpga-adminsysctlserver
+Source: ulab-adminsysctlserver
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdekrb-trinity, libtqtrla, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdekrb-trinity-dev, libtqtrla-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: remotefpga-adminsysctlserver
+Package: ulab-adminsysctlserver
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: RemoteFPGA System Administration Control Server
- RemoteFPGA System Administration Control Server
+Description: uLab System Administration Control Server
+ uLab System Administration Control Server
  This allows an administrator to manage various aspects
- of an active RemoteFPGA system, including viewing and 
+ of an active uLab system, including viewing and 
  terminating user sessions.
diff --git a/servers/admin_sys_ctl_server_lin/debian/remotefpga-adminsysctlserver.init b/servers/admin_sys_ctl_server_lin/debian/ulab-adminsysctlserver.init
index 7be0baa..87124e2 100644
--- a/servers/admin_sys_ctl_server_lin/debian/remotefpga-adminsysctlserver.init
+++ b/servers/admin_sys_ctl_server_lin/debian/ulab-adminsysctlserver.init
@@ -1,18 +1,18 @@
 #!/bin/sh
 ### BEGIN INIT INFO
-# Provides:          remotefpga-adminsysctlserver
+# Provides:          ulab-adminsysctlserver
 # Required-Start:    $local_fs $remote_fs
 # Required-Stop:     $local_fs $remote_fs
 # Should-Start:      console-screen kbd acpid hal krb5-kdc nis
 # Should-Stop:       console-screen kbd
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: RemoteFPGA System Administration Control Server
-# Description:       RemoteFPGA System Administration Control Server
+# Short-Description: uLab System Administration Control Server
+# Description:       uLab System Administration Control Server
 ### END INIT INFO
-# /etc/init.d/remotefpga-adminsysctlserver: start or stop the RemoteFPGA System Administration Control Server
+# /etc/init.d/ulab-adminsysctlserver: start or stop the uLab System Administration Control Server
 #
-# description: RemoteFPGA System Administration Control Server
+# description: uLab System Administration Control Server
 #
 
 . /lib/lsb/init-functions
@@ -24,7 +24,7 @@ DAEMON=/opt/trinity/bin/remotefpga_adminsysctlserver
 PIDFILE=/var/run/remotefpga_authserver.pid
 UPGRADEFILE=/var/run/remotefpga_authserver.upgrade
 
-DESC="RemoteFPGA System Administration Control Server"
+DESC="uLab System Administration Control Server"
 
 # If we upgraded the daemon, we can't use the --exec argument to
 # start-stop-daemon since the inode will have changed.  The risk here is that
@@ -60,13 +60,13 @@ case "$1" in
   ;;
 
   restart)
-    /etc/init.d/remotefpga-adminsysctlserver stop
+    /etc/init.d/ulab-adminsysctlserver stop
     if [ -f $PIDFILE ]; then
       if stillrunning; then
         exit 1
       fi
     fi
-    /etc/init.d/remotefpga-adminsysctlserver start
+    /etc/init.d/ulab-adminsysctlserver start
   ;;
 
   reload)
@@ -80,7 +80,7 @@ case "$1" in
   ;;
 
   force-reload)
-    /etc/init.d/remotefpga-adminsysctlserver reload
+    /etc/init.d/ulab-adminsysctlserver reload
   ;;
 
   stop)
@@ -100,7 +100,7 @@ case "$1" in
   ;;
 
   *)
-    echo "Usage: /etc/init.d/remotefpga-adminsysctlserver {start|stop|restart|reload|force-reload}"
+    echo "Usage: /etc/init.d/ulab-adminsysctlserver {start|stop|restart|reload|force-reload}"
     exit 1
     ;;
 esac
diff --git a/servers/admin_sys_ctl_server_lin/src/main.cpp b/servers/admin_sys_ctl_server_lin/src/main.cpp
index e8c7184..e074a14 100644
--- a/servers/admin_sys_ctl_server_lin/src/main.cpp
+++ b/servers/admin_sys_ctl_server_lin/src/main.cpp
@@ -39,13 +39,13 @@
 
 #include "admin_sys_ctl.h"
 
-static const char description[] = I18N_NOOP("RemoteFPGA System Administration Control Server");
+static const char description[] = I18N_NOOP("uLab System Administration Control Server");
 
 static const char version[] = "v0.0.1";
 
 int main(int argc, char *argv[])
 {
-	TDEAboutData aboutData( "remotefpga_admin_sys_ctl_server", I18N_NOOP("RemoteFPGA System Administration Control Server"),
+	TDEAboutData aboutData( "remotefpga_admin_sys_ctl_server", I18N_NOOP("uLab System Administration Control Server"),
 		version, description, TDEAboutData::License_GPL,
 		"(c) 2012, Timothy Pearson");
 		aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net");