Merge lp:~logan/ubuntu/quantal/phoneuid/debian-merge into lp:ubuntu/quantal/phoneuid

[Logan Rosen]

[Daniel Holbach (dholbach)]

Good work.

review: Approve

[Daniel Holbach (dholbach)]

Unfortunately the build succeeded on my amd64 pbuilder, but not on the i386 Launchpad builder: https://launchpadlibrarian.net/116501611/buildlog_ubuntu-quantal-i386.phoneuid_0.1%2Bgit20110506-2ubuntu1_FAILEDTOBUILD.txt.gz

Can you check what's going on there?

review: Needs Fixing

[Logan Rosen (logan)]

Looks like it was fixed by Matthias: https://launchpad.net/ubuntu/+source/phoneuid/0.1+git20110506-2ubuntu2

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-17 20:23:33 +0000
+++ debian/changelog	2012-09-17 21:56:33 +0000
@@ -1,3 +1,22 @@
+phoneuid (0.1+git20110506-2ubuntu1) quantal; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/patches/as-needed.patch:
+      + Correct link order to allow linking with --as-needed
+    - debian/patches/dont-use-deprecated-g_thread_init.patch:
+      + calling g_thread_init is deprecated, g_type_init already does
+        that
+
+ -- Logan Rosen <[e-mail]>  Mon, 17 Sep 2012 17:46:41 -0400
+
+phoneuid (0.1+git20110506-2) unstable; urgency=low
+
+  * update debian/copyright to use copyright format 1.0
+  * bump debian standards version to 3.9.3
+  * add manpage for phoneuid 
+
+ -- Sebastian Reichel <[e-mail]>  Tue, 08 May 2012 14:46:59 +0200
+
 phoneuid (0.1+git20110506-1ubuntu1) precise; urgency=low
 
   * Merge from debian/unstable

=== modified file 'debian/control'
--- debian/control	2011-12-17 20:23:33 +0000
+++ debian/control	2012-09-17 21:56:33 +0000
@@ -11,7 +11,7 @@
                libphone-ui-dev (>= 1:0.0.1+git20110825),
                libshr-glib-dev,
                quilt
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://www.shr-project.org
 Vcs-git: git://git.debian.org/pkg-fso/phoneuid.git
 Vcs-browser: http://git.debian.org/?p=pkg-fso/phoneuid.git

=== modified file 'debian/copyright'
--- debian/copyright	2011-12-14 23:22:41 +0000
+++ debian/copyright	2012-09-17 21:56:33 +0000
@@ -1,5 +1,5 @@
-Format: http://dep.debian.net/deps/dep5/
-Source: http://git.shr-project.org/git/?p=phonefsod.git
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://git.shr-project.org/git/?p=phoneuid.git
 
 Files: *
 Copyright: 2009, Julien Cassignol <[e-mail]>

=== added file 'debian/manpages'
--- debian/manpages	1970-01-01 00:00:00 +0000
+++ debian/manpages	2012-09-17 21:56:33 +0000
@@ -0,0 +1,1 @@
+debian/phoneuid.1

=== added file 'debian/phoneuid.1'
--- debian/phoneuid.1	1970-01-01 00:00:00 +0000
+++ debian/phoneuid.1	2012-09-17 21:56:33 +0000
@@ -0,0 +1,31 @@
+.TH PHONEUID 1 "May 08, 2012"
+.\" Please adjust this date whenever revising the manpage.
+.SH NAME
+phoneuid \- SHR's daemon for user interaction
+.SH SYNOPSIS
+.B phoneuid
+.RB [OPTION]...
+.SH DESCRIPTION
+phoneuid provides the graphical user interface for basic phone utilities:
+
+ * dialer
+ * contacts
+ * messages
+ * phone log
+ * settings
+
+The daemon loads the frontend from plugins (e.g. GTK, QT, ...), but
+currently only an elementary version exists. The UI itself can be
+displayed by requesting it via DBus from phoneuid. This can be done
+automatically by phonefsod (e.g. on call), or manually with the
+binaries from phoneui-apps.
+
+The daemon is configured with the file /etc/phoneuid.conf, its logfile
+can be found under /var/log/phoneuid.log
+.SH SEE ALSO
+.B phonefsod(1)
+.SH AUTHOR
+phonefsod was written by the SHR team.
+.PP
+This manual page was written by Sebastian Reichel <[e-mail]>,
+for the Debian project (but may be used by others).