[arch-commits] Commit in networkmanager/repos (16 files)

Jan Steffens heftig at nymeria.archlinux.org
Fri Oct 11 11:02:08 UTC 2013


    Date: Friday, October 11, 2013 @ 13:02:08
  Author: heftig
Revision: 196312

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  networkmanager/repos/extra-i686/NetworkManager.conf
    (from rev 196310, networkmanager/trunk/NetworkManager.conf)
  networkmanager/repos/extra-i686/PKGBUILD
    (from rev 196310, networkmanager/trunk/PKGBUILD)
  networkmanager/repos/extra-i686/disable_set_hostname.patch
    (from rev 196310, networkmanager/trunk/disable_set_hostname.patch)
  networkmanager/repos/extra-i686/networkmanager.install
    (from rev 196310, networkmanager/trunk/networkmanager.install)
  networkmanager/repos/extra-x86_64/NetworkManager.conf
    (from rev 196310, networkmanager/trunk/NetworkManager.conf)
  networkmanager/repos/extra-x86_64/PKGBUILD
    (from rev 196311, networkmanager/trunk/PKGBUILD)
  networkmanager/repos/extra-x86_64/disable_set_hostname.patch
    (from rev 196311, networkmanager/trunk/disable_set_hostname.patch)
  networkmanager/repos/extra-x86_64/networkmanager.install
    (from rev 196311, networkmanager/trunk/networkmanager.install)
Deleted:
  networkmanager/repos/extra-i686/NetworkManager.conf
  networkmanager/repos/extra-i686/PKGBUILD
  networkmanager/repos/extra-i686/disable_set_hostname.patch
  networkmanager/repos/extra-i686/networkmanager.install
  networkmanager/repos/extra-x86_64/NetworkManager.conf
  networkmanager/repos/extra-x86_64/PKGBUILD
  networkmanager/repos/extra-x86_64/disable_set_hostname.patch
  networkmanager/repos/extra-x86_64/networkmanager.install

-----------------------------------------+
 /NetworkManager.conf                    |    4 
 /PKGBUILD                               |  148 ++++++++++++++++++++++++++++++
 /disable_set_hostname.patch             |   38 +++++++
 /networkmanager.install                 |   18 +++
 extra-i686/NetworkManager.conf          |    2 
 extra-i686/PKGBUILD                     |   74 ---------------
 extra-i686/disable_set_hostname.patch   |   19 ---
 extra-i686/networkmanager.install       |    9 -
 extra-x86_64/NetworkManager.conf        |    2 
 extra-x86_64/PKGBUILD                   |   74 ---------------
 extra-x86_64/disable_set_hostname.patch |   19 ---
 extra-x86_64/networkmanager.install     |    9 -
 12 files changed, 208 insertions(+), 208 deletions(-)

Deleted: extra-i686/NetworkManager.conf
===================================================================
--- extra-i686/NetworkManager.conf	2013-10-11 11:01:29 UTC (rev 196311)
+++ extra-i686/NetworkManager.conf	2013-10-11 11:02:08 UTC (rev 196312)
@@ -1,2 +0,0 @@
-[main]
-plugins=keyfile

