Author: megabajt Date: Fri Nov 27 22:39:34 2009 GMT Module: packages Tag: HEAD ---- Log message: - updated for 0.7.2
---- Files affected: packages/NetworkManager: NetworkManager-pld.patch (1.10 -> 1.11) ---- Diffs: ================================================================ Index: packages/NetworkManager/NetworkManager-pld.patch diff -u packages/NetworkManager/NetworkManager-pld.patch:1.10 packages/NetworkManager/NetworkManager-pld.patch:1.11 --- packages/NetworkManager/NetworkManager-pld.patch:1.10 Tue Apr 14 11:07:12 2009 +++ packages/NetworkManager/NetworkManager-pld.patch Fri Nov 27 23:39:28 2009 @@ -1,7 +1,7 @@ -diff -urN NetworkManager-0.7.0/configure.in NetworkManager-0.7.0.new/configure.in ---- NetworkManager-0.7.0/configure.in 2008-11-25 19:57:21.000000000 +0100 -+++ NetworkManager-0.7.0.new/configure.in 2008-11-27 16:12:36.000000000 +0100 -@@ -78,7 +78,7 @@ +diff -urN NetworkManager-0.7.2/configure.ac NetworkManager-0.7.2.new/configure.ac +--- NetworkManager-0.7.2/configure.ac 2009-11-23 20:24:09.000000000 +0100 ++++ NetworkManager-0.7.2.new/configure.ac 2009-11-26 22:05:02.396072295 +0100 +@@ -83,7 +83,7 @@ dnl AC_C_BIGENDIAN @@ -10,7 +10,7 @@ if test "z$with_distro" = "z"; then AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat") AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse") -@@ -89,6 +89,7 @@ +@@ -94,6 +94,7 @@ AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware") AC_CHECK_FILE(/etc/frugalware-release,with_distro="frugalware") AC_CHECK_FILE(/etc/mandriva-release,with_distro="mandriva") @@ -18,7 +18,7 @@ if test "z$with_distro" = "z"; then with_distro=`lsb_release -is` fi -@@ -100,7 +101,7 @@ +@@ -105,7 +106,7 @@ exit 1 else case $with_distro in @@ -27,7 +27,7 @@ *) echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)" exit 1 -@@ -153,6 +154,11 @@ +@@ -158,6 +159,11 @@ AC_DEFINE(TARGET_MANDRIVA, 1, [Define if you have Mandriva]) fi @@ -39,7 +39,7 @@ AC_MSG_CHECKING([Linux Wireless Extensions >= 18]) AC_TRY_COMPILE([#ifndef __user #define __user -@@ -522,6 +528,8 @@ +@@ -513,6 +519,8 @@ initscript/paldo/NetworkManager initscript/Mandriva/Makefile initscript/Mandriva/networkmanager @@ -48,9 +48,9 @@ introspection/Makefile man/Makefile man/NetworkManager.8 -diff -urN NetworkManager-0.7.0/initscript/Makefile.am NetworkManager-0.7.0.new/initscript/Makefile.am ---- NetworkManager-0.7.0/initscript/Makefile.am 2008-09-13 22:47:30.000000000 +0200 -+++ NetworkManager-0.7.0.new/initscript/Makefile.am 2008-11-27 16:00:28.000000000 +0100 +diff -urN NetworkManager-0.7.2/initscript/Makefile.am NetworkManager-0.7.2.new/initscript/Makefile.am +--- NetworkManager-0.7.2/initscript/Makefile.am 2009-08-28 17:53:17.000000000 +0200 ++++ NetworkManager-0.7.2.new/initscript/Makefile.am 2009-11-26 22:05:31.383612264 +0100 @@ -23,3 +23,6 @@ if TARGET_MANDRIVA SUBDIRS += Mandriva @@ -58,19 +58,18 @@ +if TARGET_PLD +SUBDIRS += PLD +endif -diff -urN NetworkManager-0.7.0/initscript/PLD/Makefile.am NetworkManager-0.7.0.new/initscript/PLD/Makefile.am ---- NetworkManager-0.7.0/initscript/PLD/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ NetworkManager-0.7.0.new/initscript/PLD/Makefile.am 2008-11-27 16:00:28.000000000 +0100 -@@ -0,0 +1,6 @@ +diff -urN NetworkManager-0.7.2/initscript/PLD/Makefile.am NetworkManager-0.7.2.new/initscript/PLD/Makefile.am +--- NetworkManager-0.7.2/initscript/PLD/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ NetworkManager-0.7.2.new/initscript/PLD/Makefile.am 2009-11-26 22:06:44.072745786 +0100 +@@ -0,0 +1,5 @@ +EXTRA_DIST = NetworkManager +DISTCLEANFILES = NetworkManager + +initddir = $(sysconfdir)/rc.d/init.d +initd_SCRIPTS = NetworkManager -+ -diff -urN NetworkManager-0.7.0/initscript/PLD/NetworkManager.in NetworkManager-0.7.0.new/initscript/PLD/NetworkManager.in ---- NetworkManager-0.7.0/initscript/PLD/NetworkManager.in 1970-01-01 01:00:00.000000000 +0100 -+++ NetworkManager-0.7.0.new/initscript/PLD/NetworkManager.in 2008-11-27 16:00:28.000000000 +0100 +diff -urN NetworkManager-0.7.2/initscript/PLD/NetworkManager.in NetworkManager-0.7.2.new/initscript/PLD/NetworkManager.in +--- NetworkManager-0.7.2/initscript/PLD/NetworkManager.in 1970-01-01 01:00:00.000000000 +0100 ++++ NetworkManager-0.7.2.new/initscript/PLD/NetworkManager.in 2009-11-26 22:07:27.482742169 +0100 @@ -0,0 +1,74 @@ +#!/bin/sh +# @@ -146,9 +145,23 @@ +esac + +exit $RETVAL -diff -urN NetworkManager-0.7.0/src/backends/NetworkManagerPLD.c NetworkManager-0.7.0.new/src/backends/NetworkManagerPLD.c ---- NetworkManager-0.7.0/src/backends/NetworkManagerPLD.c 1970-01-01 01:00:00.000000000 +0100 -+++ NetworkManager-0.7.0.new/src/backends/NetworkManagerPLD.c 2008-11-27 16:00:28.000000000 +0100 +diff -urN NetworkManager-0.7.2/src/backends/Makefile.am NetworkManager-0.7.2.new/src/backends/Makefile.am +--- NetworkManager-0.7.2/src/backends/Makefile.am 2009-11-23 20:17:47.000000000 +0100 ++++ NetworkManager-0.7.2.new/src/backends/Makefile.am 2009-11-26 22:08:06.086054252 +0100 +@@ -49,6 +49,10 @@ + libnmbackend_la_SOURCES += NetworkManagerMandriva.c + endif + ++if TARGET_PLD ++libnmbackend_la_SOURCES += NetworkManagerPLD.c ++endif ++ + libnmbackend_la_LIBADD += $(DBUS_LIBS) $(GLIB_LIBS) + libnmbackend_la_CPPFLAGS = $(DBUS_CFLAGS) \ + $(GLIB_CFLAGS) \ +diff -urN NetworkManager-0.7.2/src/backends/NetworkManagerPLD.c NetworkManager-0.7.2.new/src/backends/NetworkManagerPLD.c +--- NetworkManager-0.7.2/src/backends/NetworkManagerPLD.c 1970-01-01 01:00:00.000000000 +0100 ++++ NetworkManager-0.7.2.new/src/backends/NetworkManagerPLD.c 2009-11-26 22:10:12.232724504 +0100 @@ -0,0 +1,62 @@ +/* NetworkManager -- Network link manager + * @@ -212,17 +225,3 @@ + } +} + -diff -urN NetworkManager-0.7.1/src/backends/Makefile.am NetworkManager-0.7.1.new/src/backends/Makefile.am ---- NetworkManager-0.7.1/src/backends/Makefile.am 2009-03-03 17:55:47.000000000 +0100 -+++ NetworkManager-0.7.1.new/src/backends/Makefile.am 2009-04-14 10:41:11.893584150 +0200 -@@ -49,6 +49,10 @@ - libnmbackend_la_SOURCES += NetworkManagerMandriva.c - endif - -+if TARGET_PLD -+libnmbackend_la_SOURCES += NetworkManagerPLD.c -+endif -+ - libnmbackend_la_LIBADD += $(DBUS_LIBS) $(GLIB_LIBS) - libnmbackend_la_CPPFLAGS = $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) \ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/NetworkManager/NetworkManager-pld.patch?r1=1.10&r2=1.11&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit