Merge lp:~arky/ubuntu/karmic/tsclient/fix-426705 into lp:ubuntu/karmic/tsclient

Proposed by arky on 2009-09-09
Status: Merged
Merged at revision: not available
Proposed branch: lp:~arky/ubuntu/karmic/tsclient/fix-426705
Merge into: lp:ubuntu/karmic/tsclient
Diff against target: None lines
To merge this branch: bzr merge lp:~arky/ubuntu/karmic/tsclient/fix-426705
Reviewer Review Type Date Requested Status
James Westby (community) 2009-09-09 Needs Information on 2009-09-16
Review via email: mp+11429@code.launchpad.net
To post a comment you must log in.
arky (arky) wrote :
James Westby (james-w) wrote :

> Fixes bug 426705

There are more changes than just the website address in the diff,
is that intentional?

Thanks,

James

James Westby (james-w) :
review: Needs Information
arky (arky) wrote :

> There are more changes than just the website address in the diff,
> is that intentional?
>

No, Don't know how that got in there, looks like I may have added a 'space' somewhere.

James Westby (james-w) wrote :

>
> > There are more changes than just the website address in the diff,
> > is that intentional?
> >
>
> No, Don't know how that got in there, looks like I may have added a 'space'
> somewhere.

Also, your email address in the changelog is invalid, you need to fix
that to correctly get the credit for the upload.

You may want to check set DEBEMAIL in your ~/.bashrc so that the tools
choose the right email automatically.

Thanks,

James

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-07-14 13:29:55 +0000
3+++ debian/changelog 2009-09-09 12:40:03 +0000
4@@ -1,3 +1,9 @@
5+tsclient (0.150-2ubuntu2) karmic; urgency=low
6+
7+ * Updated project website URL (LP: #426705)
8+
9+ -- iise <iise@karmic-kola> Wed, 09 Sep 2009 18:06:44 +0530
10+
11 tsclient (0.150-2ubuntu1) karmic; urgency=low
12
13 * Merge with Debian unstable, remaining changes (LP: #399107)
14
15=== modified file 'src/support.c'
16--- src/support.c 2007-11-07 23:24:42 +0000
17+++ src/support.c 2009-09-09 12:40:03 +0000
18@@ -459,14 +459,14 @@
19
20 // Extra Options
21 if (rdp->audiomode == 0) {
22- sprintf(buffer, "-rsound:local");
23- c_argv[c_argc++] = g_strdup (buffer);
24- } else if (rdp->audiomode == 1) {
25- sprintf(buffer, "-rsound:remote");
26- c_argv[c_argc++] = g_strdup (buffer);
27- } else {
28- sprintf(buffer, "-rsound:off");
29- c_argv[c_argc++] = g_strdup (buffer);
30+ sprintf(buffer, "-rsound:local");
31+ c_argv[c_argc++] = g_strdup (buffer);
32+ } else if (rdp->audiomode == 1) {
33+ sprintf(buffer, "-rsound:remote");
34+ c_argv[c_argc++] = g_strdup (buffer);
35+ } else {
36+ sprintf(buffer, "-rsound:off");
37+ c_argv[c_argc++] = g_strdup (buffer);
38 }
39
40 /* clipboard feature, rdesktop 1.5 */
41@@ -1018,7 +1018,7 @@
42 const gchar *name = _("Terminal Server Client");
43 const gchar *copyright = "(C) 2002-2006 Erick Woods\n"
44 "(C) 2007 Jonh Wendell";
45- const gchar *website = "http://www.gnomepro.com/tsclient/";
46+ const gchar *website = "http://tsclient.sourceforge.net/";
47
48 const gchar *authors[] = {
49 "Erick Woods <erick@gnomepro.com>",

Subscribers

People subscribed via source and target branches

to all changes: