releasing version 0.3.7.1-1

3 files changed, 76 insertions, 61 deletions

diff --git a/debian/changelog b/debian/changelog
index 52d7424..52ee244 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+indicator-session (0.3.7.1-1) experimental; urgency=low
+
+  * Merge from Ubuntu.
+    + Doesn't FTBFS with -Werror.
+      Closes: #625356
+  * Update debian/copyright.
+  * Add lintian override for desktop-command-not-in-package,
+    we need an own xdg-screensaver .desktop file.
+
+ -- Evgeni Golov <evgeni@debian.org>  Sat, 05 Nov 2011 19:02:56 +0100
+
 indicator-session (0.3.7.1-0ubuntu1) precise; urgency=low
 
   * New upstream release.
@@ -238,6 +249,13 @@ indicator-session (0.2.90-0ubuntu1) oneiric; urgency=low
 
  -- Ken VanDine <ken.vandine@canonical.com>  Wed, 22 Jun 2011 12:18:18 -0400
 
+indicator-session (0.2.17-1) unstable; urgency=low
+
+  * Merge new upstream release from Ubuntu.
+  * Standards-Version: 3.9.2
+
+ -- Evgeni Golov <evgeni@debian.org>  Sun, 05 Jun 2011 13:28:54 +0200
+
 indicator-session (0.2.17-0ubuntu1) natty; urgency=low
 
   * New upstream release.
@@ -252,6 +270,16 @@ indicator-session (0.2.16-0ubuntu1) natty; urgency=low
 
  -- Ted Gould <ted@ubuntu.com>  Thu, 07 Apr 2011 12:46:00 -0500
 
+indicator-session (0.2.15-1) unstable; urgency=low
+
+  * Merge from Ubuntu.
+    Closes: #620671
+  * Standards-Version: 3.9.1
+  * Improve package descriptions.
+  * Update debian/copyright to DEP5 rev173.
+
+ -- Evgeni Golov <evgeni@debian.org>  Sun, 03 Apr 2011 14:16:17 +0200
+
 indicator-session (0.2.15-0ubuntu1) natty; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index c81ca89..4f315ca 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: indicator-session
 Section: gnome
 Priority: optional
-Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org>
+Uploaders: Evgeni Golov <evgeni@debian.org>
 Build-Depends: debhelper (>= 5.0),
                cdbs (>= 0.4.41),
                libgtk2.0-dev (>= 2.12.0),
@@ -19,8 +20,8 @@ Build-Depends: debhelper (>= 5.0),
                intltool
 Standards-Version: 3.9.2
 Homepage: https://launchpad.net/indicator-session
-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-session/ubuntu
-Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-session/ubuntu
+Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/indicator-session/debian
+Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/indicator-session/debian
 
 Package: indicator-session
 Architecture: any
@@ -33,7 +34,7 @@ Suggests: lightdm
 Conflicts: gdm (<= 2.27.4-0ubuntu9), indicator-sus
 Replaces: indicator-sus, indicator-me
 Breaks: indicator-me
-Description: Indicator showing session management, status and user switching.
+Description: indicator showing session management, status and user switching
  This indicator is designed to be placed on the right side of a panel and
  give the user easy control for changing their instant message status.  
  Switching to another user.  Starting a guest session.  Or controlling the
@@ -52,11 +53,11 @@ Recommends: indicator-applet (>= 0.2) | indicator-renderer
 Suggests: lightdm
 Conflicts: gdm (<= 2.27.4-0ubuntu9), indicator-sus
 Replaces: indicator-session (<< 0.2.90)
-Description: Indicator showing session management, status and user switching.
+Description: indicator showing session management, status and user switching
  This indicator is designed to be placed on the right side of a panel and
- give the user easy control for changing their instant message status.  
- Switching to another user.  Starting a guest session.  Or controlling the
+ give the user easy control for changing their instant message status,
+ switching to another user, starting a guest session or controlling the
  status of their own session.
  .
- It requires some way to be hosted into a panel.  For the GNOME Panel the
+ It requires some way to be hosted into a panel. For the GNOME Panel the
  appropriate package is indicator-applet-session.
diff --git a/debian/copyright b/debian/copyright
index 9a36417..46cbf0e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,53 +1,39 @@
-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'
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
+Upstream-Name: indicator-session
+Upstream-Contact: Ted Gould <ted@canonical.com>
+Source: https://launchpad.net/indicator-session
+
+Files: *
+Copyright: 2009-2011 Ted Gould <ted@canonical.com>, Canonical Ltd.
+License: GPL-3
+
+Files: gconf-helper.*
+Copyright: 2009-2011 Christoph Korn <c_korn@gmx.de>
+License: GPL-3
+
+Files: gtk-logout-helper.c
+Copyright: 2009-2011 Ted Gould <ted@canonical.com>, Canonical Ltd.
+           2009-2011 Christoph Korn <c_korn@gmx.de>
+License: GPL-3
+
+Files: session-service.c
+Copyright: 2009-2011 Ted Gould <ted@canonical.com>, Canonical Ltd.
+           2009-2011 Christoph Korn <c_korn@gmx.de>
+           2009-2011 Cody Russell <crussell@canonical.com>, Canonical Ltd.
+License: GPL-3
+
+Files: users-service-dbus.*
+Copyright: 2009-2011 Cody Russell <crussell@canonical.com>, Canonical Ltd.
+License: GPL-3
+
+Files: debian/*
+Copyright: 2011 Evgeni Golov <evgeni@debian.org>
+           2009-2011 Ted Gould <ted@canonical.com>, Canonical Ltd.
+           2009-2011 Sebastien Bacher <seb128@ubuntu.com>
+           2009-2011 Ken VanDine <ken.vandine@canonical.com>
+           2009-2011 Martin Pitt <martin.pitt@ubuntu.com>
+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'.