Merging in updates from trunks

5 files changed, 83 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 93b70d2..03d6a88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,26 @@ indicator-sus (0.1~ppa7~status1) karmic; urgency=low
 
  -- Ted Gould <ted@ubuntu.com>  Sat, 08 Aug 2009 09:15:44 -0600
 
+indicator-sus (0.1-0ubuntu2) UNRELEASED; urgency=low
+
+  * Fixed Vcs-Bzr location, part of the  indicator-applet project
+  * specify Vcs-Bzr-Browser
+
+ -- Alexander Sack <asac@ubuntu.com>  Tue, 11 Aug 2009 17:26:15 +0200
+
+indicator-sus (0.1-0ubuntu1) karmic; urgency=low
+
+  * Include icons in the tarball
+  * Added license files
+  * Corrected the FSF address
+  * debian/control
+    - Set Homepage and Vcs-Bzr
+  * Added debian/watch 
+  * Changed conflicts for gdm to <= 2.27.4-0ubuntu9
+  * Depend on indicator-applet >= 0.2
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 11 Aug 2009 09:53:56 -0400
+
 indicator-sus (0.1~ppa6) karmic; urgency=low
 
   * debian/control: Conflicting with gdm < 2.27.4-0ubuntu9 or
diff --git a/debian/control b/debian/control
index 1a33a51..223f82e 100644
--- a/debian/control
+++ b/debian/control
@@ -13,11 +13,14 @@ Build-Depends: debhelper (>= 5.0),
                libdbusmenu-gtk-dev,
                libpolkit-gnome-dev,
                intltool
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
+Homepage: https://launchpad.net/indicator-applet
+Vcs-Bzr: lp:~ubuntu-core-dev/indicator-applet/sus-ubuntu
+Vcs-Bzr-Browser: http://bazaar.launchpad.net/~ubuntu-core-dev/indicator-applet/sus-ubuntu
 
 Package: indicator-sus
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, indicator-applet, devicekit-power
-Conflicts: gdm (< 2.27.4-0ubuntu9)
+Depends: ${shlibs:Depends}, ${misc:Depends}, indicator-applet (>= 0.2), devicekit-power, gdm
+Conflicts: gdm (<= 2.27.4-0ubuntu9)
 Description: Applet for the GNOME panel providing various indicators for
  display to users.
diff --git a/debian/copyright b/debian/copyright
index 6e773b6..9a36417 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1 +1,53 @@
-Canonical Copyright
+This package was debianized by Ted Gould <ted@canonical.com> on
+Thu, 06 Aug 2009 17:23:01 +0100.
+
+It was downloaded from https://launchpad.net/indicator-applet
+
+Upstream Author:
+
+    Ted Gould <ted@canonical.com>
+
+Copyright:
+
+    Copyright (C) 2009 Canonical Ltd
+    Copyright (C) 2004 Gustavo Noronha Silva
+
+License:
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License version 3 as
+    published by the Free Software Foundation.
+ 
+    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 General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Two files (logout-dialog.h logout-dialog.c) are under:
+  
+   This library 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 library 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 library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+   Boston, MA 02110-1301 USA
+
+
+The Debian packaging is:
+
+    Copyright (C) 2009 Ted Gould <ted@canonical.com>
+
+On Debian/Ubuntu systems, the full text of the LGPL v2 can be found in
+`/usr/share/common-licenses/LGPL-2', the full text of the GPL v3 can be
+found in `/usr/share/common-licenses/GPL-3'
diff --git a/debian/rules b/debian/rules
index 22338be..7f46594 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,8 @@ include /usr/share/cdbs/1/class/gnome.mk
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
+DEB_DH_MAKESHLIBS_ARGS = -Xusr/lib/indicators
+
 binary-install/indicator-sus::
 	# remove .a/.la clutter
 	rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.a
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..1e009a4
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+https://launchpad.net/indicator-applet/+download .*/indicator-sus-([0-9.]+)\.tar\.gz