From 6c5e16595db9bf334eccc81e9ca974be2b673e4f Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 8 Feb 2006 21:12:53 +0000 Subject: * improved manpages. - added nm-vpn-properties, nm-applet manpages - added debian/nm-applet.manpages * uploaded to unstable. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@562 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 8c8bfe3e..e140634f 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,9 @@ clean:: build/network-manager:: /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 - /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 + /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 + /usr/bin/docbook-to-man debian/nm-vpn-properties > nm-vpn-properties.1 + /usr/bin/docbook-to-man debian/nm-applet > nm-applet.1 binary-install/network-manager:: install -m 755 debian/network-manager.dbus-event \ -- cgit 1.3.0-6-gf8a5 From bb6d8522f4b4f65c095a9fef86fffde4dc9438ba Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 8 Feb 2006 21:34:39 +0000 Subject: /me should create manpages in debian/ and not in the toplevel dir git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@566 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index e140634f..8c9ca76f 100755 --- a/debian/rules +++ b/debian/rules @@ -20,8 +20,8 @@ build/network-manager:: /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 - /usr/bin/docbook-to-man debian/nm-vpn-properties > nm-vpn-properties.1 - /usr/bin/docbook-to-man debian/nm-applet > nm-applet.1 + /usr/bin/docbook-to-man debian/nm-vpn-properties > debian/nm-vpn-properties.1 + /usr/bin/docbook-to-man debian/nm-applet > debian/nm-applet.1 binary-install/network-manager:: install -m 755 debian/network-manager.dbus-event \ -- cgit 1.3.0-6-gf8a5 From 421d5484e4c5fd487b727b8a1241b72633fefd2f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 8 Feb 2006 23:09:57 +0000 Subject: Fixed some paths and typos when creating manpages from sgml. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@568 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 8c9ca76f..ba334f02 100755 --- a/debian/rules +++ b/debian/rules @@ -19,9 +19,9 @@ clean:: build/network-manager:: /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 - /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 - /usr/bin/docbook-to-man debian/nm-vpn-properties > debian/nm-vpn-properties.1 - /usr/bin/docbook-to-man debian/nm-applet > debian/nm-applet.1 + /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 + /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 + /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 binary-install/network-manager:: install -m 755 debian/network-manager.dbus-event \ -- cgit 1.3.0-6-gf8a5 From 1ca553446c1acb38aae5f114cb9b0e505b07a98c Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Thu, 9 Feb 2006 09:24:40 +0000 Subject: * uploaded to unstable. * removed network-manager.doc as it was empty. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@571 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index ba334f02..fd5c101c 100755 --- a/debian/rules +++ b/debian/rules @@ -18,10 +18,10 @@ clean:: build/network-manager:: - /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 - /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 - /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 + /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 + /usr/bin/docbook-to-man debian/nm-vpn-properties > debian/nm-vpn-properties.1 + /usr/bin/docbook-to-man debian/nm-applet > debian/nm-applet.1 binary-install/network-manager:: install -m 755 debian/network-manager.dbus-event \ -- cgit 1.3.0-6-gf8a5 From b5e16541a22dd3b41ea52bbd3aefb0cb21318ccb Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Thu, 9 Feb 2006 15:08:23 +0000 Subject: now manpages are built correctly git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@572 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index fd5c101c..eec349aa 100755 --- a/debian/rules +++ b/debian/rules @@ -20,8 +20,8 @@ build/network-manager:: /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 - /usr/bin/docbook-to-man debian/nm-vpn-properties > debian/nm-vpn-properties.1 - /usr/bin/docbook-to-man debian/nm-applet > debian/nm-applet.1 + /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 + /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 binary-install/network-manager:: install -m 755 debian/network-manager.dbus-event \ -- cgit 1.3.0-6-gf8a5 From 074add86a595038fe99e9cd5294435db3621588a Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Thu, 9 Feb 2006 20:14:52 +0000 Subject: * added nm-vpn-properties.desktop, nm-logo.xpm * added dbus_access_network_manager and dbus_access_nm_applet patches: - switched to group netdev - updated the dep on dhcdbd * removed network-manager.doc as it was empty. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@574 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index eec349aa..e860e29a 100755 --- a/debian/rules +++ b/debian/rules @@ -28,11 +28,7 @@ binary-install/network-manager:: debian/network-manager/etc/dbus-1/event.d/25NetworkManager install -m 755 debian/network-manager-dispatcher.dbus-event \ debian/network-manager/etc/dbus-1/event.d/26NetworkManagerDispatcher - install -d -m 755 debian/network-manager/etc/NetworkManager/dispatcher.d - install -m 644 debian/network-manager.dbus-conf \ - debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf - -binary-install/network-manager-gnome:: - install -m 644 debian/nm-applet.conf \ - debian/network-manager/etc/dbus-1/system.d/nm-applet.conf +binary-install/network-manger-gnome:: + install -m 644 debian/nm-logo.xpm \ + debian/network-manager-gnome/usr/share/pixmaps -- cgit 1.3.0-6-gf8a5 From 72f8e32d346062dc259ba238817d362e5635d052 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 18 Feb 2006 13:22:46 +0000 Subject: added by default -lm flag git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@609 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index e860e29a..93930f8d 100755 --- a/debian/rules +++ b/debian/rules @@ -4,6 +4,8 @@ include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk +DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS=" -Wl,-z,defs -Wl,-O1" + DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ --without-named \ -- cgit 1.3.0-6-gf8a5 From d7759dd3f052a151b3a2e3d85a430e331068e031 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 18 Feb 2006 13:25:24 +0000 Subject: really added -lm flag git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@610 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 93930f8d..09657a86 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS=" -Wl,-z,defs -Wl,-O1" +DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lm" DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ -- cgit 1.3.0-6-gf8a5 From cf23b879dff37054f6b1404eb1d902da765bc765 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 4 Mar 2006 20:07:31 +0000 Subject: first debian release of NM 0.6 (taken from the experimental branch) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@710 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 09657a86..6c5a5ce9 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,7 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lm" DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ --without-named \ + --with-wpa_supplicant=/usr/sbin/wpa_supplicant \ --with-dhcdbd=/usr/sbin/dhcdbd \ --with-distro=debian -- cgit 1.3.0-6-gf8a5 From 2f1a307248f079badf3f68b2c0770a94ccafdfc2 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 4 Mar 2006 21:38:14 +0000 Subject: installed nm-vpn-properties.desktop git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@721 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 6c5a5ce9..17ec095f 100755 --- a/debian/rules +++ b/debian/rules @@ -35,3 +35,5 @@ binary-install/network-manager:: binary-install/network-manger-gnome:: install -m 644 debian/nm-logo.xpm \ debian/network-manager-gnome/usr/share/pixmaps + install -m 644 debian/nm-vpn-properties.desktop + debian/network-manager-gnome/usr/share/applications -- cgit 1.3.0-6-gf8a5 From a7f7a3ada1f631ac0947c75a37196a97d1855c2c Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 4 Mar 2006 22:01:58 +0000 Subject: really install desktop+xpm files git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@723 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 17ec095f..4425220c 100755 --- a/debian/rules +++ b/debian/rules @@ -32,8 +32,9 @@ binary-install/network-manager:: install -m 755 debian/network-manager-dispatcher.dbus-event \ debian/network-manager/etc/dbus-1/event.d/26NetworkManagerDispatcher -binary-install/network-manger-gnome:: +binary-install/network-manager-gnome:: install -m 644 debian/nm-logo.xpm \ - debian/network-manager-gnome/usr/share/pixmaps - install -m 644 debian/nm-vpn-properties.desktop - debian/network-manager-gnome/usr/share/applications + debian/network-manager-gnome/usr/share/pixmaps/nm-logo.xpm + install -m 644 debian/nm-vpn-properties.desktop \ + debian/network-manager-gnome/usr/share/applications/nm-vpn-properties.desktop + -- cgit 1.3.0-6-gf8a5 From 96f4bb63e1aea9d7428205b05a0cd007ce01ca79 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 14 Mar 2006 16:50:45 +0000 Subject: * New upstream release. * Added myself to uploaders. * Reformatted changelog, always indent - bullet points. * Added dependency on dbus (>= 0.60) * Fixed a small typo in network-manager.postinst * Downgraded dependency of wpasupplicant to 0.4.8. Given that the wpasupplicant includes my patch, this should be enough. If not, we will raise this dependency to 0.5.1 again. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@745 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 3 --- 1 file changed, 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 4425220c..c0ba849a 100755 --- a/debian/rules +++ b/debian/rules @@ -8,19 +8,16 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lm" DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ - --without-named \ --with-wpa_supplicant=/usr/sbin/wpa_supplicant \ --with-dhcdbd=/usr/sbin/dhcdbd \ --with-distro=debian clean:: - rm -f po/*.gmo rm -f debian/*.1 build/network-manager:: - /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 -- cgit 1.3.0-6-gf8a5 From c1e970a529ac74c9c31a295e134e2f8d554da783 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 27 Mar 2006 20:58:37 +0000 Subject: Forgot to remove the installation of the icon and desktop file from debian/rules... git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@766 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 6 ------ 1 file changed, 6 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index c0ba849a..ee921281 100755 --- a/debian/rules +++ b/debian/rules @@ -29,9 +29,3 @@ binary-install/network-manager:: install -m 755 debian/network-manager-dispatcher.dbus-event \ debian/network-manager/etc/dbus-1/event.d/26NetworkManagerDispatcher -binary-install/network-manager-gnome:: - install -m 644 debian/nm-logo.xpm \ - debian/network-manager-gnome/usr/share/pixmaps/nm-logo.xpm - install -m 644 debian/nm-vpn-properties.desktop \ - debian/network-manager-gnome/usr/share/applications/nm-vpn-properties.desktop - -- cgit 1.3.0-6-gf8a5 From 573354e6c4a37cb9de06a29eb2ad4d01889c87d6 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 1 Apr 2006 12:46:47 +0000 Subject: The wpa_supplicant binary was moved from /usr/sbin to /sbin. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@771 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index ee921281..d8813abe 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lm" DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ - --with-wpa_supplicant=/usr/sbin/wpa_supplicant \ + --with-wpa_supplicant=/sbin/wpa_supplicant \ --with-dhcdbd=/usr/sbin/dhcdbd \ --with-distro=debian -- cgit 1.3.0-6-gf8a5 From f7e18eab4786f1e1be4b25c7231074d66d3e430a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 5 Apr 2006 17:29:39 +0000 Subject: Integration work. Scripts in /etc/network/if-*.d/ are now called properly by NetworkManagerDispatcher. Thanks to the Ubuntu guys for this works. It's mostly copied from their package. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@790 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index d8813abe..121f42b8 100755 --- a/debian/rules +++ b/debian/rules @@ -28,4 +28,6 @@ binary-install/network-manager:: debian/network-manager/etc/dbus-1/event.d/25NetworkManager install -m 755 debian/network-manager-dispatcher.dbus-event \ debian/network-manager/etc/dbus-1/event.d/26NetworkManagerDispatcher - + install -m 755 debian/network-manager-dispatcher.script \ + debian/network-manager/etc/NetworkManager/dispatcher.d/01ifupdown + -- cgit 1.3.0-6-gf8a5 From f9ec882bec72c776c55aee51f2e299f6af2e52ce Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 9 May 2006 19:27:53 +0000 Subject: We don't need LDFLAGS="-lm". It builds fine without it, even with -Wl,--as-needed git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@818 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 2 -- 1 file changed, 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 121f42b8..28d9dab5 100755 --- a/debian/rules +++ b/debian/rules @@ -4,8 +4,6 @@ include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lm" - DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ --with-wpa_supplicant=/sbin/wpa_supplicant \ -- cgit 1.3.0-6-gf8a5 From 35c2556dbd2c86a6adbf1657cb7c54de20aea56b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 15 May 2006 22:12:13 +0000 Subject: Add the NEWS.Debian file only to the network-manager package git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@840 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 28d9dab5..ebbeb317 100755 --- a/debian/rules +++ b/debian/rules @@ -4,6 +4,8 @@ include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk +DEB_INSTALL_DOCS_ALL := README AUTHORS TODO + DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ --with-wpa_supplicant=/sbin/wpa_supplicant \ -- cgit 1.3.0-6-gf8a5 From e1060c25e2b8dcf18a77886a13487c05544ff303 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Tue, 15 Aug 2006 18:36:50 +0000 Subject: updated manpages git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@950 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 1 - 1 file changed, 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index ebbeb317..91f3f158 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,6 @@ clean:: build/network-manager:: - /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 -- cgit 1.3.0-6-gf8a5 From a4c7c6bcccfb407fc6f4c9746e295f8262206f38 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Tue, 15 Aug 2006 18:44:14 +0000 Subject: fixed debian/rules git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@953 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 91f3f158..cf7bdef2 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,7 @@ clean:: build/network-manager:: - /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 + /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 -- cgit 1.3.0-6-gf8a5 From 4ab5ad85236aa35dfbd2459d274e798c9f49d777 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 15 Aug 2006 21:00:45 +0000 Subject: - We already use the upstream man page for NetworkManagerDispatcher; do the same for the NetworkManager man page. - As the upstream man pages of NetworkManager and NetworkManagerDispatcher reference the nm-tool man page and we already install the nm-tool man page it makes sense to also install the corresponding nm-tool binary ;-) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@954 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 1 - 1 file changed, 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index cf7bdef2..57cbedb3 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,6 @@ clean:: build/network-manager:: - /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 -- cgit 1.3.0-6-gf8a5 From 4310bb5e2f9d9e56a0c1e544adf87d7c91d74c76 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Apr 2007 21:00:59 +0000 Subject: Switch to regular SysV init scripts - Rename the start script properly so they are picked up by dh_installinit - Start them at S26, stop them at K14 - preinst,postinst,postrm: Make sure, the old conffiles for NetworkManager(Dispatcher) are removed/renamed properly. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1434 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 57cbedb3..55dd9d1d 100755 --- a/debian/rules +++ b/debian/rules @@ -12,6 +12,8 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dhcdbd=/usr/sbin/dhcdbd \ --with-distro=debian +DEB_DH_INSTALLINIT_ARGS := -- start 26 2 3 4 5 . stop 14 0 1 6 . + clean:: rm -f po/*.gmo rm -f debian/*.1 @@ -22,10 +24,7 @@ build/network-manager:: /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 binary-install/network-manager:: - install -m 755 debian/network-manager.dbus-event \ - debian/network-manager/etc/dbus-1/event.d/25NetworkManager - install -m 755 debian/network-manager-dispatcher.dbus-event \ - debian/network-manager/etc/dbus-1/event.d/26NetworkManagerDispatcher + dh_installinit --name network-manager-dispatcher $(DEB_DH_INSTALLINIT_ARGS) install -m 755 debian/network-manager-dispatcher.script \ debian/network-manager/etc/NetworkManager/dispatcher.d/01ifupdown -- cgit 1.3.0-6-gf8a5 From 614e759115bb291136e155f2b37af80780ef0ab3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 26 Aug 2007 22:17:40 +0000 Subject: * Upstream has split nm-applet into a separate package. This means we no longer build the network-manager-gnome binary package from this source package. - Removed files that are now part of the new nm-applet source package + debian/network-manager-gnome.README.Debian + debian/patches/10-po_fr.patch + debian/patches/14-po_de.patch + debian/patches/03-dbus_access_nm_applet.patch + debian/network-manager-gnome.manpages + debian/nm-applet.sgml + debian/network-manager.install + debian/network-manager-gnome.install - debian/control + Remove the binary package network-manager-gnome. + Add Conflicts/Replaces: network-manager-gnome (<< 0.6.5-1) as nm-vpn-properties is now part of the network-manager binary package. + Update Build-Depends. Add autotools-dev and libglib2.0-dev, remove libpanel-applet2-dev. - debian/rules + Do not build the nm-applet.1 manpage anymore. + Exclude nm-vpn-properties from dh_shlibdeps. This is a temporary workaround until this binary has also been moved into the nm-applet source package. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1675 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 55dd9d1d..a4a1c76d 100755 --- a/debian/rules +++ b/debian/rules @@ -14,6 +14,8 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ DEB_DH_INSTALLINIT_ARGS := -- start 26 2 3 4 5 . stop 14 0 1 6 . +DEB_DH_SHLIBDEPS_ARGS := -Xnm-vpn-properties + clean:: rm -f po/*.gmo rm -f debian/*.1 @@ -21,7 +23,6 @@ clean:: build/network-manager:: /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 - /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 binary-install/network-manager:: dh_installinit --name network-manager-dispatcher $(DEB_DH_INSTALLINIT_ARGS) -- cgit 1.3.0-6-gf8a5