Tags: patch Attached are two patches that add the subpackage 'olsrd-gui' which includes the GTK GUI app. There is currently no upstream manpage for it, so I wrote a very basic one and forwarded it upstream.
>From 78d516e55afd7d8fc26cf4592a14a21cc6b3d6cd Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner <h...@eds.org> Date: Thu, 2 Feb 2012 13:25:58 -0500 Subject: [PATCH 1/9] add gui/linux-gtk to the auto_build, auto_clean, and auto_install targets --- debian/rules | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/debian/rules b/debian/rules index 72761c4..f6e1067 100755 --- a/debian/rules +++ b/debian/rules @@ -9,14 +9,18 @@ override_dh_auto_build: $(MAKE) $(MAKE) libs + $(MAKE) -C gui/linux-gtk override_dh_auto_clean: [ ! -f Makefile ] || $(MAKE) uberclean + $(MAKE) -C $(CURDIR)/gui/linux-gtk clean + rm -f gui/linux-gtk/olsrd-gui rm -f $(CURDIR)/lib/*/src/*.o $(CURDIR)/lib/*/*.so.?.? override_dh_auto_install: $(MAKE) DESTDIR=$(CURDIR)/debian/olsrd install STRIP=: $(MAKE) DESTDIR=$(CURDIR)/debian/olsrd-plugins libs_install STRIP=: + $(MAKE) -C gui/linux-gtk DESTDIR=$(CURDIR)/debian/olsrd-gui install # provide better default config rm $(CURDIR)/debian/olsrd/etc/olsrd.conf cp $(CURDIR)/debian/olsrd.conf $(CURDIR)/debian/olsrd/etc/olsrd/olsrd.conf -- 1.7.5.4
>From b93489a857060e08f6dc7cab91ec00db38827bcc Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner <h...@eds.org> Date: Thu, 2 Feb 2012 13:56:42 -0500 Subject: [PATCH 2/9] added olsrd-gui sub-package and set needed Build-Depends --- debian/control | 20 +++++++++++++++++++- debian/olsrd-gui.docs | 1 + debian/rules | 3 +++ 3 files changed, 23 insertions(+), 1 deletions(-) create mode 100644 debian/olsrd-gui.docs diff --git a/debian/control b/debian/control index b380295..8bcf381 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,12 @@ Source: olsrd Section: net Priority: extra Maintainer: Roland Stigge <sti...@antcom.de> -Build-Depends: debhelper (>= 8), bison, flex +Build-Depends: debhelper (>= 8), + bison, + flex, + pkg-config, + libgtk2.0-dev, + python-gtk2-dev Standards-Version: 3.9.2 Homepage: http://olsr.org/ Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/olsrd/ @@ -50,3 +55,16 @@ Description: various plugins to enhance olsrd * arprefresh - optimize kernel arp cache from olsr UDP sniffing * mdnsp - multicast DNS via OLSR mesh network * p2pd - distribute P2P Discovery messages + +Package: olsrd-gui +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, olsrd (= ${binary:Version}) +Description: GTK GUI to control and get info about olsrd + olsrd-gui is a GTK GUI for controlling and getting information from a running + olsrd, a daemon for OLSR mesh networking. It uses IPC to talk to olsrd, so + /etc/olsrd/olsrd.conf must enable IPC connections for olsrd-gui to work. + . + OLSR operates as a table driven, proactive protocol, i.e., it exchanges + topology information with other nodes of the network regularly. It is + developed to work independently from other protocols. Likewise, OLSR makes no + assumptions about the underlying link-layer. diff --git a/debian/olsrd-gui.docs b/debian/olsrd-gui.docs new file mode 100644 index 0000000..8224622 --- /dev/null +++ b/debian/olsrd-gui.docs @@ -0,0 +1 @@ +gui/linux-gtk/README diff --git a/debian/rules b/debian/rules index f6e1067..091f06b 100755 --- a/debian/rules +++ b/debian/rules @@ -21,6 +21,9 @@ override_dh_auto_install: $(MAKE) DESTDIR=$(CURDIR)/debian/olsrd install STRIP=: $(MAKE) DESTDIR=$(CURDIR)/debian/olsrd-plugins libs_install STRIP=: $(MAKE) -C gui/linux-gtk DESTDIR=$(CURDIR)/debian/olsrd-gui install + install -d $(CURDIR)/debian/olsrd-gui/usr/share/doc/olsrd/ + install -p -m0644 gui/linux-gtk/CHANGELOG \ + $(CURDIR)/debian/olsrd-gui/usr/share/doc/olsrd-gui/changelog # provide better default config rm $(CURDIR)/debian/olsrd/etc/olsrd.conf cp $(CURDIR)/debian/olsrd.conf $(CURDIR)/debian/olsrd/etc/olsrd/olsrd.conf -- 1.7.5.4
>From 7862926bb67236dfe87020407f057eea16dfd061 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner <h...@eds.org> Date: Fri, 3 Feb 2012 13:21:22 -0500 Subject: [PATCH 3/9] add basic manpage for olsrd-gui --- debian/olsrd-gui.1 | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) create mode 100644 debian/olsrd-gui.1 diff --git a/debian/olsrd-gui.1 b/debian/olsrd-gui.1 new file mode 100644 index 0000000..5250fbb --- /dev/null +++ b/debian/olsrd-gui.1 @@ -0,0 +1,23 @@ +.\" Hey, EMACS: -*- nroff -*- +.TH olsrd-gui 1 "2012" +.SH NAME +olsrd-gui \- control and view status of olsrd routing daemon +.SH SYNOPSIS +.B olsrd-gui +[ +.B "host-or-IP" +] +.SH DESCRIPTION +This manual page documents briefly the +.B olsrd-gui +command. It connects to a running olsrd over an IPC connection +configured in +.B /etc/olsrd/olsrd.conf +. +.PP +.SH SEE ALSO +.BR olsrd (8), +.BR olsrd-conf (5). +.br +.SH AUTHOR +olsrd-gui was written by Andreas Tonnesen <andr...@ifi.uio.no>. -- 1.7.5.4
