Changeset 6322


Ignore:
Timestamp:
02/14/10 20:36:52 (3 years ago)
Author:
alanbach-guest
Message:
  • Sync'd with Debian 0.7.999-3
    • managed=true in nm-system-settings.conf
Location:
pkg/frankie/main/network-manager/trunk/debian
Files:
10 added
5 deleted
13 edited

Legend:

Unmodified
Added
Removed

  • pkg/frankie/main/network-manager/trunk/debian/changelog

    r6135 r6322  
     1network-manager (0.7.999-3.1) unstable; urgency=low 
     2 
     3  * Sync'd with Debian 0.7.999-3 
     4  * managed=true in nm-system-settings.conf 
     5 
     6 -- Alan Baghumian <alan@technotux.org>  Sun, 14 Feb 2010 11:26:53 -0800 
     7 
     8network-manager (0.7.999-3) unstable; urgency=low 
     9 
     10  * debian/patches/03-hostname-fallback.patch 
     11    - If dhcp does not return a valid hostname and none of the system settings 
     12      plugins provides a hostname, fallback to the hostname that was set when 
     13      NetworkManager was started. Patch pulled from upstream Git. 
     14      (Closes: #567207) 
     15  * debian/patches/04-etc-hosts-rewrite.patch 
     16    - Be more selective when adding hostname to /etc/hosts. 
     17      Patch pulled from upstream Git. (Closes: #567411) 
     18  * debian/patches/05-ifupdown-allow-hotplug-autoconnect.patch 
     19    - Set autoconnect=true for devices marked as allow-hotplug in 
     20      /etc/network/interfaces. (Closes: #568784) 
     21  * debian/control 
     22    - Remove Riccardo from Uploaders with Riccardo's consent. 
     23    - Bump Breaks for network-manager-kde to (<< 1:0.9~~). The KDE3 version no 
     24      longer works correctly with this version of network-manager. 
     25    - Bump Standards-Version to 3.8.4. No further changes. 
     26  * debian/network-manager.init 
     27    - Don't use "set -e". 
     28    - Print meaningful messages on start and stop in case the daemon is already 
     29      running resp. already stopped. 
     30 
     31 -- Michael Biebl <biebl@debian.org>  Mon, 08 Feb 2010 17:27:54 +0100 
     32 
     33network-manager (0.7.999-2) unstable; urgency=low 
     34 
     35  * Upload to unstable. 
     36 
     37 -- Michael Biebl <biebl@debian.org>  Tue, 26 Jan 2010 17:03:35 +0100 
     38 
     39network-manager (0.7.999-1) experimental; urgency=low 
     40 
     41  * New upstream release (0.8 rc3). (Closes: #553320) 
     42    - Much improved bluetooth support. 
     43    - Support for IPv6. 
     44    - Port to PolicyKit 1. (Closes: #549502) 
     45    - Drop hal dependency, use udev directly. 
     46    - Use ModemManager for better mobile broadband. 
     47  * debian/rules 
     48    - Don't ship empty TODO file. (Closes: #558471) 
     49    - Specify the path to the iptables binary. 
     50  * Update *.install, *.symbols and debian/control for library soname changes: 
     51    libnm-glib0 → libnm-glib2 and libnm-glib-vpn0 → libnm-glib-vpn1. 
     52  * debian/network-manager.install 
     53    - Remove nm-system-settings files. 
     54    - Install PolicyKit files to new location. 
     55    - Remove udev modem prober. 
     56  * debian/libnm-glib-{vpn-}dev.links 
     57    - The name of the pkg-config files has changed ('_' → '-'). Create compat 
     58      symlinks so existing configure scripts keep working, allowing for a 
     59      smoother transition to the new library names. 
     60  * debian/control 
     61    - Wrap dependencies. 
     62    - Drop Build-Depends on libhal-dev and libpolkit-dbus-dev. 
     63    - Add Build-Depends on libdbus-1-dev (>= 1.1), libpolkit-gobject-1-dev and 
     64      libgudev-1.0-dev. 
     65    - Bump Build-Depends on libglib2.0-dev to (>= 2.18). 
     66    - Replace hal Depends with udev. 
     67    - Replace policykit Recommends with policykit-1. 
     68    - Add Recommends on modemmanager which is required for mobile broadband 
     69      support. 
     70    - Update package description: policykit → policykit-1. 
     71    - Add -dbg package. (Closes: #380626) 
     72  * debian/network-manager.init 
     73    - Update LSB header: Replace hal dependency with udev. 
     74    - The nm-system-settings daemon has been merged into the NetworkManager 
     75      daemon, so we no longer need to kill nm-system-settings on "stop". 
     76  * debian/network-manager.preinst 
     77    - Remove the obsolete conffile 
     78      /etc/dbus-1/system.d/nm-system-settings.conf on upgrades. 
     79  * network-manager.postinst 
     80    - Kill any running nm-system-settings daemon on upgrades before the new 
     81      NetworkManager daemon is started. Its functionality has been merged 
     82      into NetworkManager. 
     83 
     84 -- Michael Biebl <biebl@debian.org>  Fri, 22 Jan 2010 01:53:46 +0100 
     85 
    186network-manager (0.7.2-2) unstable; urgency=low 
    287 
    3   [ Michael Biebl ] 
    488  * debian/rules 
    589    - Disable -Werror (more-warnings) for now as it causes build failures on 
    690      sparc. 
    791 
    8  -- Alan Baghumian <alan@technotux.org>  Sat, 12 Dec 2009 21:05:50 -0800 
     92 -- Michael Biebl <biebl@debian.org>  Fri, 27 Nov 2009 07:26:23 +0100 
    993 
    1094network-manager (0.7.2-1) unstable; urgency=low 

  • pkg/frankie/main/network-manager/trunk/debian/control

    r6135 r6322  
    33Priority: optional 
    44Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org> 
    5 Uploaders: Riccardo Setti <giskard@debian.org>, Michael Biebl <biebl@debian.org> 
    6 Build-Depends: debhelper (>= 7), 
     5Uploaders: Michael Biebl <biebl@debian.org> 
     6Build-Depends: 
     7 debhelper (>= 7), 
    78 cdbs, 
    89 autotools-dev, 
    … …  
    1112 quilt, 
    1213 libdbus-glib-1-dev (>= 0.75), 
     14 libdbus-1-dev (>= 1.1), 
    1315 libiw-dev(>= 27+28pre9), 
    14  libglib2.0-dev, 
    15  libhal-dev (>= 0.5.0), 
     16 libglib2.0-dev (>= 2.18), 
    1617 libnl-dev (>= 1.0~pre8), 
    1718 ppp-dev, 
    18  libpolkit-dbus-dev, 
     19 libpolkit-gobject-1-dev, 
    1920 libgnutls-dev, 
    2021 uuid-dev, 
    21  libudev-dev 
    22 Standards-Version: 3.8.3 
    23 Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager 
    24 Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager 
     22 libudev-dev, 
     23 libgudev-1.0-dev 
     24Standards-Version: 3.8.4 
     25Vcs-Svn: svn://svn.debian.org/pkg-utopia/packages/unstable/networkmanager/ 
     26Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/ 
    2527Homepage: http://www.gnome.org/projects/NetworkManager/ 
    2628 
    2729Package: network-manager 
    2830Architecture: any 
    29 Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.2-14), wpasupplicant (>= 0.6.2-1), dbus (>= 1.1.2), hal (>= 0.5.7.1), ifupdown, adduser, dhcp3-client 
    30 Recommends: network-manager-gnome | network-manager-kde, policykit, ppp, dnsmasq-base, iptables 
     31Depends: 
     32 ${shlibs:Depends}, 
     33 ${misc:Depends}, 
     34 lsb-base (>= 3.2-14), 
     35 wpasupplicant (>= 0.6.2-1), 
     36 dbus (>= 1.1.2), 
     37 udev, 
     38 ifupdown, 
     39 adduser, 
     40 dhcp3-client 
     41Recommends: 
     42 network-manager-gnome | network-manager-kde, 
     43 policykit-1, 
     44 ppp, 
     45 dnsmasq-base, 
     46 iptables, 
     47 modemmanager 
    3148Suggests: avahi-autoipd 
    32 Conflicts: network-manager-gnome (<< 0.6.5-1), network-manager-pptp (<< 0.7~~) 
    33 Replaces: network-manager-gnome (<< 0.6.5-1), network-manager-pptp (<< 0.7~~) 
    34 Breaks: network-manager-gnome (<< 0.7~~), network-manager-kde (<< 1:0.7~~), network-manager-openvpn (<< 0.7~~), network-manager-vpnc (<< 0.7~~), network-manager-pptp (<< 0.7~~) 
     49Conflicts: 
     50 network-manager-gnome (<< 0.6.5-1), 
     51 network-manager-pptp (<< 0.7~~) 
     52Replaces: 
     53 network-manager-gnome (<< 0.6.5-1), 
     54 network-manager-pptp (<< 0.7~~) 
     55Breaks: 
     56 network-manager-gnome (<< 0.7~~), 
     57 network-manager-kde (<< 1:0.9~~), 
     58 network-manager-openvpn (<< 0.7~~), 
     59 network-manager-vpnc (<< 0.7~~), 
     60 network-manager-pptp (<< 0.7~~) 
    3561Description: network management framework daemon 
    3662 NetworkManager attempts to keep an active network connection available at all 
    … …  
    4470 . 
    4571 Optional dependencies: 
    46   * policykit: Required for reading and writing system connections. 
     72  * policykit-1: Required for reading and writing system connections. 
    4773  * ppp: Required for establishing dial-up connections (e.g. via GSM). 
    4874  * dnsmasq-base/iptables: Required for creating Ad-hoc connections and 
    … …  
    5985 compile VPN Plugins for NetworkManager. 
    6086 
    61 Package: libnm-glib0 
     87Package: libnm-glib2 
    6288Section: libs 
    6389Architecture: any 
    64 Depends: ${shlibs:Depends}, ${misc:Depends} 
     90Depends: 
     91 ${shlibs:Depends}, 
     92 ${misc:Depends} 
    6593Description: network management framework (GLib shared library) 
    6694 NetworkManager attempts to keep an active network connection available at all 
    … …  
    77105Section: libdevel 
    78106Architecture: any 
    79 Depends: libnm-glib0 (= ${binary:Version}), ${misc:Depends}, libnm-util-dev, network-manager-dev, libglib2.0-dev, libdbus-glib-1-dev (>= 0.60) 
     107Depends: 
     108 libnm-glib2 (= ${binary:Version}), 
     109 ${misc:Depends}, 
     110 libnm-util-dev, 
     111 network-manager-dev, 
     112 libglib2.0-dev, 
     113 libdbus-glib-1-dev (>= 0.60) 
    80114Description: network management framework (GLib interface) 
    81115 NetworkManager attempts to keep an active network connection available at all 
    … …  
    89123 connection status via NetworkManager. 
    90124 
    91 Package: libnm-glib-vpn0 
     125Package: libnm-glib-vpn1 
    92126Section: libs 
    93127Architecture: any 
    94 Depends: ${shlibs:Depends}, ${misc:Depends} 
     128Depends: 
     129 ${shlibs:Depends}, 
     130 ${misc:Depends} 
    95131Description: network management framework (GLib VPN shared library) 
    96132 NetworkManager attempts to keep an active network connection available at all 
    … …  
    107143Section: libdevel 
    108144Architecture: any 
    109 Depends: libnm-glib-vpn0 (= ${binary:Version}), ${misc:Depends}, libnm-glib-dev 
     145Depends: 
     146 libnm-glib-vpn1 (= ${binary:Version}), 
     147 ${misc:Depends}, 
     148 libnm-glib-dev 
    110149Description: network management framework (GLib interface) 
    111150 NetworkManager attempts to keep an active network connection available at all 
    … …  
    122161Section: libs 
    123162Architecture: any 
    124 Depends: ${shlibs:Depends}, ${misc:Depends} 
     163Depends: 
     164 ${shlibs:Depends}, 
     165 ${misc:Depends} 
    125166Description: network management framework (shared library) 
    126167 NetworkManager attempts to keep an active network connection available at all 
    … …  
    137178Section: libdevel 
    138179Architecture: any 
    139 Depends: libnm-util1 (= ${binary:Version}), ${misc:Depends}, libglib2.0-dev 
     180Depends: 
     181 libnm-util1 (= ${binary:Version}), 
     182 ${misc:Depends}, 
     183 libglib2.0-dev 
    140184Description: network management framework (development files) 
    141185 NetworkManager attempts to keep an active network connection available at all 
    … …  
    148192 This package contains header and development files. 
    149193 
     194Package: network-manager-dbg 
     195Architecture: any 
     196Section: debug 
     197Priority: extra 
     198Depends: 
     199 network-manager (= ${binary:Version}) | libnm-util1 (= ${binary:Version}) | libnm-glib2 (= ${binary:Version}) | libnm-glib-vpn1 (= ${binary:Version}), 
     200 ${misc:Depends} 
     201Description: network management framework daemon - debugging symbols 
     202 NetworkManager attempts to keep an active network connection available at all 
     203 times. It is intended only for the desktop use-case, and is not intended for 
     204 usage on servers. The point of NetworkManager is to make networking 
     205 configuration and setup as painless and automatic as possible.  If using DHCP, 
     206 NetworkManager is _intended_ to replace default routes, obtain IP addresses 
     207 from a DHCP server, and change nameservers whenever it sees fit. 
     208 . 
     209 This package contains detached debugging symbols. 

  • pkg/frankie/main/network-manager/trunk/debian/copyright

    r4789 r6322  
    99Copyright: 
    1010 
    11     Copyright (C) 2006 - 2008 Red Hat, Inc. 
    12     Copyright (C) 2006 - 2008 Novell, Inc. 
     11    Copyright (C) 2006 - 2009 Red Hat, Inc. 
     12    Copyright (C) 2006 - 2009 Novell, Inc. 
    1313 
    1414License: 
    … …  
    1818    the Free Software Foundation; either version 2 of the License, or 
    1919    (at your option) any later version. 
    20     
     20 
    2121    This program is distributed in the hope that it will be useful, 
    2222    but WITHOUT ANY WARRANTY; without even the implied warranty of 
    … …  
    3333 
    3434 
    35 gfilemonitor/*.[ch]: 
     35libnm-util/*.[ch], libnm-glib/*.[ch]: 
    3636 
    3737Copyright: 
    3838 
    39     Copyright (C) 2007 John McCutchan 
    40     Copyright (C) 2006 - 2008 Red Hat, Inc. 
     39    Copyright (C) 2005 - 2009 Red Hat, Inc. 
     40    Copyright (C) 2005 - 2009 Novell, Inc. 
    4141 
    4242License: 
    … …  
    5858On Debian systems, the complete text of the GNU Lesser General 
    5959Public License can be found in `/usr/share/common-licenses/LGPL'. 
    60  
    61  
    62  
    63 libnm-util/*.[ch], libnm-glib/*.[ch]: 
    64  
    65 Copyright: 
    66  
    67     Copyright (C) 2005 - 2008 Red Hat, Inc. 
    68     Copyright (C) 2005 - 2008 Novell, Inc. 
    69  
    70 License: 
    71  
    72     This library is free software; you can redistribute it and/or 
    73     modify it under the terms of the GNU Lesser General Public 
    74     License as published by the Free Software Foundation; either 
    75     version 2 of the License, or (at your option) any later version. 
    76  
    77     This library is distributed in the hope that it will be useful, 
    78     but WITHOUT ANY WARRANTY; without even the implied warranty of 
    79     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
    80     Lesser General Public License for more details. 
    81  
    82     You should have received a copy of the GNU Lesser General Public License 
    83     along with this package; if not, write to the Free Software 
    84     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA 
    85  
    86 On Debian systems, the complete text of the GNU Lesser General 
    87 Public License can be found in `/usr/share/common-licenses/LGPL'. 

  • pkg/frankie/main/network-manager/trunk/debian/libnm-glib-dev.install

    r4789 r6322  
    1 debian/tmp/usr/lib/pkgconfig/libnm_glib.pc 
    2 debian/tmp/usr/lib/libnm_glib.a 
    3 debian/tmp/usr/lib/libnm_glib.so 
     1debian/tmp/usr/lib/pkgconfig/libnm-glib.pc 
     2debian/tmp/usr/lib/libnm-glib.a 
     3debian/tmp/usr/lib/libnm-glib.so 
    44debian/tmp/usr/include/libnm-glib/libnm_glib.h 
    55debian/tmp/usr/include/libnm-glib/nm-object.h 
    … …  
    77debian/tmp/usr/include/libnm-glib/nm*device* 
    88debian/tmp/usr/include/libnm-glib/nm-access-point.h 
    9 debian/tmp/usr/include/libnm-glib/nm-ip4-config.h 
     9debian/tmp/usr/include/libnm-glib/nm-ip*-config.h 
    1010debian/tmp/usr/include/libnm-glib/nm-dhcp4-config.h 
    1111debian/tmp/usr/include/libnm-glib/nm*settings*.h 

  • pkg/frankie/main/network-manager/trunk/debian/libnm-glib-vpn-dev.install

    r4789 r6322  
    1 debian/tmp/usr/lib/pkgconfig/libnm_glib_vpn.pc 
    2 debian/tmp/usr/lib/libnm_glib_vpn.a 
    3 debian/tmp/usr/lib/libnm_glib_vpn.so 
     1debian/tmp/usr/lib/pkgconfig/libnm-glib-vpn.pc 
     2debian/tmp/usr/lib/libnm-glib-vpn.a 
     3debian/tmp/usr/lib/libnm-glib-vpn.so 
    44debian/tmp/usr/include/libnm-glib/nm-vpn-plugin* 

  • pkg/frankie/main/network-manager/trunk/debian/libnm-util1.symbols

    r6135 r6322  
    5050 nm_ip4_route_set_prefix@Base 0.7.0 
    5151 nm_ip4_route_unref@Base 0.7.0 
     52 nm_ip6_address_compare@Base 0.7.999 
     53 nm_ip6_address_dup@Base 0.7.999 
     54 nm_ip6_address_get_address@Base 0.7.999 
     55 nm_ip6_address_get_prefix@Base 0.7.999 
     56 nm_ip6_address_new@Base 0.7.999 
     57 nm_ip6_address_ref@Base 0.7.999 
     58 nm_ip6_address_set_address@Base 0.7.999 
     59 nm_ip6_address_set_prefix@Base 0.7.999 
     60 nm_ip6_address_unref@Base 0.7.999 
     61 nm_ip6_route_compare@Base 0.7.999 
     62 nm_ip6_route_dup@Base 0.7.999 
     63 nm_ip6_route_get_dest@Base 0.7.999 
     64 nm_ip6_route_get_metric@Base 0.7.999 
     65 nm_ip6_route_get_next_hop@Base 0.7.999 
     66 nm_ip6_route_get_prefix@Base 0.7.999 
     67 nm_ip6_route_new@Base 0.7.999 
     68 nm_ip6_route_ref@Base 0.7.999 
     69 nm_ip6_route_set_dest@Base 0.7.999 
     70 nm_ip6_route_set_metric@Base 0.7.999 
     71 nm_ip6_route_set_next_hop@Base 0.7.999 
     72 nm_ip6_route_set_prefix@Base 0.7.999 
     73 nm_ip6_route_unref@Base 0.7.999 
    5274 nm_setting_802_1x_add_eap_method@Base 0.7.0 
    5375 nm_setting_802_1x_clear_eap_methods@Base 0.7.0 
    … …  
    5678 nm_setting_802_1x_get_anonymous_identity@Base 0.7.0 
    5779 nm_setting_802_1x_get_ca_cert@Base 0.7.0 
     80 nm_setting_802_1x_get_ca_cert_blob@Base 0.7.999 
     81 nm_setting_802_1x_get_ca_cert_path@Base 0.7.999 
     82 nm_setting_802_1x_get_ca_cert_scheme@Base 0.7.999 
    5883 nm_setting_802_1x_get_ca_path@Base 0.7.0 
    5984 nm_setting_802_1x_get_client_cert@Base 0.7.0 
     85 nm_setting_802_1x_get_client_cert_blob@Base 0.7.999 
     86 nm_setting_802_1x_get_client_cert_path@Base 0.7.999 
     87 nm_setting_802_1x_get_client_cert_scheme@Base 0.7.999 
    6088 nm_setting_802_1x_get_eap_method@Base 0.7.0 
    6189 nm_setting_802_1x_get_identity@Base 0.7.0 
    … …  
    6896 nm_setting_802_1x_get_phase2_autheap@Base 0.7.0 
    6997 nm_setting_802_1x_get_phase2_ca_cert@Base 0.7.0 
     98 nm_setting_802_1x_get_phase2_ca_cert_blob@Base 0.7.999 
     99 nm_setting_802_1x_get_phase2_ca_cert_path@Base 0.7.999 
     100 nm_setting_802_1x_get_phase2_ca_cert_scheme@Base 0.7.999 
    70101 nm_setting_802_1x_get_phase2_ca_path@Base 0.7.0 
    71102 nm_setting_802_1x_get_phase2_client_cert@Base 0.7.0 
     103 nm_setting_802_1x_get_phase2_client_cert_blob@Base 0.7.999 
     104 nm_setting_802_1x_get_phase2_client_cert_path@Base 0.7.999 
     105 nm_setting_802_1x_get_phase2_client_cert_scheme@Base 0.7.999 
    72106 nm_setting_802_1x_get_phase2_private_key@Base 0.7.0 
     107 nm_setting_802_1x_get_phase2_private_key_blob@Base 0.7.999 
     108 nm_setting_802_1x_get_phase2_private_key_format@Base 0.7.999 
    73109 nm_setting_802_1x_get_phase2_private_key_password@Base 0.7.0 
     110 nm_setting_802_1x_get_phase2_private_key_path@Base 0.7.999 
     111 nm_setting_802_1x_get_phase2_private_key_scheme@Base 0.7.999 
    74112 nm_setting_802_1x_get_phase2_private_key_type@Base 0.7.0 
    75113 nm_setting_802_1x_get_pin@Base 0.7.0 
    76114 nm_setting_802_1x_get_private_key@Base 0.7.0 
     115 nm_setting_802_1x_get_private_key_blob@Base 0.7.999 
     116 nm_setting_802_1x_get_private_key_format@Base 0.7.999 
    77117 nm_setting_802_1x_get_private_key_password@Base 0.7.0 
     118 nm_setting_802_1x_get_private_key_path@Base 0.7.999 
     119 nm_setting_802_1x_get_private_key_scheme@Base 0.7.999 
    78120 nm_setting_802_1x_get_private_key_type@Base 0.7.0 
    79121 nm_setting_802_1x_get_psk@Base 0.7.0 
    … …  
    82124 nm_setting_802_1x_new@Base 0.7.0 
    83125 nm_setting_802_1x_remove_eap_method@Base 0.7.0 
     126 nm_setting_802_1x_set_ca_cert@Base 0.7.999 
    84127 nm_setting_802_1x_set_ca_cert_from_file@Base 0.7.0 
     128 nm_setting_802_1x_set_client_cert@Base 0.7.999 
    85129 nm_setting_802_1x_set_client_cert_from_file@Base 0.7.0 
     130 nm_setting_802_1x_set_phase2_ca_cert@Base 0.7.999 
    86131 nm_setting_802_1x_set_phase2_ca_cert_from_file@Base 0.7.0 
     132 nm_setting_802_1x_set_phase2_client_cert@Base 0.7.999 
    87133 nm_setting_802_1x_set_phase2_client_cert_from_file@Base 0.7.0 
     134 nm_setting_802_1x_set_phase2_private_key@Base 0.7.999 
    88135 nm_setting_802_1x_set_phase2_private_key_from_file@Base 0.7.0 
     136 nm_setting_802_1x_set_private_key@Base 0.7.999 
    89137 nm_setting_802_1x_set_private_key_from_file@Base 0.7.0 
     138 nm_setting_bluetooth_error_get_type@Base 0.7.999 
     139 nm_setting_bluetooth_error_quark@Base 0.7.999 
     140 nm_setting_bluetooth_get_bdaddr@Base 0.7.999 
     141 nm_setting_bluetooth_get_connection_type@Base 0.7.999 
     142 nm_setting_bluetooth_get_type@Base 0.7.999 
     143 nm_setting_bluetooth_new@Base 0.7.999 
    90144 nm_setting_cdma_error_get_type@Base 0.7.0 
    91145 nm_setting_cdma_error_quark@Base 0.7.0 
    … …  
    139193 nm_setting_ip4_config_get_dhcp_client_id@Base 0.7.0 
    140194 nm_setting_ip4_config_get_dhcp_hostname@Base 0.7.0 
     195 nm_setting_ip4_config_get_dhcp_send_hostname@Base 0.7.999 
    141196 nm_setting_ip4_config_get_dns@Base 0.7.0 
    142197 nm_setting_ip4_config_get_dns_search@Base 0.7.0 
    … …  
    156211 nm_setting_ip4_config_remove_dns_search@Base 0.7.0 
    157212 nm_setting_ip4_config_remove_route@Base 0.7.0 
     213 nm_setting_ip6_config_add_address@Base 0.7.999 
     214 nm_setting_ip6_config_add_dns@Base 0.7.999 
     215 nm_setting_ip6_config_add_dns_search@Base 0.7.999 
     216 nm_setting_ip6_config_add_route@Base 0.7.999 
     217 nm_setting_ip6_config_clear_addresses@Base 0.7.999 
     218 nm_setting_ip6_config_clear_dns@Base 0.7.999 
     219 nm_setting_ip6_config_clear_dns_searches@Base 0.7.999 
     220 nm_setting_ip6_config_clear_routes@Base 0.7.999 
     221 nm_setting_ip6_config_error_get_type@Base 0.7.999 
     222 nm_setting_ip6_config_error_quark@Base 0.7.999 
     223 nm_setting_ip6_config_get_address@Base 0.7.999 
     224 nm_setting_ip6_config_get_dns@Base 0.7.999 
     225 nm_setting_ip6_config_get_dns_search@Base 0.7.999 
     226 nm_setting_ip6_config_get_ignore_auto_dns@Base 0.7.999 
     227 nm_setting_ip6_config_get_ignore_auto_routes@Base 0.7.999 
     228 nm_setting_ip6_config_get_method@Base 0.7.999 
     229 nm_setting_ip6_config_get_never_default@Base 0.7.999 
     230 nm_setting_ip6_config_get_num_addresses@Base 0.7.999 
     231 nm_setting_ip6_config_get_num_dns@Base 0.7.999 
     232 nm_setting_ip6_config_get_num_dns_searches@Base 0.7.999 
     233 nm_setting_ip6_config_get_num_routes@Base 0.7.999 
     234 nm_setting_ip6_config_get_route@Base 0.7.999 
     235 nm_setting_ip6_config_get_type@Base 0.7.999 
     236 nm_setting_ip6_config_new@Base 0.7.999 
     237 nm_setting_ip6_config_remove_address@Base 0.7.999 
     238 nm_setting_ip6_config_remove_dns@Base 0.7.999 
     239 nm_setting_ip6_config_remove_dns_search@Base 0.7.999 
     240 nm_setting_ip6_config_remove_route@Base 0.7.999 
    158241 nm_setting_need_secrets@Base 0.7.0 
    159242 nm_setting_new_from_hash@Base 0.7.0 
     243 nm_setting_olpc_mesh_error_get_type@Base 0.7.999 
     244 nm_setting_olpc_mesh_error_quark@Base 0.7.999 
     245 nm_setting_olpc_mesh_get_channel@Base 0.7.999 
     246 nm_setting_olpc_mesh_get_dhcp_anycast_address@Base 0.7.999 
     247 nm_setting_olpc_mesh_get_ssid@Base 0.7.999 
     248 nm_setting_olpc_mesh_get_type@Base 0.7.999 
     249 nm_setting_olpc_mesh_new@Base 0.7.999 
    160250 nm_setting_ppp_error_get_type@Base 0.7.0 
    161251 nm_setting_ppp_error_quark@Base 0.7.0 
    … …  
    280370 nm_utils_ip4_routes_from_gvalue@Base 0.7.0 
    281371 nm_utils_ip4_routes_to_gvalue@Base 0.7.0 
     372 nm_utils_ip6_addresses_from_gvalue@Base 0.7.999 
     373 nm_utils_ip6_addresses_to_gvalue@Base 0.7.999 
     374 nm_utils_ip6_routes_from_gvalue@Base 0.7.999 
     375 nm_utils_ip6_routes_to_gvalue@Base 0.7.999 
    282376 nm_utils_is_empty_ssid@Base 0.7.0 
     377 nm_utils_rsa_key_encrypt@Base 0.7.999 
    283378 nm_utils_same_ssid@Base 0.7.0 
    284379 nm_utils_security_valid@Base 0.7.0 

  • pkg/frankie/main/network-manager/trunk/debian/network-manager.init

    r6135 r6322  
    22### BEGIN INIT INFO 
    33# Provides:          network-manager 
    4 # Required-Start:    $remote_fs dbus hal 
    5 # Required-Stop:     $remote_fs dbus hal 
     4# Required-Start:    $remote_fs dbus udev 
     5# Required-Stop:     $remote_fs dbus udev 
    66# Should-Start:      $syslog 
    77# Should-Stop:       $syslog 
    … …  
    1212#                    connections to the best available connection. 
    1313### END INIT INFO 
    14  
    15 set -e 
    1614 
    1715PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin 
    … …  
    3735d_start() { 
    3836        start-stop-daemon --start --quiet --pidfile $PIDFILE \ 
    39                 --oknodo --exec $DAEMON -- $DAEMON_OPTS 
     37                --exec $DAEMON -- $DAEMON_OPTS 
    4038} 
    4139 
    … …  
    4543d_stop() { 
    4644        start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \ 
    47                  --oknodo --exec $DAEMON 
    48  
    49         # kill the system settings daemon 
    50         start-stop-daemon --stop --retry 5 --quiet \ 
    51                  --oknodo --exec /usr/sbin/nm-system-settings 
     45                --exec $DAEMON 
    5246} 
    5347 
    … …  
    5751        log_daemon_msg "Starting $DESC" "$NAME" 
    5852        d_start 
    59         log_end_msg $? 
     53        case "$?" in 
     54                0) log_end_msg 0 ;; 
     55                1) log_progress_msg "already started" 
     56                   log_end_msg 0 ;; 
     57                *) log_end_msg 1 ;; 
     58        esac 
    6059        ;; 
    6160  stop) 
    6261        log_daemon_msg "Stopping $DESC" "$NAME" 
    6362        d_stop 
    64         log_end_msg $? 
     63        case "$?" in 
     64                0) log_end_msg 0 ;; 
     65                1) log_progress_msg "already stopped" 
     66                   log_end_msg 0 ;; 
     67                *) log_end_msg 1 ;; 
     68        esac 
    6569        ;; 
    6670  restart|force-reload) 
    67         log_daemon_msg "Restarting $DESC" "$NAME" 
    68         d_stop 
    69         d_start 
    70         log_end_msg $? 
     71        $0 stop 
     72        $0 start 
    7173        ;; 
    7274  status) 

  • pkg/frankie/main/network-manager/trunk/debian/network-manager.install

    r6135 r6322  
    11debian/tmp/usr/sbin/NetworkManager 
    2 debian/tmp/usr/sbin/nm-system-settings 
    32debian/tmp/usr/bin/nm-tool 
    43debian/tmp/usr/lib/NetworkManager/nm-crash-logger 
    … …  
    1110debian/tmp/usr/share/locale/ 
    1211debian/tmp/usr/share/dbus-1/system-services/ 
    13 debian/tmp//usr/share/PolicyKit/ 
     12debian/tmp//usr/share/polkit-1/ 
    1413debian/tmp/etc/dbus-1/system.d/NetworkManager.conf 
    1514debian/tmp/etc/dbus-1/system.d/nm-dhcp-client.conf 
    16 debian/tmp/etc/dbus-1/system.d/nm-system-settings.conf 
    1715debian/tmp/etc/dbus-1/system.d/nm-dispatcher.conf 
    1816debian/tmp/etc/dbus-1/system.d/nm-avahi-autoipd.conf 
    … …  
    2119debian/nm-system-settings.conf etc/NetworkManager/ 
    2220debian/tmp/lib/udev/rules.d/*.rules 
    23 debian/tmp/lib/udev/nm-modem-probe 

  • pkg/frankie/main/network-manager/trunk/debian/network-manager.postinst

    r5416 r6322  
    4848        fi 
    4949 
     50        # Kill nm-system-settings service as in 0.8 it is no longer a separate process 
     51        if dpkg --compare-versions "$2" lt "0.7.999-1"; then 
     52                kill `pidof /usr/sbin/nm-system-settings` 2>/dev/null || true 
     53        fi 
     54 
    5055        ;; 
    51      
     56 
    5257    abort-upgrade|abort-deconfigure|abort-remove) 
    5358        ;; 

  • pkg/frankie/main/network-manager/trunk/debian/network-manager.preinst

    r5416 r6322  
    4545        if dpkg --compare-versions "$2" lt "0.6.4-8"; then 
    4646            if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then 
    47                 /etc/dbus-1/event.d/25NetworkManager stop    
     47                /etc/dbus-1/event.d/25NetworkManager stop 
    4848            fi 
    4949            if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then 
    50                 /etc/dbus-1/event.d/26NetworkManagerDispatcher stop    
     50                /etc/dbus-1/event.d/26NetworkManagerDispatcher stop 
    5151            fi 
    5252            rm_conffile network-manager /etc/dbus-1/event.d/25NetworkManager 
    … …  
    6868            fi 
    6969        fi 
     70        if dpkg --compare-versions "$2" lt "0.7.999-1"; then 
     71            rm_conffile network-manager /etc/dbus-1/system.d/nm-system-settings.conf 
     72        fi 
    7073        ;; 
    7174 

  • pkg/frankie/main/network-manager/trunk/debian/nm-system-settings.conf

    r4789 r6322  
    33 
    44[ifupdown] 
    5 managed=false 
     5managed=true 

  • pkg/frankie/main/network-manager/trunk/debian/patches/series

    r6135 r6322  
    1102-dbus_access_network_manager.patch 
    2 #03-F3507g.patch 
    3 #20-manual_means_always_online.patch 
     203-hostname-fallback.patch 
     304-etc-hosts-rewrite.patch 
     405-ifupdown-allow-hotplug-autoconnect.patch 

  • pkg/frankie/main/network-manager/trunk/debian/rules

    r6135 r6322  
    99common-binary-post-install-arch:: list-missing 
    1010 
    11 DEB_DH_MAKESHLIBS_ARGS_ALL := -X/usr/lib/NetworkManager -X/usr/lib/pppd/ 
     11DEB_DH_MAKESHLIBS_ARGS_ALL := -X/usr/lib/NetworkManager/ -X/usr/lib/pppd/ 
    1212 
    13 DEB_INSTALL_DOCS_ALL := README AUTHORS TODO 
     13DEB_INSTALL_DOCS_ALL := README AUTHORS 
    1414 
    1515DEB_CONFIGURE_LIBEXECDIR := "\$$(prefix)/lib/NetworkManager" 
    1616 
    17 DEB_CONFIGURE_EXTRA_FLAGS += \ 
     17DEB_CONFIGURE_EXTRA_FLAGS := \ 
    1818                --with-dbus-sys=/etc/dbus-1/system.d \ 
    1919                --with-distro=debian \ 
    2020                --with-resolvconf=/sbin/resolvconf \ 
    2121                --with-dhcp-client=/sbin/dhclient \ 
     22                --with-iptables=/sbin/iptables \ 
    2223                --with-crypto=gnutls \ 
    2324                --disable-more-warnings 
Note: See TracChangeset for help on using the changeset viewer.