diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-26 23:48:35 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-26 23:48:35 -0600 |
commit | e21781df2ef6bfdb1a650bab5298b0261c8f7d3c (patch) | |
tree | 27ca6bb1731872f32669ac93ef714ffe38b58023 /servers/gpib_server_lin | |
parent | 25b343530fea2586973f2d3fe1d068c1e37d5d38 (diff) | |
download | ulab-e21781df2ef6bfdb1a650bab5298b0261c8f7d3c.tar.gz ulab-e21781df2ef6bfdb1a650bab5298b0261c8f7d3c.zip |
Update package names and fix library FTBFS
Diffstat (limited to 'servers/gpib_server_lin')
-rw-r--r-- | servers/gpib_server_lin/debian/changelog | 2 | ||||
-rw-r--r-- | servers/gpib_server_lin/debian/control | 10 | ||||
-rw-r--r-- | servers/gpib_server_lin/debian/ulab-gpibserver.init (renamed from servers/gpib_server_lin/debian/remotefpga-gpibserver.init) | 20 | ||||
-rw-r--r-- | servers/gpib_server_lin/src/main.cpp | 4 | ||||
-rw-r--r-- | servers/gpib_server_lin/src/main_server_lin.cpp | 2 |
5 files changed, 19 insertions, 19 deletions
diff --git a/servers/gpib_server_lin/debian/changelog b/servers/gpib_server_lin/debian/changelog index 089c5c3..845dfc0 100644 --- a/servers/gpib_server_lin/debian/changelog +++ b/servers/gpib_server_lin/debian/changelog @@ -1,4 +1,4 @@ -remotefpga-gpibserver (0.5-0ubuntu0) karmic; urgency=low +ulab-gpibserver (0.5-0ubuntu0) karmic; urgency=low * Karmic rebuild diff --git a/servers/gpib_server_lin/debian/control b/servers/gpib_server_lin/debian/control index 8c90da9..a7dba49 100644 --- a/servers/gpib_server_lin/debian/control +++ b/servers/gpib_server_lin/debian/control @@ -1,12 +1,12 @@ -Source: remotefpga-gpibserver +Source: ulab-gpibserver Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdekrb-trinity, libtqtrla, libgpib0-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdekrb-trinity-dev, libtqtrla-dev, libgpib0-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 -Package: remotefpga-gpibserver +Package: ulab-gpibserver Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: RemoteFPGA GPIB Instrumentation Server - RemoteFPGA GPIB Instrumentation Server +Description: uLab GPIB Instrumentation Server + uLab GPIB Instrumentation Server diff --git a/servers/gpib_server_lin/debian/remotefpga-gpibserver.init b/servers/gpib_server_lin/debian/ulab-gpibserver.init index bc79e75..d455d19 100644 --- a/servers/gpib_server_lin/debian/remotefpga-gpibserver.init +++ b/servers/gpib_server_lin/debian/ulab-gpibserver.init @@ -1,18 +1,18 @@ #!/bin/sh ### BEGIN INIT INFO -# Provides: remotefpga-gpibserver +# Provides: ulab-gpibserver # 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 GPIB Instrumentation Server -# Description: RemoteFPGA GPIB Instrumentation Server +# Short-Description: uLab GPIB Instrumentation Server +# Description: uLab GPIB Instrumentation Server ### END INIT INFO -# /etc/init.d/remotefpga-gpibserver: start or stop the RemoteFPGA GPIB Instrumentation Server +# /etc/init.d/ulab-gpibserver: start or stop the uLab GPIB Instrumentation Server # -# description: RemoteFPGA GPIB Instrumentation Server +# description: uLab GPIB Instrumentation Server # . /lib/lsb/init-functions @@ -24,7 +24,7 @@ DAEMON=/opt/trinity/bin/remotefpga_gpibserver PIDFILE=/var/run/remotefpga_authserver.pid UPGRADEFILE=/var/run/remotefpga_authserver.upgrade -DESC="RemoteFPGA GPIB Instrumentation Server" +DESC="uLab GPIB Instrumentation 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-gpibserver stop + /etc/init.d/ulab-gpibserver stop if [ -f $PIDFILE ]; then if stillrunning; then exit 1 fi fi - /etc/init.d/remotefpga-gpibserver start + /etc/init.d/ulab-gpibserver start ;; reload) @@ -80,7 +80,7 @@ case "$1" in ;; force-reload) - /etc/init.d/remotefpga-gpibserver reload + /etc/init.d/ulab-gpibserver reload ;; stop) @@ -100,7 +100,7 @@ case "$1" in ;; *) - echo "Usage: /etc/init.d/remotefpga-gpibserver {start|stop|restart|reload|force-reload}" + echo "Usage: /etc/init.d/ulab-gpibserver {start|stop|restart|reload|force-reload}" exit 1 ;; esac diff --git a/servers/gpib_server_lin/src/main.cpp b/servers/gpib_server_lin/src/main.cpp index 3ed9d40..89caa8e 100644 --- a/servers/gpib_server_lin/src/main.cpp +++ b/servers/gpib_server_lin/src/main.cpp @@ -39,13 +39,13 @@ #include "gpib_conn.h" -static const char description[] = I18N_NOOP("RemoteFPGA GPIB Server"); +static const char description[] = I18N_NOOP("uLab GPIB Server"); static const char version[] = "v0.0.1"; int main(int argc, char *argv[]) { - TDEAboutData aboutData( "remotefpga_gpib_server", I18N_NOOP("RemoteFPGA GPIB Server"), + TDEAboutData aboutData( "remotefpga_gpib_server", I18N_NOOP("uLab GPIB Server"), version, description, TDEAboutData::License_GPL, "(c) 2012, Timothy Pearson"); aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net"); diff --git a/servers/gpib_server_lin/src/main_server_lin.cpp b/servers/gpib_server_lin/src/main_server_lin.cpp index 9788566..589f5d5 100644 --- a/servers/gpib_server_lin/src/main_server_lin.cpp +++ b/servers/gpib_server_lin/src/main_server_lin.cpp @@ -1193,7 +1193,7 @@ int main(int argc, char *argv[]) // Register signal handler signal(SIGPIPE, signal_handler_IO); - printf("RemoteFPGA GPIB Server v%s.%s%s\n\r", SERVER_MAJOR, SERVER_MINOR, SERVER_REVISION); + printf("uLab GPIB Server v%s.%s%s\n\r", SERVER_MAJOR, SERVER_MINOR, SERVER_REVISION); printf("(c) %s Timothy Pearson\n\r", COPYRIGHT_DATE); printf("(c) %s Remote Laboratory FOSS Contributors\n\r", FOSS_COPYRIGHT_DATE); |