[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, master, updated. debian/1.0.0-2-3-g12ef0e1
Iain Lane
laney at ubuntu.com
Tue Nov 24 14:20:36 UTC 2009
The following commit has been merged in the master branch:
commit 12ef0e1ef7ab1e21195d20e05da473691c26cb58
Author: Iain Lane <laney at ubuntu.com>
Date: Tue Nov 24 14:18:46 2009 +0000
New upstream release 1.0.1
* New upstream release 1.0.1:
- Add support for Ubuntu One and others using OAuth 1.0a (Rodrigo Moya)
- Always show icons for note items in recent notes menu
* debian/patches/02_support_oauth_1.0a.patch: Drop, now upstream
* debian/control: Switch to gmime2.4 - Tomboy got support for this at
0.15.0. (Closes: #556412)
* debian/control: Bump cli-common-dev version requirement to that which
provides the DH7 integration
diff --git a/debian/changelog b/debian/changelog
index 1e08f98..e36991e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+tomboy (1.0.1-1) UNRELEASED; urgency=low
+
+ * New upstream release 1.0.1:
+ - Add support for Ubuntu One and others using OAuth 1.0a (Rodrigo Moya)
+ - Always show icons for note items in recent notes menu
+ * debian/patches/02_support_oauth_1.0a.patch: Drop, now upstream
+ * debian/control: Switch to gmime2.4 - Tomboy got support for this at
+ 0.15.0. (Closes: #556412)
+ * debian/control: Bump cli-common-dev version requirement to that which
+ provides the DH7 integration
+
+ -- Iain Lane <laney at ubuntu.com> Tue, 24 Nov 2009 14:17:51 +0000
+
tomboy (1.0.0-2) unstable; urgency=low
[ Iain Lane ]
diff --git a/debian/control b/debian/control
index f0e575b..b5bd480 100644
--- a/debian/control
+++ b/debian/control
@@ -16,11 +16,11 @@ Build-Depends: debhelper (>= 7.0.50),
libgnomepanel2.24-cil,
libgtkspell-dev (>= 2.0.9),
libpanel-applet2-dev,
- cli-common-dev (>= 0.4.4),
+ cli-common-dev (>= 0.5.7),
imagemagick,
libgtk2.0-dev (>= 2.14.0),
libatk1.0-dev (>= 1.2.4),
- libgmime2.2a-cil,
+ libgmime2.4-cil,
gnome-doc-utils (>= 0.3.2),
scrollkeeper,
libmono-cairo2.0-cil,
diff --git a/debian/patches/02_support_oauth_1.0a.patch b/debian/patches/02_support_oauth_1.0a.patch
deleted file mode 100644
index 12aab5c..0000000
--- a/debian/patches/02_support_oauth_1.0a.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-Index: tomboy.git/Tomboy/Addins/WebSyncService/Api/OAuth.cs
-===================================================================
---- tomboy.git.orig/Tomboy/Addins/WebSyncService/Api/OAuth.cs 2009-09-24 13:58:41.469760425 +0100
-+++ tomboy.git/Tomboy/Addins/WebSyncService/Api/OAuth.cs 2009-10-07 16:00:52.064108681 +0100
-@@ -45,7 +45,7 @@
- #region Constructor
- public OAuth ()
- {
-- Debugging = false;
-+ Debugging = true;
- }
- #endregion
-
-@@ -192,8 +192,11 @@
- var outUrl = string.Empty;
- List<IQueryParameter<string>> parameters = null;
-
-+ string callbackUrl = string.Empty;
-+ if (url.StartsWith (RequestTokenBaseUrl) || url.StartsWith (AccessTokenBaseUrl))
-+ callbackUrl = CallbackUrl;
- var sig = GenerateSignature (uri, ConsumerKey, ConsumerSecret, Token, TokenSecret, Verifier, method,
-- timeStamp, nonce, out outUrl, out parameters);
-+ timeStamp, nonce, callbackUrl, out outUrl, out parameters);
-
- if (Debugging)
- Logger.Debug ("Generated signature {0}", sig);
-Index: tomboy.git/Tomboy/Addins/WebSyncService/OAuth/Base.cs
-===================================================================
---- tomboy.git.orig/Tomboy/Addins/WebSyncService/OAuth/Base.cs 2009-09-24 13:58:41.469760425 +0100
-+++ tomboy.git/Tomboy/Addins/WebSyncService/OAuth/Base.cs 2009-10-07 16:00:52.084146564 +0100
-@@ -159,7 +159,8 @@
- /// <param name="signatureType">The signature type. To use the default values use <see cref="SignatureType">SignatureType</see>.</param>
- /// <returns>The signature base.</returns>
- private string GenerateSignatureBase (Uri url, string consumerKey, string token, string tokenSecret, string verifier,
-- RequestMethod method, TimeSpan timeStamp, string nonce, SignatureType signatureType, out string normalizedUrl,
-+ RequestMethod method, TimeSpan timeStamp, string nonce, SignatureType signatureType, string callbackUrl,
-+ out string normalizedUrl,
- out List<IQueryParameter<string>> parameters)
- {
- log.LogDebug ("Generating signature base for OAuth request.");
-@@ -196,6 +197,7 @@
-
- if (!string.IsNullOrEmpty (token)) parameters.Add (new QueryParameter<string> (OAuthTokenKey, token, s => string.IsNullOrEmpty (s)));
- if (!string.IsNullOrEmpty (verifier)) parameters.Add (new QueryParameter<string> (OAuthVerifierKey, verifier, s => string.IsNullOrEmpty (s)));
-+ if (!string.IsNullOrEmpty (callbackUrl)) parameters.Add (new QueryParameter<string> (OAuthCallbackKey, UrlEncode (callbackUrl), s => string.IsNullOrEmpty (s)));
-
- log.LogDebug ("Normalizing URL for signature.");
-
-@@ -251,12 +253,13 @@
- /// <param name="httpMethod">The HTTP method used. Must be valid HTTP method verb (POST, GET, PUT, etc).</param>
- /// <returns>A Base64 string of the hash value.</returns>
- protected string GenerateSignature (Uri url, string consumerKey, string consumerSecret, string token,
-- string tokenSecret, string verifier, RequestMethod method, TimeSpan timeStamp, string nonce, out string normalizedUrl,
-- out List<IQueryParameter<string>> parameters)
-+ string tokenSecret, string verifier, RequestMethod method, TimeSpan timeStamp, string nonce,
-+ string callbackUrl, out string normalizedUrl,
-+ out List<IQueryParameter<string>> parameters)
- {
- log.LogDebug ("Generating signature using HMAC-SHA1 algorithm.");
- return GenerateSignature (url, consumerKey, consumerSecret, token, tokenSecret, verifier, method, timeStamp, nonce,
-- SignatureType.HMACSHA1, out normalizedUrl, out parameters);
-+ SignatureType.HMACSHA1, callbackUrl, out normalizedUrl, out parameters);
- }
-
- /// <summary>
-@@ -272,8 +275,8 @@
- /// <param name="signatureType">The type of signature to use.</param>
- /// <returns>A Base64 string of the hash value.</returns>
- private string GenerateSignature (Uri url, string consumerKey, string consumerSecret, string token,
-- string tokenSecret, string verifier, RequestMethod method, TimeSpan timeStamp, string nonce, SignatureType signatureType,
-- out string normalizedUrl, out List<IQueryParameter<string>> parameters)
-+ string tokenSecret, string verifier, RequestMethod method, TimeSpan timeStamp, string nonce, SignatureType signatureType,
-+ string callbackUrl, out string normalizedUrl, out List<IQueryParameter<string>> parameters)
- {
- log.LogDebug ("Generating signature using signature type {0}", signatureType);
-
-@@ -288,7 +291,8 @@
- return signature;
- case SignatureType.HMACSHA1:
- string signatureBase = GenerateSignatureBase (url, consumerKey, token, tokenSecret, verifier, method,
-- timeStamp, nonce, SignatureType.HMACSHA1, out normalizedUrl, out parameters);
-+ timeStamp, nonce, SignatureType.HMACSHA1, callbackUrl,
-+ out normalizedUrl, out parameters);
-
- var hmacsha1 = new HMACSHA1 ();
- hmacsha1.Key = Encoding.ASCII.GetBytes (string.Format ("{0}&{1}",
-Index: tomboy.git/Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs
-===================================================================
---- tomboy.git.orig/Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs 2009-09-24 13:58:41.469760425 +0100
-+++ tomboy.git/Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs 2009-10-07 16:00:52.114107121 +0100
-@@ -107,25 +107,24 @@
- }
-
- // TODO: Move this
-- if (Auth == null) {
-- string rootUri = Server + "/api/1.0";
-- try {
-- RootInfo root = RootInfo.GetRoot (rootUri, new Api.AnonymousConnection ());
--
-- Auth = new Api.OAuth ();
-+ if (Auth == null)
-+ Auth = new Api.OAuth ();
-
-- Auth.AuthorizeLocation = root.AuthorizeUrl;
-- Auth.AccessTokenBaseUrl = root.AccessTokenUrl;
-- Auth.RequestTokenBaseUrl = root.RequestTokenUrl;
-- Auth.ConsumerKey = "anyone";
-- Auth.ConsumerSecret = "anyone";
-- Auth.Realm = "Snowy";
-- } catch (Exception e) {
-- Logger.Error ("Failed to get Root resource " + rootUri + ". Exception was: " + e.ToString());
-- authButton.Label = Catalog.GetString ("Server not responding. Try again later.");
-- oauth = null;
-- return;
-- }
-+ string rootUri = Server + "/api/1.0";
-+ try {
-+ RootInfo root = RootInfo.GetRoot (rootUri, new Api.AnonymousConnection ());
-+
-+ Auth.AuthorizeLocation = root.AuthorizeUrl;
-+ Auth.AccessTokenBaseUrl = root.AccessTokenUrl;
-+ Auth.RequestTokenBaseUrl = root.RequestTokenUrl;
-+ Auth.ConsumerKey = "anyone";
-+ Auth.ConsumerSecret = "anyone";
-+ Auth.Realm = "Snowy";
-+ } catch (Exception e) {
-+ Logger.Error ("Failed to get Root resource " + rootUri + ". Exception was: " + e.ToString());
-+ authButton.Label = Catalog.GetString ("Server not responding. Try again later.");
-+ oauth = null;
-+ return;
- }
-
- if (!Auth.IsAccessToken) {
-@@ -159,6 +158,7 @@
- return;
- }
-
-+ Logger.Debug ("Listening on {0} for OAuth callback", callbackUrl);
- string authUrl = string.Empty;
- try {
- authUrl = Auth.GetAuthorizationUrl ();
-@@ -223,7 +223,6 @@
- }
- }, null);
-
-- Logger.Debug ("Listening on {0} for OAuth callback", callbackUrl);
- Logger.Debug ("Launching browser to authorize web sync: " + authUrl);
- authButton.Label = Catalog.GetString ("Authorizing in browser (Press to reset connection)");
- try {
diff --git a/debian/patches/series b/debian/patches/series
index 4a09063..b0814fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
01_dllmaps.patch
-02_support_oauth_1.0a.patch
--
Tomboy - desktop note taking program using Wiki style links
More information about the Pkg-cli-apps-commits
mailing list