Copied: networkmanager/repos/extra-i686/NetworkManager.conf (from rev 196310, networkmanager/trunk/NetworkManager.conf)
===================================================================
--- extra-i686/NetworkManager.conf	                        (rev 0)
+++ extra-i686/NetworkManager.conf	2013-10-11 11:02:08 UTC (rev 196312)
@@ -0,0 +1,2 @@
+[main]
+plugins=keyfile

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-10-11 11:01:29 UTC (rev 196311)
+++ extra-i686/PKGBUILD	2013-10-11 11:02:08 UTC (rev 196312)
@@ -1,74 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Maintainer: Jan de Groot <jgc at archlinxu.org>
-# Contributor: Wael Nasreddine <gandalf at siemens-mobiles.org>
-# Contributor: Tor Krill <tor at krill.nu>
-# Contributor: Will Rea <sillywilly at gmail.com>
-# Contributor: Valentine Sinitsyn <e_val at inbox.ru>
-
-pkgname=networkmanager
-_pkgname=NetworkManager
-pkgver=0.9.8.6
-pkgrel=1
-pkgdesc="Network Management daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/$_pkgname/"
-depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant dhcp-client
-         libsoup systemd modemmanager)
-makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc git)
-optdepends=('dhclient: DHCPv6 support'
-            'dnsmasq: Connection sharing'
-            'bluez: Bluetooth support'
-            'openresolv: resolvconf support'
-            'ppp: Dialup connection support')
-options=('!libtool')
-backup=('etc/NetworkManager/NetworkManager.conf')
-install=networkmanager.install
-#source=(git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=93c1041
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
-        NetworkManager.conf disable_set_hostname.patch)
-sha256sums=('2289800de66fd7f8c141e029923beb39f43952e442b3cb864e3bf73b26c0c369'
-            '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
-            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
-
-prepare() {
-  cd $_pkgname-$pkgver
-  patch -Np1 -i ../disable_set_hostname.patch
-}
-
-build() {
-  cd $_pkgname-$pkgver
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/networkmanager \
-    --sbindir=/usr/bin \
-    --with-crypto=nss \
-    --with-dhclient=/usr/bin/dhclient \
-    --with-dhcpcd=/usr/bin/dhcpcd \
-    --with-iptables=/usr/bin/iptables \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system \
-    --with-udev-dir=/usr/lib/udev \
-    --with-resolvconf=/usr/bin/resolvconf \
-    --with-session-tracking=systemd \
-    --with-modem-manager-1 \
-    --disable-static \
-    --enable-more-warnings=no \
-    --disable-wimax \
-    --enable-modify-system \
-    --enable-doc
-
-  make
-}
-
-package() {
-  cd $_pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
-  install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
-
-  rm -r "$pkgdir/var/run"
-}

Copied: networkmanager/repos/extra-i686/PKGBUILD (from rev 196310, networkmanager/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-10-11 11:02:08 UTC (rev 196312)
@@ -0,0 +1,74 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Jan de Groot <jgc at archlinxu.org>
+# Contributor: Wael Nasreddine <gandalf at siemens-mobiles.org>
+# Contributor: Tor Krill <tor at krill.nu>
+# Contributor: Will Rea <sillywilly at gmail.com>
+# Contributor: Valentine Sinitsyn <e_val at inbox.ru>
+
+pkgname=networkmanager
+_pkgname=NetworkManager
+pkgver=0.9.8.8
+pkgrel=1
+pkgdesc="Network Management daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org/projects/$_pkgname/"
+depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant dhcp-client
+         libsoup systemd modemmanager)
+makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc git)
+optdepends=('dhclient: DHCPv6 support'
+            'dnsmasq: Connection sharing'
+            'bluez: Bluetooth support'
+            'openresolv: resolvconf support'
+            'ppp: Dialup connection support')
+options=('!libtool')
+backup=('etc/NetworkManager/NetworkManager.conf')
+install=networkmanager.install
+#source=(git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=93c1041
+source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
+        NetworkManager.conf disable_set_hostname.patch)
+sha256sums=('8a0a3de9cd2897f778193aa5f04c8a6f6f87fe07f7a088aab26d2b35baa17a55'
+            '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
+            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
+
+prepare() {
+  cd $_pkgname-$pkgver
+  patch -Np1 -i ../disable_set_hostname.patch
+}
+
+build() {
+  cd $_pkgname-$pkgver
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib/networkmanager \
+    --sbindir=/usr/bin \
+    --with-crypto=nss \
+    --with-dhclient=/usr/bin/dhclient \
+    --with-dhcpcd=/usr/bin/dhcpcd \
+    --with-iptables=/usr/bin/iptables \
+    --with-systemdsystemunitdir=/usr/lib/systemd/system \
+    --with-udev-dir=/usr/lib/udev \
+    --with-resolvconf=/usr/bin/resolvconf \
+    --with-session-tracking=systemd \
+    --with-modem-manager-1 \
+    --disable-static \
+    --enable-more-warnings=no \
+    --disable-wimax \
+    --enable-modify-system \
+    --enable-doc
+
+  make
+}
+
+package() {
+  cd $_pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
+  install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
+
+  rm -r "$pkgdir/var/run"
+}

Deleted: extra-i686/disable_set_hostname.patch
===================================================================
--- extra-i686/disable_set_hostname.patch	2013-10-11 11:01:29 UTC (rev 196311)
+++ extra-i686/disable_set_hostname.patch	2013-10-11 11:02:08 UTC (rev 196312)
@@ -1,19 +0,0 @@
-diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c
---- NetworkManager-0.9.0.orig/src/nm-policy.c	2011-08-23 06:41:02.099686450 +0000
-+++ NetworkManager-0.9.0/src/nm-policy.c	2011-08-23 06:43:38.227791737 +0000
-@@ -302,6 +302,7 @@
- 		return;
- 	}
- 
-+#if 0
- 	/* Try automatically determined hostname from the best device's IP config */
- 	if (!best4)
- 		best4 = get_best_ip4_device (policy->manager, &best_req4);
-@@ -356,6 +357,7 @@
- 		}
- 	}
- 
-+#endif
- 	/* If no automatically-configured hostname, try using the hostname from
- 	 * when NM started up.
- 	 */

Copied: networkmanager/repos/extra-i686/disable_set_hostname.patch (from rev 196310, networkmanager/trunk/disable_set_hostname.patch)
===================================================================
--- extra-i686/disable_set_hostname.patch	                        (rev 0)
+++ extra-i686/disable_set_hostname.patch	2013-10-11 11:02:08 UTC (rev 196312)
@@ -0,0 +1,19 @@
+diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c
+--- NetworkManager-0.9.0.orig/src/nm-policy.c	2011-08-23 06:41:02.099686450 +0000
++++ NetworkManager-0.9.0/src/nm-policy.c	2011-08-23 06:43:38.227791737 +0000
+@@ -302,6 +302,7 @@
+ 		return;
+ 	}
+ 
++#if 0
+ 	/* Try automatically determined hostname from the best device's IP config */
+ 	if (!best4)
+ 		best4 = get_best_ip4_device (policy->manager, &best_req4);
+@@ -356,6 +357,7 @@
+ 		}
+ 	}
+ 
++#endif
+ 	/* If no automatically-configured hostname, try using the hostname from
+ 	 * when NM started up.
+ 	 */

Deleted: extra-i686/networkmanager.install
===================================================================
--- extra-i686/networkmanager.install	2013-10-11 11:01:29 UTC (rev 196311)
+++ extra-i686/networkmanager.install	2013-10-11 11:02:08 UTC (rev 196312)
@@ -1,9 +0,0 @@
-post_upgrade() {
-  (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG
-ATTENTION:
-  /etc/NetworkManager/nm-system-settings.conf has been replaced
-  by /etc/NetworkManager/NetworkManager.conf. Make sure you move
-  any custom settings to the new config file.
-MSG
-  true
-}

Copied: networkmanager/repos/extra-i686/networkmanager.install (from rev 196310, networkmanager/trunk/networkmanager.install)
===================================================================
--- extra-i686/networkmanager.install	                        (rev 0)
+++ extra-i686/networkmanager.install	2013-10-11 11:02:08 UTC (rev 196312)
@@ -0,0 +1,9 @@
+post_upgrade() {
+  (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG
+ATTENTION:
+  /etc/NetworkManager/nm-system-settings.conf has been replaced
+  by /etc/NetworkManager/NetworkManager.conf. Make sure you move
+  any custom settings to the new config file.
+MSG
+  true
+}

Deleted: extra-x86_64/NetworkManager.conf
===================================================================
--- extra-x86_64/NetworkManager.conf	2013-10-11 11:01:29 UTC (rev 196311)
+++ extra-x86_64/NetworkManager.conf	2013-10-11 11:02:08 UTC (rev 196312)
@@ -1,2 +0,0 @@
-[main]
-plugins=keyfile

Copied: networkmanager/repos/extra-x86_64/NetworkManager.conf (from rev 196310, networkmanager/trunk/NetworkManager.conf)
===================================================================
--- extra-x86_64/NetworkManager.conf	                        (rev 0)
+++ extra-x86_64/NetworkManager.conf	2013-10-11 11:02:08 UTC (rev 196312)
@@ -0,0 +1,2 @@
+[main]
+plugins=keyfile

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-10-11 11:01:29 UTC (rev 196311)
+++ extra-x86_64/PKGBUILD	2013-10-11 11:02:08 UTC (rev 196312)
@@ -1,74 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Maintainer: Jan de Groot <jgc at archlinxu.org>
-# Contributor: Wael Nasreddine <gandalf at siemens-mobiles.org>
-# Contributor: Tor Krill <tor at krill.nu>
-# Contributor: Will Rea <sillywilly at gmail.com>
-# Contributor: Valentine Sinitsyn <e_val at inbox.ru>
-
-pkgname=networkmanager
-_pkgname=NetworkManager
-pkgver=0.9.8.6
-pkgrel=1
-pkgdesc="Network Management daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/$_pkgname/"
-depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant dhcp-client
-         libsoup systemd modemmanager)
-makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc git)
-optdepends=('dhclient: DHCPv6 support'
-            'dnsmasq: Connection sharing'
-            'bluez: Bluetooth support'
-            'openresolv: resolvconf support'
-            'ppp: Dialup connection support')
-options=('!libtool')
-backup=('etc/NetworkManager/NetworkManager.conf')
-install=networkmanager.install
-#source=(git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=93c1041
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
-        NetworkManager.conf disable_set_hostname.patch)
-sha256sums=('2289800de66fd7f8c141e029923beb39f43952e442b3cb864e3bf73b26c0c369'
-            '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
-            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
-
-prepare() {
-  cd $_pkgname-$pkgver
-  patch -Np1 -i ../disable_set_hostname.patch
-}
-
-build() {
-  cd $_pkgname-$pkgver
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/networkmanager \
-    --sbindir=/usr/bin \
-    --with-crypto=nss \
-    --with-dhclient=/usr/bin/dhclient \
-    --with-dhcpcd=/usr/bin/dhcpcd \
-    --with-iptables=/usr/bin/iptables \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system \
-    --with-udev-dir=/usr/lib/udev \
-    --with-resolvconf=/usr/bin/resolvconf \
-    --with-session-tracking=systemd \
-    --with-modem-manager-1 \
-    --disable-static \
-    --enable-more-warnings=no \
-    --disable-wimax \
-    --enable-modify-system \
-    --enable-doc
-
-  make
-}
-
-package() {
-  cd $_pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
-  install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
-
-  rm -r "$pkgdir/var/run"
-}

Copied: networkmanager/repos/extra-x86_64/PKGBUILD (from rev 196311, networkmanager/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-10-11 11:02:08 UTC (rev 196312)
@@ -0,0 +1,74 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Jan de Groot <jgc at archlinxu.org>
+# Contributor: Wael Nasreddine <gandalf at siemens-mobiles.org>
+# Contributor: Tor Krill <tor at krill.nu>
+# Contributor: Will Rea <sillywilly at gmail.com>
+# Contributor: Valentine Sinitsyn <e_val at inbox.ru>
+
+pkgname=networkmanager
+_pkgname=NetworkManager
+pkgver=0.9.8.8
+pkgrel=1
+pkgdesc="Network Management daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org/projects/$_pkgname/"
+depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant dhcp-client
+         libsoup systemd modemmanager)
+makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc git)
+optdepends=('dhclient: DHCPv6 support'
+            'dnsmasq: Connection sharing'
+            'bluez: Bluetooth support'
+            'openresolv: resolvconf support'
+            'ppp: Dialup connection support')
+options=('!libtool')
+backup=('etc/NetworkManager/NetworkManager.conf')
+install=networkmanager.install
+#source=(git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=93c1041
+source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
+        NetworkManager.conf disable_set_hostname.patch)
+sha256sums=('8a0a3de9cd2897f778193aa5f04c8a6f6f87fe07f7a088aab26d2b35baa17a55'
+            '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
+            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
+
+prepare() {
+  cd $_pkgname-$pkgver
+  patch -Np1 -i ../disable_set_hostname.patch
+}
+
+build() {
+  cd $_pkgname-$pkgver
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib/networkmanager \
+    --sbindir=/usr/bin \
+    --with-crypto=nss \
+    --with-dhclient=/usr/bin/dhclient \
+    --with-dhcpcd=/usr/bin/dhcpcd \
+    --with-iptables=/usr/bin/iptables \
+    --with-systemdsystemunitdir=/usr/lib/systemd/system \
+    --with-udev-dir=/usr/lib/udev \
+    --with-resolvconf=/usr/bin/resolvconf \
+    --with-session-tracking=systemd \
+    --with-modem-manager-1 \
+    --disable-static \
+    --enable-more-warnings=no \
+    --disable-wimax \
+    --enable-modify-system \
+    --enable-doc
+
+  make
+}
+
+package() {
+  cd $_pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
+  install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
+
+  rm -r "$pkgdir/var/run"
+}

Deleted: extra-x86_64/disable_set_hostname.patch
===================================================================
--- extra-x86_64/disable_set_hostname.patch	2013-10-11 11:01:29 UTC (rev 196311)
+++ extra-x86_64/disable_set_hostname.patch	2013-10-11 11:02:08 UTC (rev 196312)
@@ -1,19 +0,0 @@
-diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c
---- NetworkManager-0.9.0.orig/src/nm-policy.c	2011-08-23 06:41:02.099686450 +0000
-+++ NetworkManager-0.9.0/src/nm-policy.c	2011-08-23 06:43:38.227791737 +0000
-@@ -302,6 +302,7 @@
- 		return;
- 	}
- 
-+#if 0
- 	/* Try automatically determined hostname from the best device's IP config */
- 	if (!best4)
- 		best4 = get_best_ip4_device (policy->manager, &best_req4);
-@@ -356,6 +357,7 @@
- 		}
- 	}
- 
-+#endif
- 	/* If no automatically-configured hostname, try using the hostname from
- 	 * when NM started up.
- 	 */

