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/patches/series | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 debian/patches/series (limited to 'debian/patches/series') diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..c38d933a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +02-dbus_access_network_manager.patch +03-F3507g.patch +04-ltversioning.patch +05-dhclient_lease_files.patch -- cgit 1.3.0-6-gf8a5 From 44f99c811e83a362fe04beec41d33333dcc33940 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 22 Feb 2009 02:28:28 +0000 Subject: - Update 02-dbus_access_network_manager.patch for the latest upstream changes which fixes non-deterministic allow/deny for D-Bus messages with no interface. (Closes: #510729) - Disable 03-F3507g.patch for now, patch no longer applies and should be replaced by ModemManager anyway. - Remove 04-ltversioning.patch, merged upstream. - Remove 05-dhclient_lease_files.patch, merged upstream. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2887 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/series | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'debian/patches/series') diff --git a/debian/patches/series b/debian/patches/series index c38d933a..3ad97cdd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 02-dbus_access_network_manager.patch -03-F3507g.patch -04-ltversioning.patch -05-dhclient_lease_files.patch +#03-F3507g.patch +#20-manual_means_always_online.patch -- cgit 1.3.0-6-gf8a5 From 8e53ede36fa39a43a4aa5ec7c980e5be877bb2ea Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 16 Apr 2009 23:54:55 +0000 Subject: * debian/patches/04-struct_termios.patch - Fix FTBFS on alpha by using the POSIX.1 struct termios interface instead of the obsolete struct termio ioctl interface. (Closes: #524161) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3081 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/series | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/patches/series') diff --git a/debian/patches/series b/debian/patches/series index 3ad97cdd..9f9fb610 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 02-dbus_access_network_manager.patch #03-F3507g.patch #20-manual_means_always_online.patch +04-struct_termios.patch -- cgit 1.3.0-6-gf8a5 From 1d9798ef284edc4d614832296362cbe6462aa5ff Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 8 Jul 2009 20:15:19 +0000 Subject: debian/patches/05-response-buffer-filled.patch: new, from upstream git 0.7 branch. Fixes "response buffer filled before repsonse received" (sic) during communication with serial modems. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3151 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/series | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/patches/series') diff --git a/debian/patches/series b/debian/patches/series index 9f9fb610..15d456d1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ #03-F3507g.patch #20-manual_means_always_online.patch 04-struct_termios.patch +05-response-buffer-filled.patch -- cgit 1.3.0-6-gf8a5 From 58e3fe9fb934d4790a20cd911d95d80e36191d72 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 16 Aug 2009 00:54:57 +0000 Subject: * debian/patches/06-handle-new-ssb-bus-from-HAL-0.5.13.patch - HAL 0.5.13 added support for the ssb bus type which is internally used on most Broadcom ethernet and wifi chipsets. Update NM to detect the driver for the changed device layout. (Closes: #540613) Patch pulled from upstream git. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3217 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/series | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/patches/series') diff --git a/debian/patches/series b/debian/patches/series index 15d456d1..f718a5d7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ #20-manual_means_always_online.patch 04-struct_termios.patch 05-response-buffer-filled.patch +06-handle-new-ssb-bus-from-HAL-0.5.13.patch -- cgit 1.3.0-6-gf8a5 From cd438d370a65c2e1354cad95b3596b2b52fbdbbf Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 17 Aug 2009 21:38:13 +0000 Subject: Squashed the following upstream commits d0cdbf3525b105de6dc0ca4ce02801bfe8fe2222 4c36f7c0b607813753072acf1bec14414494948c d185695d80b248354dd7a95fd896daa5c45085e5 to produce a working patch git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3223 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/series | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'debian/patches/series') diff --git a/debian/patches/series b/debian/patches/series index f718a5d7..6a732b2f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,5 +2,4 @@ #03-F3507g.patch #20-manual_means_always_online.patch 04-struct_termios.patch -05-response-buffer-filled.patch -06-handle-new-ssb-bus-from-HAL-0.5.13.patch +05-handle-new-ssb-bus-from-HAL-0.5.13.patch -- cgit 1.3.0-6-gf8a5 From cfae2d2412095b104b158b90a6e5cdb3058b4b92 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 23 Nov 2009 23:49:03 +0000 Subject: * Drop patches that have been merged upstream - debian/patches/04-struct_termios.patch - debian/patches/05-handle-new-ssb-bus-from-HAL-0.5.13.patch git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3274 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/series | 2 -- 1 file changed, 2 deletions(-) (limited to 'debian/patches/series') diff --git a/debian/patches/series b/debian/patches/series index 6a732b2f..3ad97cdd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ 02-dbus_access_network_manager.patch #03-F3507g.patch #20-manual_means_always_online.patch -04-struct_termios.patch -05-handle-new-ssb-bus-from-HAL-0.5.13.patch -- cgit 1.3.0-6-gf8a5