Ubuntu

Merge lp:~dobey/ubuntu/natty/libubuntuone/release-0-9-0 into lp:ubuntu/natty/libubuntuone

Proposed by Rodney Dawes on 2011-03-10
Status: Merged
Merged at revision: 83
Proposed branch: lp:~dobey/ubuntu/natty/libubuntuone/release-0-9-0
Merge into: lp:ubuntu/natty/libubuntuone
Diff against target: 232 lines (+34/-33) 6 files modified
To merge this branch: bzr merge lp:~dobey/ubuntu/natty/libubuntuone/release-0-9-0
Reviewer Review Type Date Requested Status
Daniel Holbach Approve on 2011-03-10
Ubuntu branches 2011-03-10 Pending
Review via email: mp+52789@code.launchpad.net
To post a comment you must log in.
Daniel Holbach (dholbach) wrote :

Good work.

review: Approve

Preview Diff

1=== modified file 'config.h.in'
2--- config.h.in 2010-02-16 20:56:56 +0000
3+++ config.h.in 2011-03-10 01:23:54 +0000
4@@ -1,8 +1,5 @@
5 /* config.h.in. Generated from configure.ac by autoheader. */
6
7-/* Define to enable OAuth debugging */
8-#undef DEBUG_OAUTH
9-
10 /* always defined to indicate that i18n is enabled */
11 #undef ENABLE_NLS
12
13
14=== modified file 'configure'
15--- configure 2011-02-16 17:25:49 +0000
16+++ configure 2011-03-10 01:23:54 +0000
17@@ -1,6 +1,6 @@
18 #! /bin/sh
19 # Guess values for system-dependent variables and create Makefiles.
20-# Generated by GNU Autoconf 2.67 for libubuntuone 0.3.11.
21+# Generated by GNU Autoconf 2.67 for libubuntuone 0.9.0.
22 #
23 #
24 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
25@@ -698,8 +698,8 @@
26 # Identity of this package.
27 PACKAGE_NAME='libubuntuone'
28 PACKAGE_TARNAME='libubuntuone'
29-PACKAGE_VERSION='0.3.11'
30-PACKAGE_STRING='libubuntuone 0.3.11'
31+PACKAGE_VERSION='0.9.0'
32+PACKAGE_STRING='libubuntuone 0.9.0'
33 PACKAGE_BUGREPORT=''
34 PACKAGE_URL=''
35
36@@ -1535,7 +1535,7 @@
37 # Omit some internal or obsolete options to make the list less imposing.
38 # This message is too long to be a string in the A/UX 3.1 sh.
39 cat <<_ACEOF
40-\`configure' configures libubuntuone 0.3.11 to adapt to many kinds of systems.
41+\`configure' configures libubuntuone 0.9.0 to adapt to many kinds of systems.
42
43 Usage: $0 [OPTION]... [VAR=VALUE]...
44
45@@ -1605,7 +1605,7 @@
46
47 if test -n "$ac_init_help"; then
48 case $ac_init_help in
49- short | recursive ) echo "Configuration of libubuntuone 0.3.11:";;
50+ short | recursive ) echo "Configuration of libubuntuone 0.9.0:";;
51 esac
52 cat <<\_ACEOF
53
54@@ -1730,7 +1730,7 @@
55 test -n "$ac_init_help" && exit $ac_status
56 if $ac_init_version; then
57 cat <<\_ACEOF
58-libubuntuone configure 0.3.11
59+libubuntuone configure 0.9.0
60 generated by GNU Autoconf 2.67
61
62 Copyright (C) 2010 Free Software Foundation, Inc.
63@@ -2095,7 +2095,7 @@
64 This file contains any messages produced by compilers while
65 running configure, to aid debugging if configure makes a mistake.
66
67-It was created by libubuntuone $as_me 0.3.11, which was
68+It was created by libubuntuone $as_me 0.9.0, which was
69 generated by GNU Autoconf 2.67. Invocation command line was
70
71 $ $0 $@
72@@ -2918,7 +2918,7 @@
73
74 # Define the identity of the package.
75 PACKAGE='libubuntuone'
76- VERSION='0.3.11'
77+ VERSION='0.9.0'
78
79
80 cat >>confdefs.h <<_ACEOF
81@@ -12926,9 +12926,6 @@
82
83 $as_echo "#define HAVE_OAUTH 1" >>confdefs.h
84
85-
86-$as_echo "#define DEBUG_OAUTH 1" >>confdefs.h
87-
88 have_oauth="yes"
89 OAUTH_LIBS="-lm -lcrypto"
90
91@@ -14641,7 +14638,7 @@
92 # report actual input values of CONFIG_FILES etc. instead of their
93 # values after options handling.
94 ac_log="
95-This file was extended by libubuntuone $as_me 0.3.11, which was
96+This file was extended by libubuntuone $as_me 0.9.0, which was
97 generated by GNU Autoconf 2.67. Invocation command line was
98
99 CONFIG_FILES = $CONFIG_FILES
100@@ -14707,7 +14704,7 @@
101 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
102 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
103 ac_cs_version="\\
104-libubuntuone config.status 0.3.11
105+libubuntuone config.status 0.9.0
106 configured by $0, generated by GNU Autoconf 2.67,
107 with options \\"\$ac_cs_config\\"
108
109
110=== modified file 'configure.ac'
111--- configure.ac 2011-02-16 17:24:08 +0000
112+++ configure.ac 2011-03-10 01:23:54 +0000
113@@ -1,4 +1,4 @@
114-AC_INIT([libubuntuone], [0.3.11], [], [libubuntuone])
115+AC_INIT([libubuntuone], [0.9.0], [], [libubuntuone])
116
117 AC_PREREQ([2.59])
118
119@@ -68,7 +68,6 @@
120 AC_CHECK_LIB(crypto, CRYPTO_free, have_oauth_libs="yes", have_oauth_libs="no")
121 if test "x$have_oauth_headers" = "xyes" -a "x$have_oauth_libs" = "xyes"; then
122 AC_DEFINE(HAVE_OAUTH, 1, [Define to build OAUTH signing code])
123- AC_DEFINE(DEBUG_OAUTH, 1, [Define to enable OAuth debugging])
124 have_oauth="yes"
125 OAUTH_LIBS="-lm -lcrypto"
126 AC_SUBST(OAUTH_LIBS)
127
128=== modified file 'data/img/logo.png'
129Binary files data/img/logo.png 2010-04-01 17:42:58 +0000 and data/img/logo.png 2011-03-10 01:23:54 +0000 differ
130=== modified file 'debian/changelog'
131--- debian/changelog 2011-02-16 17:25:49 +0000
132+++ debian/changelog 2011-03-10 01:23:54 +0000
133@@ -1,3 +1,10 @@
134+libubuntuone (0.9.0-0ubuntu1) natty; urgency=low
135+
136+ * New upstream release.
137+ - Don't log oauth information to console (LP: #723297)
138+
139+ -- Rodney Dawes <rodney.dawes@ubuntu.com> Wed, 09 Mar 2011 20:13:12 -0500
140+
141 libubuntuone (0.3.11-0ubuntu1) natty; urgency=low
142
143 * New upstream release.
144
145=== modified file 'libubuntuone/u1-music-store.c'
146--- libubuntuone/u1-music-store.c 2011-01-14 22:24:48 +0000
147+++ libubuntuone/u1-music-store.c 2011-03-10 01:23:54 +0000
148@@ -256,19 +256,9 @@
149 get_url_to_use (U1MusicStore *music_store)
150 {
151 gchar *oauth_consumer_token, *oauth_consumer_secret, *oauth_token = NULL, *oauth_token_secret = NULL, *real_url;
152- const gchar *url_to_use;
153-
154- /* If U1MUSICSTOREURL is defined, use that instead of the real URL */
155- if (! (url_to_use = g_getenv ("U1MUSICSTOREURL")))
156- url_to_use = "https://one.ubuntu.com";
157-
158- if (music_store->priv->base_url != NULL)
159- g_free (music_store->priv->base_url);
160-
161- music_store->priv->base_url = g_strdup (url_to_use);
162
163 /* OAUth sign the URL */
164- if (g_str_has_prefix (url_to_use, "http://localhost") || g_str_has_prefix (url_to_use, "http://127.0.0.1")) {
165+ if (g_str_has_prefix (music_store->priv->base_url, "http://localhost") || g_str_has_prefix (music_store->priv->base_url, "http://127.0.0.1")) {
166 const gchar *oauthfile;
167
168 oauthfile = g_getenv ("OAUTHKEYFILE");
169@@ -519,8 +509,6 @@
170 SoupURI *parsed_uri;
171 gchar *internal_uri;
172
173- g_debug ("navigation requested to %s", webkit_network_request_get_uri (request));
174-
175 /* Remove watching callback for the page */
176 if (music_store->priv->watch_id != 0) {
177 g_source_remove (music_store->priv->watch_id);
178@@ -959,6 +947,7 @@
179 u1_music_store_init (U1MusicStore *music_store)
180 {
181 gchar *new_user_agent;
182+ const gchar *url_to_use;
183 GError *error = NULL;
184
185 if (!g_thread_get_initialized ())
186@@ -968,6 +957,12 @@
187 music_store->priv->watched_downloads = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
188 music_store->priv->syncdaemon = syncdaemon_daemon_new ();
189
190+ /* If U1MUSICSTOREURL is defined, use that instead of the real URL */
191+ if (! (url_to_use = g_getenv ("U1MUSICSTOREURL")))
192+ url_to_use = "https://one.ubuntu.com";
193+
194+ music_store->priv->base_url = g_strdup (url_to_use);
195+
196 /* Initialize DBus */
197 music_store->priv->bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
198 if (error) {
199@@ -1098,6 +1093,12 @@
200 g_return_if_fail (U1_IS_MUSIC_STORE (music_store));
201 g_return_if_fail (url != NULL);
202
203+ /* If the load_real_store callback is set up, disable it first */
204+ if (music_store->priv->idle_cb > 0) {
205+ g_source_remove (music_store->priv->idle_cb);
206+ music_store->priv->idle_cb = 0;
207+ }
208+
209 real_url = g_strdup_printf ("%s%s?forward_on_to_url=%s",
210 music_store->priv->base_url,
211 U1_STORE_URL,
212
213=== modified file 'ltmain.sh'
214--- ltmain.sh 2010-03-08 16:07:58 +0000
215+++ ltmain.sh 2011-03-10 01:23:54 +0000
216@@ -65,7 +65,7 @@
217 # compiler: $LTCC
218 # compiler flags: $LTCFLAGS
219 # linker: $LD (gnu? $with_gnu_ld)
220-# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
221+# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu3
222 # automake: $automake_version
223 # autoconf: $autoconf_version
224 #
225@@ -73,7 +73,7 @@
226
227 PROGRAM=ltmain.sh
228 PACKAGE=libtool
229-VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
230+VERSION="2.2.6b Debian-2.2.6b-2ubuntu3"
231 TIMESTAMP=""
232 package_revision=1.3017
233

Subscribers

People subscribed via source and target branches

to all changes: