[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian, updated. debian/2.31.4-1-5-g2bd0c97

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit d761e469a05ce46a2eba124ed424fd29fc66cc5b
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Mon Jul 12 23:43:46 2010 +0200

    Install manpages provided by upstream

diff --git a/debian/changelog b/debian/changelog
index 7f26c33..00b9c34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 empathy (2.31.5-1) UNRELEASED; urgency=low
 
   * New upstream release
+    - Install manpages provided by upstream
 
- -- Laurent Bigonville <bigon at debian.org>  Mon, 12 Jul 2010 23:42:21 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Tue, 13 Jul 2010 00:22:01 +0200
 
 empathy (2.31.4-1) experimental; urgency=low
 
diff --git a/debian/empathy-accounts.1 b/debian/empathy-accounts.1
deleted file mode 100644
index a1841fc..0000000
--- a/debian/empathy-accounts.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.TH EMPATHY-ACCOUNTS "1" "February 2010" "Telepathy project" "User Commands"
-.SH NAME
-empathy-accounts \- Accounts configuration dialog for Empathy instant messaging client
-.SH SYNOPSIS
-empathy-accounts
-.RI [ options ]
-.SH DESCRIPTION
-Accounts configuration dialog for Empathy instant messaging client
-.PP
-This utility allows you to configure your instant messaging accounts for Empathy.
-.SH OPTIONS
-.TP
-.BR \-i ,\  \-\-import
-Try to import any recognized accounts and display an assistant if that fails
-.TP
-.BR \-h ,\  \-\-hidden
-Don't display any dialogs; do any work (eg, importing) and exit
-.TP
-.BI \-s\  account\-id
-.TQ
-.BI \-\-select\-account= account\-id
-Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)
-.SH AUTHOR
-This manual page was written by
-.MT bigon at debian.org
-Laurent Bigonville
-.ME ,
-for the Debian GNU/Linux system (but may be used by others).
-.SH SEE ALSO
-.BR empathy (1),
-.UR http://telepathy.freedesktop.org/
-The Telepathy project
-.UE ,
-.UR http://live.gnome.org/Empathy
-The Empathy project
-.UE .
diff --git a/debian/empathy.1 b/debian/empathy.1
deleted file mode 100644
index b8b8d63..0000000
--- a/debian/empathy.1
+++ /dev/null
@@ -1,46 +0,0 @@
-.TH EMPATHY "1" "February 2010" "Telepathy project" "User Commands"
-.SH NAME
-empathy \- GNOME multi-protocol chat and call client
-.SH SYNOPSIS
-empathy
-.SH DESCRIPTION
-GNOME multi-protocol chat and call client
-Instant messaging program supporting text, voice, video, file transfers
-and inter-application communication over many different protocols,
-including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
-Gadu-Gadu, Groupwise, ICQ and QQ.
-.PP
-The main user interface consists of a contact list window and an icon in the
-notification area.
-.SH OPTIONS
-.TP
-.BR \-n ,\  \-\-no\-connect
-Don't connect on startup
-.TP
-.BR \-h ,\  \-\-start\-hidden
-Don't display the contact list or any other dialogs on startup
-.TP
-.BR \-v ,\  \-\-version
-Show version
-.SH ENVIRONMENT
-.TP
-.BI EMPATHY_LOGFILE= filename
-If set, debug output will go to the given file rather than to stderr.
-.TP
-.BI EMPATHY_DEBUG= type
-May be set to "all" for full debug output, or various undocumented options
-(which may change from release to release) to filter the output.
-.SH AUTHOR
-This manual page was written by
-.MT bigon at debian.org
-Laurent Bigonville
-.ME ,
-for the Debian GNU/Linux system (but may be used by others).
-.SH SEE ALSO
-.BR empathy-accounts (1),
-.UR http://telepathy.freedesktop.org/
-The Telepathy project
-.UE ,
-.UR http://live.gnome.org/Empathy
-The Empathy project
-.UE .
diff --git a/debian/empathy.install b/debian/empathy.install
index 870dffe..53ddc91 100644
--- a/debian/empathy.install
+++ b/debian/empathy.install
@@ -1,4 +1,5 @@
 usr/bin/
+usr/share/man/man1/
 usr/share/applications/
 usr/share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
 usr/share/telepathy/clients/Empathy.client
diff --git a/debian/empathy.manpages b/debian/empathy.manpages
deleted file mode 100644
index 591b357..0000000
--- a/debian/empathy.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/empathy.1
-debian/empathy-accounts.1

-- 
Empathy packaging