Fix installation of nm-online.

4 files changed, 49 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 22e5e2935..1fc4d6c35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+network-manager (0.8.2-2) UNRELEASED; urgency=low
+
+  * Fix installation of nm-online.
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 18 Dec 2010 12:49:20 +0100
+
 network-manager (0.8.2-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/network-manager.install b/debian/network-manager.install
index f8a51eb99..1476eb1c8 100644
--- a/debian/network-manager.install
+++ b/debian/network-manager.install
@@ -1,5 +1,6 @@
 debian/tmp/usr/sbin/NetworkManager
 debian/tmp/usr/bin/nm-tool
+debian/tmp/usr/bin/nm-online
 debian/tmp/usr/bin/nmcli
 debian/tmp/usr/lib/NetworkManager/nm-crash-logger
 debian/tmp/usr/lib/NetworkManager/nm-dhcp-client.action
@@ -10,7 +11,7 @@ debian/tmp/usr/lib/NetworkManager/libnm-settings-plugin-ifupdown.so
 debian/tmp/usr/lib/pppd/*/*.so
 debian/tmp/usr/share/locale/
 debian/tmp/usr/share/dbus-1/system-services/
-debian/tmp//usr/share/polkit-1/
+debian/tmp/usr/share/polkit-1/
 debian/tmp/etc/dbus-1/system.d/NetworkManager.conf
 debian/tmp/etc/dbus-1/system.d/nm-dhcp-client.conf
 debian/tmp/etc/dbus-1/system.d/nm-dispatcher.conf
@@ -18,4 +19,3 @@ debian/tmp/etc/dbus-1/system.d/nm-avahi-autoipd.conf
 debian/tmp/etc/NetworkManager/dispatcher.d/
 debian/tmp/lib/udev/rules.d/*.rules
 debian/NetworkManager.conf etc/NetworkManager/
-test/nm-online usr/bin/
diff --git a/debian/patches/70-install-nm-online.patch b/debian/patches/70-install-nm-online.patch
new file mode 100644
index 000000000..af5d67ada
--- /dev/null
+++ b/debian/patches/70-install-nm-online.patch
@@ -0,0 +1,40 @@
+From 3619b3b834b9227628a5d73583401f404e2c46aa Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl@debian.org>
+Date: Sat, 18 Dec 2010 12:04:07 +0100
+Subject: [PATCH] Install nm-online to bindir
+
+---
+ test/Makefile.am |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: network-manager/test/Makefile.am
+===================================================================
+--- network-manager.orig/test/Makefile.am	2010-11-29 00:51:00.710135988 +0100
++++ network-manager/test/Makefile.am	2010-12-18 12:38:17.333677825 +0100
+@@ -10,9 +10,9 @@
+ 	-DNM_RUN_DIR=\"$(rundir)\" \
+ 	-DDATADIR=\"$(datadir)\"
+ 
+-bin_PROGRAMS = nm-tool
++bin_PROGRAMS = nm-tool nm-online
+ 
+-noinst_PROGRAMS = nm-online libnm-glib-test
++noinst_PROGRAMS = libnm-glib-test
+ 
+ nm_tool_SOURCES = nm-tool.c
+ nm_tool_LDADD = \
+Index: network-manager/test/Makefile.in
+===================================================================
+--- network-manager.orig/test/Makefile.in	2010-12-18 12:38:31.881683944 +0100
++++ network-manager/test/Makefile.in	2010-12-18 12:39:35.693688720 +0100
+@@ -34,8 +34,8 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-bin_PROGRAMS = nm-tool$(EXEEXT)
+-noinst_PROGRAMS = nm-online$(EXEEXT) libnm-glib-test$(EXEEXT)
++bin_PROGRAMS = nm-tool$(EXEEXT) nm-online$(EXEEXT)
++noinst_PROGRAMS = libnm-glib-test$(EXEEXT)
+ subdir = test
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/debian/patches/series b/debian/patches/series
index 4705ad25a..d478015d9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 40-umanaged-interfaces.patch
 50-bridge-interfaces.patch
 60-policy-stop-touching-etc-hosts.patch
+70-install-nm-online.patch