Merge mbiebl's packaging

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2304 ceb527fc-18e6-0310-9fe2-813c157c29e7

1 files changed, 0 insertions, 8 deletions

diff --git a/debian/copyright b/debian/copyright
index 8813c529..d940e36d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -22,9 +22,6 @@ License:
     License along with this package; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-libnm-util/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.
-
 src/nm-netlink-monitor.c is copyright of Ray Strode, David Zeuthen, <david@fubar.dk> and
 Novell, Inc. and it's released under the terms of the  GNU General Public License.
 (see below).
@@ -63,11 +60,6 @@ are released under the terms of the GNU General Public License. (see below).
 initscript/Debian/NetworkManager is copyright of <j@bootlab.org>, 
 Mark Roach <mrroach@okmaybe.com>, Thom May <thom@debian.org>
 
-gnome/nm-vpn-properties.c, nm-vpn-properties.h are copyright of 
-David Zeuthen, <davidz@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@redhat.com> and it's released under 
 the terms of the GNU General Public License.