Copied: networkmanager/repos/extra-x86_64/disable_set_hostname.patch (from rev 196311, networkmanager/trunk/disable_set_hostname.patch)
===================================================================
--- extra-x86_64/disable_set_hostname.patch	                        (rev 0)
+++ extra-x86_64/disable_set_hostname.patch	2013-10-11 11:02:08 UTC (rev 196312)
@@ -0,0 +1,19 @@
+diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c
+--- NetworkManager-0.9.0.orig/src/nm-policy.c	2011-08-23 06:41:02.099686450 +0000
++++ NetworkManager-0.9.0/src/nm-policy.c	2011-08-23 06:43:38.227791737 +0000
+@@ -302,6 +302,7 @@
+ 		return;
+ 	}
+ 
++#if 0
+ 	/* Try automatically determined hostname from the best device's IP config */
+ 	if (!best4)
+ 		best4 = get_best_ip4_device (policy->manager, &best_req4);
+@@ -356,6 +357,7 @@
+ 		}
+ 	}
+ 
++#endif
+ 	/* If no automatically-configured hostname, try using the hostname from
+ 	 * when NM started up.
+ 	 */

Deleted: extra-x86_64/networkmanager.install
===================================================================
--- extra-x86_64/networkmanager.install	2013-10-11 11:01:29 UTC (rev 196311)
+++ extra-x86_64/networkmanager.install	2013-10-11 11:02:08 UTC (rev 196312)
@@ -1,9 +0,0 @@
-post_upgrade() {
-  (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG
-ATTENTION:
-  /etc/NetworkManager/nm-system-settings.conf has been replaced
-  by /etc/NetworkManager/NetworkManager.conf. Make sure you move
-  any custom settings to the new config file.
-MSG
-  true
-}

Copied: networkmanager/repos/extra-x86_64/networkmanager.install (from rev 196311, networkmanager/trunk/networkmanager.install)
===================================================================
--- extra-x86_64/networkmanager.install	                        (rev 0)
+++ extra-x86_64/networkmanager.install	2013-10-11 11:02:08 UTC (rev 196312)
@@ -0,0 +1,9 @@
+post_upgrade() {
+  (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG
+ATTENTION:
+  /etc/NetworkManager/nm-system-settings.conf has been replaced
+  by /etc/NetworkManager/NetworkManager.conf. Make sure you move
+  any custom settings to the new config file.
+MSG
+  true
+}




More information about the arch-commits mailing list