From 109a7976fe0363e22681d919258b3d9ce4b3bfb3 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Tue, 10 Jan 2006 15:31:05 +0000 Subject: first import of dhcbdb and networkmanager git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@440 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100755 debian/rules (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000..b8337510 --- /dev/null +++ b/debian/rules @@ -0,0 +1,26 @@ +#!/usr/bin/make -f + +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_EXTRA_FLAGS += \ + --with-dbus-sys=/etc/dbus-1/system.d \ + --libexecdir=/usr/bin \ + --localstatedir=/var/run \ + --without-named \ + --with-dhcdbd=/sbin/dhcdbd \ + --with-distro=debian + +clean:: + + rm -f po/*.gmo + +install_arch:: + + 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/25NetworkManagerDispatcher + mkdir -p -m 755 debian/network-manager/etc/NetworkManager/dispatcher.d + install -m 644 debian/nm-applet.conf debian/network-manager/etc/dbus-1/system.d/nm-applet.conf + install -m 644 debian/network-manager.dbus-conf debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf + -- cgit 1.3.0-6-gf8a5 From 735ec145a851e75ce4a090979a41a0299fc46bed Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Fri, 13 Jan 2006 19:38:19 +0000 Subject: addedd dhcdbd.dhcp3 script and some minor changes in rules git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@472 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index b8337510..03108f91 100755 --- a/debian/rules +++ b/debian/rules @@ -16,11 +16,15 @@ clean:: rm -f po/*.gmo -install_arch:: +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/25NetworkManagerDispatcher + mkdir -p -m 755 debian/network-manager/etc/NetworkManager/dispatcher.d install -m 644 debian/nm-applet.conf debian/network-manager/etc/dbus-1/system.d/nm-applet.conf install -m 644 debian/network-manager.dbus-conf debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf - + + mkdir -p debian/network-manager/etc/dhcp3/dhclient-exit-hooks.d/ + cp debian/dhcdbd.dhcp3 debian/network-manager/etc/dhcp3/dhclient-exit-hooks.d/dhcdbd + -- cgit 1.3.0-6-gf8a5 From 66d4cc2e4760d67230ae61fd9e87178d14c11456 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 16 Jan 2006 08:48:43 +0000 Subject: some changes git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@475 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 03108f91..83aaf28b 100755 --- a/debian/rules +++ b/debian/rules @@ -25,6 +25,3 @@ binary-install/network-manager:: install -m 644 debian/nm-applet.conf debian/network-manager/etc/dbus-1/system.d/nm-applet.conf install -m 644 debian/network-manager.dbus-conf debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf - mkdir -p debian/network-manager/etc/dhcp3/dhclient-exit-hooks.d/ - cp debian/dhcdbd.dhcp3 debian/network-manager/etc/dhcp3/dhclient-exit-hooks.d/dhcdbd - -- cgit 1.3.0-6-gf8a5 From 83d2953d053534e4098f39eeefc47362b59c4c07 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 16 Jan 2006 10:29:50 +0000 Subject: addedd lintian-ovveride git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@482 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 83aaf28b..cc9180c5 100755 --- a/debian/rules +++ b/debian/rules @@ -25,3 +25,6 @@ binary-install/network-manager:: install -m 644 debian/nm-applet.conf debian/network-manager/etc/dbus-1/system.d/nm-applet.conf install -m 644 debian/network-manager.dbus-conf debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf + install -d $(CURDIR)/debian/network-manager/usr/share/lintian/overrides/network-manager + install -m 0644 debian/network-manager.lintian-override $(CURDIR)/debian/network-manager/usr/share/lintian/overrides/network-manager + -- cgit 1.3.0-6-gf8a5 From 2b775e4e7330ce0401e31a2768f941d90caf1cbb Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 16 Jan 2006 16:59:49 +0000 Subject: s/mkdir -p/install -d git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@484 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index cc9180c5..080fa11c 100755 --- a/debian/rules +++ b/debian/rules @@ -18,13 +18,18 @@ clean:: 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/25NetworkManagerDispatcher + 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/25NetworkManagerDispatcher - mkdir -p -m 755 debian/network-manager/etc/NetworkManager/dispatcher.d - install -m 644 debian/nm-applet.conf debian/network-manager/etc/dbus-1/system.d/nm-applet.conf - install -m 644 debian/network-manager.dbus-conf debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf + install -d -m 755 debian/network-manager/etc/NetworkManager/dispatcher.d + install -m 644 debian/nm-applet.conf \ + debian/network-manager/etc/dbus-1/system.d/nm-applet.conf + install -m 644 debian/network-manager.dbus-conf \ + debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf install -d $(CURDIR)/debian/network-manager/usr/share/lintian/overrides/network-manager - install -m 0644 debian/network-manager.lintian-override $(CURDIR)/debian/network-manager/usr/share/lintian/overrides/network-manager + install -m 0644 debian/network-manager.lintian-override \ + $(CURDIR)/debian/network-manager/usr/share/lintian/overrides/network-manager -- cgit 1.3.0-6-gf8a5 From 1f81d46b3670e8fcadd3ea8d926cb07601d483ff Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 23 Jan 2006 16:47:35 +0000 Subject: changed the default path of dhcdbd git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@519 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 080fa11c..c3d89853 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ --libexecdir=/usr/bin \ --localstatedir=/var/run \ --without-named \ - --with-dhcdbd=/sbin/dhcdbd \ + --with-dhcdbd=/usr/sbin/dhcdbd \ --with-distro=debian clean:: -- cgit 1.3.0-6-gf8a5 From 7f2046277c083ddfc70394044c8b5ba049beabed Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Thu, 26 Jan 2006 18:49:59 +0000 Subject: git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@521 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index c3d89853..2df6896e 100755 --- a/debian/rules +++ b/debian/rules @@ -11,17 +11,21 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ --without-named \ --with-dhcdbd=/usr/sbin/dhcdbd \ --with-distro=debian - + clean:: rm -f po/*.gmo + rm debian/*.1 binary-install/network-manager:: + /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > NetworkManagerDispatcher.1 + /usr/bin/docbook-to-man debian/NetworkManager.sgml > NetworkManager.1 + 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/25NetworkManagerDispatcher + debian/network-manager/etc/dbus-1/event.d/26NetworkManagerDispatcher install -d -m 755 debian/network-manager/etc/NetworkManager/dispatcher.d install -m 644 debian/nm-applet.conf \ -- cgit 1.3.0-6-gf8a5 From 49469a123b5bb6d4cf6b1e496b90cb911769badf Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 30 Jan 2006 22:06:51 +0000 Subject: git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@524 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 2df6896e..e8eabe07 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ clean:: rm -f po/*.gmo - rm debian/*.1 + rm -f debian/*.1 binary-install/network-manager:: -- cgit 1.3.0-6-gf8a5 From e9ef4cc747f5723870a56186a8e34e6590b256e2 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 30 Jan 2006 22:17:34 +0000 Subject: git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@525 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 e8eabe07..7ac3795e 100755 --- a/debian/rules +++ b/debian/rules @@ -17,11 +17,13 @@ clean:: rm -f po/*.gmo rm -f debian/*.1 -binary-install/network-manager:: + +build/network-manager:: /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > NetworkManagerDispatcher.1 /usr/bin/docbook-to-man debian/NetworkManager.sgml > NetworkManager.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 \ -- cgit 1.3.0-6-gf8a5 From 6a37f9bc488a9a376e0cf97c1caf26e69faa7058 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 30 Jan 2006 22:22:58 +0000 Subject: git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@526 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 7ac3795e..2bf8470d 100755 --- a/debian/rules +++ b/debian/rules @@ -20,8 +20,8 @@ clean:: build/network-manager:: - /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > NetworkManagerDispatcher.1 - /usr/bin/docbook-to-man debian/NetworkManager.sgml > NetworkManager.1 + /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 + /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 binary-install/network-manager:: install -m 755 debian/network-manager.dbus-event \ -- cgit 1.3.0-6-gf8a5 From 7e2868fd44ae27b210035b41723862f0545127b6 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 1 Feb 2006 20:29:10 +0000 Subject: git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@530 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 4 ---- 1 file changed, 4 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 2bf8470d..50c9a2f6 100755 --- a/debian/rules +++ b/debian/rules @@ -35,7 +35,3 @@ binary-install/network-manager:: install -m 644 debian/network-manager.dbus-conf \ debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf - install -d $(CURDIR)/debian/network-manager/usr/share/lintian/overrides/network-manager - install -m 0644 debian/network-manager.lintian-override \ - $(CURDIR)/debian/network-manager/usr/share/lintian/overrides/network-manager - -- cgit 1.3.0-6-gf8a5 From 6e19d0b79255448d9fdb17cf8ed408def4b921b5 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 1 Feb 2006 21:14:20 +0000 Subject: git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@533 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 50c9a2f6..65c6dc90 100755 --- a/debian/rules +++ b/debian/rules @@ -28,10 +28,11 @@ 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/nm-applet.conf \ - debian/network-manager/etc/dbus-1/system.d/nm-applet.conf 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 + -- cgit 1.3.0-6-gf8a5 From c307eecde1b4f2c9284606a357a934aadd5160f0 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 8 Feb 2006 16:41:06 +0000 Subject: removed useless configure switch git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@555 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 65c6dc90..8c8bfe3e 100755 --- a/debian/rules +++ b/debian/rules @@ -6,8 +6,6 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ - --libexecdir=/usr/bin \ - --localstatedir=/var/run \ --without-named \ --with-dhcdbd=/usr/sbin/dhcdbd \ --with-distro=debian -- cgit 1.3.0-6-gf8a5 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 From eb8f8ce9dc798e8c9ec6b0adb7709ad18a8330ae Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 3 Apr 2008 00:53:19 +0000 Subject: debian/rules, debian/network-manager.postinst - Minimize downtime during upgrades. (Closes: #432322) Restart the service in postinst instead of stop in prerm and start in postinst. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2159 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 a4a1c76d..9442c792 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ 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 . +DEB_DH_INSTALLINIT_ARGS := -r -- start 26 2 3 4 5 . stop 14 0 1 6 . DEB_DH_SHLIBDEPS_ARGS := -Xnm-vpn-properties -- cgit 1.3.0-6-gf8a5 From 5b1afa498f15562272686b5a7b167780bc55b213 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 22 Feb 2009 02:05:46 +0000 Subject: Merged revisions 2066,2304-2305,2308,2317-2318,2320-2323,2325,2333,2405-2415,2426-2429,2431-2434,2456-2458,2460,2464,2507-2508,2510,2513-2515,2517,2538-2539,2659-2668,2734-2735,2862 via svnmerge from svn+ssh://biebl@svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager ........ r2066 | biebl | 2008-01-25 15:36:51 +0100 (Fr, 25 Jan 2008) | 19 lines * SVN snapshot of the upcoming 0.7 release. * Drop patches which are either obsolete, merged upstream or not yet ported - 01-supplicant_timeout.patch - 04-if_fix.patch - 11-man_page_sh_name.patch - 12_readme_format.patch - 13-validate_mac_addr.patch - 20-stable_branch_updates_r2652.patch - 21-endianess_fix_r2754.patch - 22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch - 23-rfkill_return_type.patch - 24-get_mode_fix_r3122.patch - 25-libnl_unique_pid_r3155.patch - 26-libnl_1.0-pre8_r3206.patch - 27-dont_repeat_errors.patch * debian/patches/05-debian_backend.patch - Updated for 0.7. * debian/patches/02-dbus_access_network_manager.patch - Updated for 0.7. ........ r2304 | sjoerd | 2008-06-18 15:05:11 +0200 (Mi, 18 Jun 2008) | 1 line Merge mbiebl's packaging ........ r2305 | sjoerd | 2008-06-18 15:39:30 +0200 (Mi, 18 Jun 2008) | 3 lines * New SVN snapshot * debian/patches/03-system-settings-conf.patch - Removed. Merged upstream ........ r2308 | sjoerd | 2008-06-18 16:54:57 +0200 (Mi, 18 Jun 2008) | 2 lines * Split out libnm-glib-vpn from libnm-glib * debian/rules: Use list-missing ........ r2317 | sjoerd | 2008-06-18 19:39:15 +0200 (Mi, 18 Jun 2008) | 1 line Ensure we install all header files ........ r2318 | sjoerd | 2008-06-18 19:47:38 +0200 (Mi, 18 Jun 2008) | 1 line Don't forget about nm-types.h ........ r2320 | biebl | 2008-06-19 00:18:13 +0200 (Do, 19 Jun 2008) | 2 lines Fix symbols files (remove Debian revision) ........ r2321 | biebl | 2008-06-19 00:20:07 +0200 (Do, 19 Jun 2008) | 5 lines - nm-vpn-properties was removed. Remove the now unnecessary build-deps. - Wrap lines in the long description. - libnm-glib-dev seems to required network-manager-dev ........ r2322 | biebl | 2008-06-19 00:21:18 +0200 (Do, 19 Jun 2008) | 3 lines Merge changelog. 0.7.0~svn3747-1 was never released. A more complete changelog will follow... ........ r2323 | biebl | 2008-06-19 00:23:48 +0200 (Do, 19 Jun 2008) | 2 lines Actually remove the NetworkManagerDispatcher init script. ........ r2325 | biebl | 2008-06-19 01:58:40 +0200 (Do, 19 Jun 2008) | 1 line Fix the package name in libnm-glib-vpn0.symbols ........ r2333 | sjoerd | 2008-06-22 23:27:01 +0200 (So, 22 Jun 2008) | 3 lines * debian/patches/10-execute_system_dhclient_script.patch - Added. Let NM's custom dhclient script execute the systems dhclient script. ........ r2405 | biebl | 2008-08-22 21:39:05 +0200 (Fr, 22 Aug 2008) | 2 lines Update symbols file for svn snapshot r4002 ........ r2406 | biebl | 2008-08-22 21:40:18 +0200 (Fr, 22 Aug 2008) | 2 lines Add "status" action. Requires lsb-base (>= 3.2-14). ........ r2407 | biebl | 2008-08-22 21:43:29 +0200 (Fr, 22 Aug 2008) | 5 lines Disable 05-debian_backend.patch and 10-execute_system_dhclient_script.patch The integration of resolvconf will have to be done differently. The current patches no longer apply. ........ r2408 | biebl | 2008-08-22 21:44:12 +0200 (Fr, 22 Aug 2008) | 2 lines Stop NM at priority 88, exclude private libs from dh_makeshlibs. ........ r2409 | biebl | 2008-08-22 21:46:43 +0200 (Fr, 22 Aug 2008) | 5 lines Update installed files/directories - Install avahi action script and dbus config file - Install nm-dhcp4-config.h header - Install dispatcher.d and system-connections directories created by upstream. ........ r2410 | biebl | 2008-08-22 21:47:21 +0200 (Fr, 22 Aug 2008) | 2 lines Copyright has to be revised. This is a first attempt to remove stale stuff. ........ r2411 | biebl | 2008-08-22 21:47:48 +0200 (Fr, 22 Aug 2008) | 2 lines Update to svn r4002 ........ r2412 | biebl | 2008-08-22 21:49:32 +0200 (Fr, 22 Aug 2008) | 4 lines - Bump Standards Version to 3.8.0 - Suggest avahi-autoipd, NM no longer does IPv4LL - Bump dependency on lsb-base, required by status_of_proc ........ r2413 | biebl | 2008-08-22 22:14:37 +0200 (Fr, 22 Aug 2008) | 1 line Remove, all relevant parts are upstream now ........ r2414 | biebl | 2008-08-22 22:15:21 +0200 (Fr, 22 Aug 2008) | 4 lines Remove 10-execute_system_dhclient_script.patch, patch no longer applies. Resolvconf intergration will have to be addressedd differently. ........ r2415 | biebl | 2008-08-22 22:16:09 +0200 (Fr, 22 Aug 2008) | 2 lines Update to r4004, which contains our custom backend changes. ........ r2426 | smcv | 2008-09-30 19:21:44 +0200 (Di, 30 Sep 2008) | 2 lines * Newer tarball * debian/patches/03-run-resolvconf.patch: Use (and depend on) resolvconf ........ r2427 | biebl | 2008-10-01 13:40:09 +0200 (Mi, 01 Okt 2008) | 5 lines Revert r2426 After a short discussion on irc, it deemed to be best to revert this change as upstream has added resolvconf in r4043 ........ r2428 | sjoerd | 2008-10-03 00:17:18 +0200 (Fr, 03 Okt 2008) | 1 line Update to svn version 4142 ........ r2429 | sjoerd | 2008-10-03 00:40:18 +0200 (Fr, 03 Okt 2008) | 1 line Update the various symbols files ........ r2431 | biebl | 2008-10-03 01:55:09 +0200 (Fr, 03 Okt 2008) | 2 lines Strip off debian revision ........ r2432 | biebl | 2008-10-03 01:57:04 +0200 (Fr, 03 Okt 2008) | 2 lines Pass the correct path of resolvconf and dhclient to ./configure ........ r2433 | biebl | 2008-10-03 01:57:25 +0200 (Fr, 03 Okt 2008) | 2 lines Install the ifupdown plugin and enable it by default. ........ r2434 | sjoerd | 2008-10-03 13:40:53 +0200 (Fr, 03 Okt 2008) | 3 lines * debian/patches/03-nm_get_debian_hostname.patch: - Added. Temporary minimal patch to get hostname from /etc/hostname. There is work being done upstream for a more extensive version. ........ r2456 | sjoerd | 2008-10-10 00:31:49 +0200 (Fr, 10 Okt 2008) | 1 line Update to svn revision 4160 ........ r2457 | sjoerd | 2008-10-10 00:34:20 +0200 (Fr, 10 Okt 2008) | 1 line remove 03-nm_get_debian_hostname.patch, a more complete implementation is merged upstream ........ r2458 | sjoerd | 2008-10-10 00:36:36 +0200 (Fr, 10 Okt 2008) | 1 line unfuck the changelog ........ r2460 | sjoerd | 2008-10-18 21:02:32 +0200 (Sa, 18 Okt 2008) | 1 line Update snapshot to svn version 4191 ........ r2464 | sjoerd | 2008-10-18 22:30:07 +0200 (Sa, 18 Okt 2008) | 1 line target experimental ........ r2507 | sjoerd | 2008-11-29 22:05:27 +0100 (Sa, 29 Nov 2008) | 1 line Start preparing new upstream release (0.7.0) ........ r2508 | sjoerd | 2008-11-29 22:22:54 +0100 (Sa, 29 Nov 2008) | 1 line debian/libnm-util0.symbols: Updated ........ r2510 | sjoerd | 2008-11-29 23:15:59 +0100 (Sa, 29 Nov 2008) | 1 line debian/libnm-glib0.symbols: Updated ........ r2513 | sjoerd | 2008-11-30 15:07:06 +0100 (So, 30 Nov 2008) | 2 lines * debian/patches/03-F3507g.patch - Added. Fix gsm support for Ericsson F3507g Mobile Broadband cards ........ r2514 | biebl | 2008-11-30 15:07:49 +0100 (So, 30 Nov 2008) | 6 lines Update all symbols files - Strip of debian revision number - Use the final 0.7.0 version number for the ~svn??? snapshots which were never released anyway. ........ r2515 | sjoerd | 2008-11-30 15:08:29 +0100 (So, 30 Nov 2008) | 1 line Fix typo in the name ........ r2517 | sjoerd | 2008-12-04 00:52:46 +0100 (Do, 04 Dez 2008) | 1 line debian/control: Recommend ppp ........ r2538 | biebl | 2008-12-06 00:53:36 +0100 (Sa, 06 Dez 2008) | 5 lines * debian/patches/04-ltversioning.patch - Bump soname of libnm-util due to an ABI break between 0.6.6 and 0.7. (Closes: #503682) * Update control, install and symbols file for the new libnm-util library name. ........ r2539 | biebl | 2008-12-06 01:12:06 +0100 (Sa, 06 Dez 2008) | 2 lines * debian/patches/05-dhclient_lease_files.patch - Change the location of the dhclient lease files to /var/lib/dhcp3. ........ r2659 | biebl | 2008-12-16 07:48:51 +0100 (Di, 16 Dez 2008) | 4 lines Rework the changelog for (0.7.0~svn4191-1) List all changes between 0.6.6-2 and 0.7.0~svn4191-1 ........ r2660 | biebl | 2008-12-16 08:55:37 +0100 (Di, 16 Dez 2008) | 2 lines Close bug reports that are fixed by this new upstream release. ........ r2661 | biebl | 2008-12-16 09:03:46 +0100 (Di, 16 Dez 2008) | 5 lines * debian/control - Add Conflicts/Replaces: network-manager-pptp (<< 0.7~~) as the pppd plugin is now shipped by this package. - Add Breaks for network-manager-{gnome,kde} (<< 0.7~~) as the 0.6 versions of those packages do not work with network-manager 0.7. ........ r2662 | biebl | 2008-12-16 09:18:47 +0100 (Di, 16 Dez 2008) | 2 lines Add the vpn (core) plugins also to the Breaks list. ........ r2663 | biebl | 2008-12-16 09:28:27 +0100 (Di, 16 Dez 2008) | 3 lines * debian/network-manager.README.Debian - Merge the README.Debian from Ubuntu which describes the new managed/unmanaged modes. ........ r2664 | biebl | 2008-12-16 09:39:13 +0100 (Di, 16 Dez 2008) | 2 lines * debian/nm-system-settings.conf - Set default mode to unmanaged. ........ r2665 | biebl | 2008-12-16 09:42:40 +0100 (Di, 16 Dez 2008) | 1 line changelog tweaks ........ r2666 | biebl | 2008-12-16 09:55:59 +0100 (Di, 16 Dez 2008) | 3 lines * debian/copyright - Revised and updated. libnm-glib and libnm-util are licensed under the LGPL v2 or later. ........ r2667 | biebl | 2008-12-16 09:56:31 +0100 (Di, 16 Dez 2008) | 1 line Upload to experimental ........ r2668 | biebl | 2008-12-16 10:04:31 +0100 (Di, 16 Dez 2008) | 1 line Refresh 03-F3507g.patch with -p1 ........ r2734 | biebl | 2009-01-13 08:10:58 +0100 (Di, 13 Jan 2009) | 2 lines * debian/control - Add ${misc:Depends} to all binary packages. ........ r2735 | biebl | 2009-01-13 08:15:00 +0100 (Di, 13 Jan 2009) | 2 lines Let network-manager depend on dhcp3-client directly, as the dependency on dhcdbd has been removed. (Closes: #509655) ........ r2862 | biebl | 2009-02-20 02:47:38 +0100 (Fr, 20 Feb 2009) | 3 lines * debian/rules - Include debhelper.mk before any other files as recommended by the cdbs documentation. ........ git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2884 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 9442c792..8e81f9b1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,31 +1,31 @@ #!/usr/bin/make -f -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 +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/utils.mk + +# List any files which are not installed +common-binary-post-install-arch:: list-missing + +DEB_DH_MAKESHLIBS_ARGS_ALL := -X/usr/lib/NetworkManager -X/usr/lib/pppd/ DEB_INSTALL_DOCS_ALL := README AUTHORS TODO +DEB_CONFIGURE_LIBEXECDIR := "\$$(prefix)/lib/NetworkManager" + DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ - --with-wpa_supplicant=/sbin/wpa_supplicant \ - --with-dhcdbd=/usr/sbin/dhcdbd \ - --with-distro=debian + --with-distro=debian \ + --with-resolvconf=/sbin/resolvconf \ + --with-dhcp-client=/sbin/dhclient \ + --with-crypto=gnutls -DEB_DH_INSTALLINIT_ARGS := -r -- start 26 2 3 4 5 . stop 14 0 1 6 . - -DEB_DH_SHLIBDEPS_ARGS := -Xnm-vpn-properties +DEB_DH_INSTALLINIT_ARGS := -r -- start 26 2 3 4 5 . stop 88 0 1 6 . clean:: rm -f po/*.gmo - rm -f debian/*.1 - - -build/network-manager:: - /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 binary-install/network-manager:: - 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 7949d0626c4721d33f75f5302d1c824428f6a675 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 27 Nov 2009 06:25:56 +0000 Subject: * debian/rules - Disable -Werror (more-warnings) for now as it causes build failures on sparc. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3304 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 8e81f9b1..03cb830b 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,8 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ --with-distro=debian \ --with-resolvconf=/sbin/resolvconf \ --with-dhcp-client=/sbin/dhclient \ - --with-crypto=gnutls + --with-crypto=gnutls \ + --disable-more-warnings DEB_DH_INSTALLINIT_ARGS := -r -- start 26 2 3 4 5 . stop 88 0 1 6 . -- cgit 1.3.0-6-gf8a5 From 8bdc9a2f1a99f9b047e8bbfb553f1ee2a7fb578a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 29 Nov 2009 09:20:08 +0000 Subject: * debian/rules - Don't ship empty TODO file. (Closes: #558471) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3319 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 03cb830b..35f0ec9c 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ common-binary-post-install-arch:: list-missing DEB_DH_MAKESHLIBS_ARGS_ALL := -X/usr/lib/NetworkManager -X/usr/lib/pppd/ -DEB_INSTALL_DOCS_ALL := README AUTHORS TODO +DEB_INSTALL_DOCS_ALL := README AUTHORS DEB_CONFIGURE_LIBEXECDIR := "\$$(prefix)/lib/NetworkManager" -- cgit 1.3.0-6-gf8a5 From ca85ca4f231f37f9d52386eefeab95f2dbc81b6c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Jan 2010 23:37:33 +0000 Subject: cosmetic fixes to debian/rules git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3386 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 35f0ec9c..4a3a7992 100755 --- a/debian/rules +++ b/debian/rules @@ -8,13 +8,13 @@ include /usr/share/cdbs/1/rules/utils.mk # List any files which are not installed common-binary-post-install-arch:: list-missing -DEB_DH_MAKESHLIBS_ARGS_ALL := -X/usr/lib/NetworkManager -X/usr/lib/pppd/ +DEB_DH_MAKESHLIBS_ARGS_ALL := -X/usr/lib/NetworkManager/ -X/usr/lib/pppd/ DEB_INSTALL_DOCS_ALL := README AUTHORS DEB_CONFIGURE_LIBEXECDIR := "\$$(prefix)/lib/NetworkManager" -DEB_CONFIGURE_EXTRA_FLAGS += \ +DEB_CONFIGURE_EXTRA_FLAGS := \ --with-dbus-sys=/etc/dbus-1/system.d \ --with-distro=debian \ --with-resolvconf=/sbin/resolvconf \ -- cgit 1.3.0-6-gf8a5 From 371a0def16f9a44de724bf34496fb70524f37161 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Jan 2010 23:37:57 +0000 Subject: Specify the path to the iptables binary. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3392 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 4a3a7992..0fefb1de 100755 --- a/debian/rules +++ b/debian/rules @@ -19,6 +19,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := \ --with-distro=debian \ --with-resolvconf=/sbin/resolvconf \ --with-dhcp-client=/sbin/dhclient \ + --with-iptables=/sbin/iptables \ --with-crypto=gnutls \ --disable-more-warnings -- cgit 1.3.0-6-gf8a5 From 51e010e658bc92cae2acba858f32f069b71dfae6 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jul 2010 01:36:08 +0000 Subject: * Switch to source format 3.0 (quilt). - Add debian/source/format. - Drop Build-Depends on quilt. - Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk from debian/rules. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3618 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 0fefb1de..dc57d45c 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk # List any files which are not installed -- cgit 1.3.0-6-gf8a5 From 9f7c174246ac2085be2129ca9c86eaded9e377cc Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jul 2010 02:27:02 +0000 Subject: * debian/rules - Set --with-pppd-plugin-dir configure option to /usr/lib/pppd/2.4.4. The upstream default is 2.4.5 now but Debian still only has ppp 2.4.4. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3627 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index dc57d45c..2944e43a 100755 --- a/debian/rules +++ b/debian/rules @@ -20,13 +20,14 @@ DEB_CONFIGURE_EXTRA_FLAGS := \ --with-dhcp-client=/sbin/dhclient \ --with-iptables=/sbin/iptables \ --with-crypto=gnutls \ + --with-pppd-plugin-dir=/usr/lib/pppd/2.4.4 \ --disable-more-warnings - + DEB_DH_INSTALLINIT_ARGS := -r -- start 26 2 3 4 5 . stop 88 0 1 6 . clean:: rm -f po/*.gmo - + binary-install/network-manager:: install -m 755 debian/network-manager-dispatcher.script \ debian/network-manager/etc/NetworkManager/dispatcher.d/01ifupdown -- cgit 1.3.0-6-gf8a5 From f2800b281229c72f183e2e430f071d6c6edf6d77 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jul 2010 14:59:02 +0000 Subject: Set --with-dhclient configure option to /sbin/dhclient. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3633 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 2944e43a..89347de2 100755 --- a/debian/rules +++ b/debian/rules @@ -14,10 +14,9 @@ DEB_INSTALL_DOCS_ALL := README AUTHORS DEB_CONFIGURE_LIBEXECDIR := "\$$(prefix)/lib/NetworkManager" DEB_CONFIGURE_EXTRA_FLAGS := \ - --with-dbus-sys=/etc/dbus-1/system.d \ --with-distro=debian \ --with-resolvconf=/sbin/resolvconf \ - --with-dhcp-client=/sbin/dhclient \ + --with-dhclient=/sbin/dhclient \ --with-iptables=/sbin/iptables \ --with-crypto=gnutls \ --with-pppd-plugin-dir=/usr/lib/pppd/2.4.4 \ -- cgit 1.3.0-6-gf8a5 From 151876d0792f3017eee4601685a5806492e28326 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 27 Jul 2010 00:02:43 +0000 Subject: * Build against ppp 2.4.5. (Closes: #589791) - Bump Build-Depends on ppp to (>= 2.4.5). - Bump Recommends on ppp to (>= 2.4.5). - Drop --with-pppd-plugin-dir configure option and use upstream default. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3680 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 89347de2..b1bbea63 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,6 @@ DEB_CONFIGURE_EXTRA_FLAGS := \ --with-dhclient=/sbin/dhclient \ --with-iptables=/sbin/iptables \ --with-crypto=gnutls \ - --with-pppd-plugin-dir=/usr/lib/pppd/2.4.4 \ --disable-more-warnings DEB_DH_INSTALLINIT_ARGS := -r -- start 26 2 3 4 5 . stop 88 0 1 6 . -- cgit 1.3.0-6-gf8a5 From fa6a85a275e4b11ceb1a725e64a52d9c260cf2df Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 17 Nov 2010 22:10:12 +0000 Subject: Install migration script as executable shell script git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3769 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 b1bbea63..fdcd499b 100755 --- a/debian/rules +++ b/debian/rules @@ -29,3 +29,5 @@ clean:: binary-install/network-manager:: install -m 755 debian/network-manager-dispatcher.script \ debian/network-manager/etc/NetworkManager/dispatcher.d/01ifupdown + install -m 755 debian/ifblacklist_migrate.sh \ + debian/network-manager/usr/lib/NetworkManager -- cgit 1.3.0-6-gf8a5