10 files changed, 46 insertions, 69 deletions
diff --git a/config.h.in b/config.h.in
index af72a99..c51c213 100644
--- a/config.h.in
+++ b/config.h.in
@@ -8,9 +8,9 @@
  * This program 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Pete Woods <pete.woods@canonical.com>
diff --git a/debian/copyright b/debian/copyright
index 09ddeab..bb88e1d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,37 +1,16 @@
-This package was debianized by:
-
-    Conor Curran <conor.curran@canonical.com> on Fri, 22 Jan 2010 11:36:32 +0000
-
-It was downloaded from:
-
-    https://launchpad.net/indicator-sound
-
-Upstream Author(s):
-
-    Conor Curran <conor.curran@canonical.com>
-
-Copyright:
-
-    Copyright (C) 2010 Canonical Ltd
-
-License:
-
-    This program 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, version 3 of the License.
-
-    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 program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-The Debian packaging is:
-
-    Copyright (C) 2010 Conor Curran <conor.curran@canonical.com>
-
-On Debian systems, the complete text of the GNU General
-Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: indicator-sound
+Maintainer: Indicator Applet Developers <indicator-applet-developers@launchpad.net>
+Source: https://launchpad.net/indicator-sound
+
+Files: *
+Copyright: 2010-2013, Canonical Ltd.
+License: GPL-3
+
+Files: debian/*
+Copyright: 2010 Conor Curran <conor.curran@canonical.com>, Canonical Ltd.
+License: GPL-3
+
+License: GPL-3
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
diff --git a/src/bus-watch-namespace.c b/src/bus-watch-namespace.c
index f20905c..ad4e7ad 100644
--- a/src/bus-watch-namespace.c
+++ b/src/bus-watch-namespace.c
@@ -2,16 +2,15 @@
  * Copyright 2013 Canonical Ltd.
  *
  * This program 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.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
  *
- * This program 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.
+ * This program 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 Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Lars Uebernickel <lars.uebernickel@canonical.com>
diff --git a/src/bus-watch-namespace.h b/src/bus-watch-namespace.h
index 215f6be..cbd3fbc 100644
--- a/src/bus-watch-namespace.h
+++ b/src/bus-watch-namespace.h
@@ -2,16 +2,15 @@
  * Copyright 2013 Canonical Ltd.
  *
  * This program 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.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
  *
- * This program 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.
+ * This program 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 Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Lars Uebernickel <lars.uebernickel@canonical.com>
diff --git a/src/media-player-list.vala b/src/media-player-list.vala
index 75c7bb4..5a12e32 100644
--- a/src/media-player-list.vala
+++ b/src/media-player-list.vala
@@ -8,9 +8,9 @@
  * This program 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authors:
diff --git a/src/media-player.vala b/src/media-player.vala
index bdcea35..da68ac1 100644
--- a/src/media-player.vala
+++ b/src/media-player.vala
@@ -8,9 +8,9 @@
  * This program 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authors:
diff --git a/src/service.vala b/src/service.vala
index 14d4893..5e7120c 100644
--- a/src/service.vala
+++ b/src/service.vala
@@ -8,9 +8,9 @@
  * This program 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authors:
diff --git a/src/sound-menu.vala b/src/sound-menu.vala
index 5a10596..480e1cf 100644
--- a/src/sound-menu.vala
+++ b/src/sound-menu.vala
@@ -8,9 +8,9 @@
  * This program 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authors:
diff --git a/src/volume-control.vala b/src/volume-control.vala
index c6db38c..e994922 100644
--- a/src/volume-control.vala
+++ b/src/volume-control.vala
@@ -8,9 +8,9 @@
  * This program 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authors:
diff --git a/vapi/bus-watcher.vapi b/vapi/bus-watcher.vapi
index 60dacff..8634e25 100644
--- a/vapi/bus-watcher.vapi
+++ b/vapi/bus-watcher.vapi
@@ -2,15 +2,15 @@
  * Copyright 2013 Canonical Ltd.
  *
  * This program 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; version 3.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
  *
  * This program 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: