- debian/copyright

    + Remove the copyright notices for files which are now in the nm-applet
      source package.

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

2 files changed, 5 insertions, 10 deletions

diff --git a/debian/changelog b/debian/changelog
index 656772f6..bbc219f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,9 @@ network-manager (0.6.5-1) unstable; urgency=low
       + Exclude nm-vpn-properties from dh_shlibdeps. This is a temporary
         workaround until this binary has also been moved into the nm-applet
         source package.
+    - debian/copyright
+      + Remove the copyright notices for files which are now in the nm-applet
+        source package.
   * debian/patches/20-stable_branch_updates_r2652.patch
     - Pull updates from the stable branch up until revision 2652.
     - Fixes broken link detection and a couple of smaller issues.
diff --git a/debian/copyright b/debian/copyright
index 2cc573e8..8813c529 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -22,13 +22,9 @@ 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
 
-src/gnome-keyring-md5.c, gnome-keyring-md5.h is written by Colin Plumb.
+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.
 
-gnome/nm-applet/eggtrayicon.c, eggtrayicon.h are copyright of 
-Anders Carlsson <andersca@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@fubar.dk> and
 Novell, Inc. and it's released under the terms of the  GNU General Public License.
 (see below).
@@ -67,11 +63,7 @@ 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/applet/menu-info.c, menu-info.h are copyright of 
-Jonathan Blandford <jrb@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 
+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)