[Pkg-utopia-commits] r682 - in packages/experimental/networkmanager/debian: . patches

Michael Biebl mbiebl-guest at costa.debian.org
Tue Feb 28 18:53:55 UTC 2006


Author: mbiebl-guest
Date: 2006-02-28 18:53:55 +0000 (Tue, 28 Feb 2006)
New Revision: 682

Modified:
   packages/experimental/networkmanager/debian/README.Debian
   packages/experimental/networkmanager/debian/copyright
   packages/experimental/networkmanager/debian/patches/dbus_access_network_manager.patch
   packages/experimental/networkmanager/debian/patches/dbus_access_nm_applet.patch
Log:
Merged back changes from unstable branch (copyrigh and usage of group netdev)


Modified: packages/experimental/networkmanager/debian/README.Debian
===================================================================
--- packages/experimental/networkmanager/debian/README.Debian	2006-02-28 18:43:34 UTC (rev 681)
+++ packages/experimental/networkmanager/debian/README.Debian	2006-02-28 18:53:55 UTC (rev 682)
@@ -4,7 +4,7 @@
 main yet, you have to add nm-applet to your session once.
 
 (instructions for gnome only)
-First add yourself to the plugdev group
+First add yourself to the netdev group
 Go to System -> Preferences -> Sessions
 In the Startup Programs tab, click Add
 type "nm-applet", click OK.

Modified: packages/experimental/networkmanager/debian/copyright
===================================================================
--- packages/experimental/networkmanager/debian/copyright	2006-02-28 18:43:34 UTC (rev 681)
+++ packages/experimental/networkmanager/debian/copyright	2006-02-28 18:53:55 UTC (rev 682)
@@ -1,14 +1,101 @@
 This package was debianized by Thom May <thom at debian.org> on
 Sun,  3 Oct 2004 11:54:56 +0100.
 
-It was downloaded from ftp.gnome.org
+It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/NetworkManager 
 
-Upstream Author:
-  Dan Williams <dcbw at redhat.com>
+src/autoip.c, src/autoip.h are copyright of Arthur van Hoff (avh at strangeberry.com)
+and are released under the terms of the GNU Lesser General Public
 
-Copyright: 
-  2004, 2005 Red Hat, Inc.
+License:
 
-This package is licensed under the GPL.  For a description of the GPL, 
-see /usr/share/common-licenses/GPL on your Debian system.
+    This package is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
 
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+src/gnome-keyring-md5.c, gnome-keyring-md5.h is written by Colin Plumb.
+This code is in the public domain; do with it what you wish.
+
+gnome/nm-applet/eggtrayicon.c, eggtrayicon.h are copyright of 
+Anders Carlsson <andersca at gnu.org> and are released under the terms of 
+the GNU Lesser General Public. (see above).
+
+src/nm-netlink-monitor.c is copyright of Ray Strode, David Zeuthen, <david at fubar.dk> and
+Novell, Inc. and it's released under the terms of the  GNU General Public License.
+(see below).
+
+src/nm-netlink-monitor.h is copyright of Ray Strode and it's released under the terms of the
+GNU General Public License. (see below)
+
+src/backends/interface_parser.c, is copyright of Tom Parker <palfrey at tevp.net>
+and it's released under the terms of the GNU General Public License. (see below).
+
+src/backends/NetworkManagerDebian.c is copyright of Matthew Garrett <mjg59 at srcf.ucam.org>
+and it's released under the terms of the GNU General Public License. (see below)
+
+src/backends/NetworkManagerGentoo.c is copyright of Dan Williams <dcbw at redhat.com>,
+Dan Willemsen <dan at willemsen.us>, Robert Paskowitz and it's released under the terms
+of the GNU General Public License. (see below).
+
+src/backends/NetworkManagerSlackware.c, is copyright of
+Narayan Newton <narayan_newton at yahoo.com> and it's released under the terms of
+the GNU General Public License. (see below).
+
+src/backends/NetworkManagerSuSE.c, is copyright of Dan Williams <dcbw at redhat.com>,
+Kay Sievers <kay.sievers at suse.de>, Robert Love <rml at novell.com> and it's released
+under the terms of the GNU General Public License. (see below).
+
+src/backends/shvar.c, shvar.h, are copyright of Red Hat Inc and are released under the terms
+of the GNU General Public License. (see below).
+ 				
+src/named-manager/nm-named-manager.c, nm-named-manager.h, are copyright of
+Colin Walters <walters at redhat.com> and are released under the terms 
+of the GNU General Public License. (see below).
+
+utils/nm-utils.c, nm-utils.h are copyright of Ray Strode <rstrode at redhat.com> and 
+are released under the terms of the GNU General Public License. (see below).
+
+initscript/Debian/NetworkManager is copyright of <j at bootlab.org>, 
+Mark Roach <mrroach at okmaybe.com>, Thom May <thom at debian.org>
+
+gnome/applet/menu-info.c, menu-info.h are copyright of 
+Jonathan Blandford <jrb at redhat.com> and are released under the term of
+the GNU General Public License. (see below).
+
+gnome//nm-vpn-properties.c, nm-vpn-properties.h are copyright of 
+David Zeuthen, <davidz at redhat.com> and are licensed to you
+under your choice of the Academic Free License version 2.0, or the
+GNU General Public License version 2. (see below)
+			 
+The rest of the source (what it's not mentioned here)
+is copyright of Dan Williams <dcbw at redhat.com> and it's released under 
+the terms of the GNU General Public License.
+
+License:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+

Modified: packages/experimental/networkmanager/debian/patches/dbus_access_network_manager.patch
===================================================================
--- packages/experimental/networkmanager/debian/patches/dbus_access_network_manager.patch	2006-02-28 18:43:34 UTC (rev 681)
+++ packages/experimental/networkmanager/debian/patches/dbus_access_network_manager.patch	2006-02-28 18:53:55 UTC (rev 682)
@@ -5,7 +5,7 @@
                  <allow send_interface="org.freedesktop.NetworkManager"/>
          </policy>
 -        <policy at_console="true">
-+        <policy group="plugdev">
++        <policy group="netdev">
                  <allow send_destination="org.freedesktop.NetworkManager"/>
                  <allow send_interface="org.freedesktop.NetworkManager"/>
          </policy>

Modified: packages/experimental/networkmanager/debian/patches/dbus_access_nm_applet.patch
===================================================================
--- packages/experimental/networkmanager/debian/patches/dbus_access_nm_applet.patch	2006-02-28 18:43:34 UTC (rev 681)
+++ packages/experimental/networkmanager/debian/patches/dbus_access_nm_applet.patch	2006-02-28 18:53:55 UTC (rev 682)
@@ -5,7 +5,7 @@
                  <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
  	</policy>
 -	<policy at_console="true">
-+	<policy group="plugdev">
++	<policy group="netdev">
  		<allow own="org.freedesktop.NetworkManagerInfo"/>
  
  		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>




More information about the Pkg-utopia-commits mailing list