Ubuntu
gwibber package

Merge lp:~ubuntu-branches/ubuntu/precise/gwibber/precise-proposed-201403141826 into lp:ubuntu/precise-proposed/gwibber

  1. Precise (12.04)
  2. precise-proposed-201403141826
  3. Merge into precise-proposed
Proposed by Ubuntu Package Importer
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/precise/gwibber/precise-proposed-201403141826
Merge into: lp:ubuntu/precise-proposed/gwibber
Diff against target: 62 lines (+50/-0) (has conflicts)
2 files modified
debian/patches/lp_1286639.patch (+35/-0)
debian/patches/lp_1287211.patch (+15/-0)
Conflict adding file debian/patches/lp_1286639.patch.  Moved existing file to debian/patches/lp_1286639.patch.moved.
Conflict adding file debian/patches/lp_1287211.patch.  Moved existing file to debian/patches/lp_1287211.patch.moved.
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/precise/gwibber/precise-proposed-201403141826
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+211119@code.launchpad.net

Description of the change

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise-proposed/gwibber reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/gwibber/precise-proposed-201403141826. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

To post a comment you must log in.

Unmerged revisions

138. By Ken VanDine

releasing package gwibber version 3.4.2-0ubuntu2.4

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/patches/lp_1286639.patch'
2--- debian/patches/lp_1286639.patch 1970-01-01 00:00:00 +0000
3+++ debian/patches/lp_1286639.patch 2014-03-14 18:35:29 +0000
4@@ -0,0 +1,35 @@
5+Index: gwibber/gwibber/microblog/plugins/twitter/gtk/twitter/__init__.py
6+===================================================================
7+--- gwibber.orig/gwibber/microblog/plugins/twitter/gtk/twitter/__init__.py 2014-03-03 10:43:51.758768000 -0500
8++++ gwibber/gwibber/microblog/plugins/twitter/gtk/twitter/__init__.py 2014-03-03 14:15:21.240696220 -0500
9+@@ -75,7 +75,7 @@
10+ tokendata = urllib2.urlopen(request.http_url, request.to_postdata()).read()
11+ self.token = oauth.OAuthToken.from_string(tokendata)
12+
13+- url = "http://api.twitter.com/oauth/authorize?oauth_token=" + self.token.key
14++ url = "https://api.twitter.com/oauth/authorize?oauth_token=" + self.token.key
15+
16+ web.load_uri(url)
17+ web.connect("title-changed", self.on_twitter_auth_title_change)
18+@@ -141,7 +141,7 @@
19+ apireq = oauth.OAuthRequest.from_consumer_and_token(
20+ self.consumer, atok,
21+ http_method="GET",
22+- http_url="http://api.twitter.com/1.1/account/verify_credentials.json", parameters=None)
23++ http_url="https://api.twitter.com/1.1/account/verify_credentials.json", parameters=None)
24+
25+ apireq.sign_request(sigmeth, self.consumer, atok)
26+
27+Index: gwibber/gwibber/microblog/plugins/twitter/__init__.py
28+===================================================================
29+--- gwibber.orig/gwibber/microblog/plugins/twitter/__init__.py 2014-03-03 10:43:51.758768000 -0500
30++++ gwibber/gwibber/microblog/plugins/twitter/__init__.py 2014-03-03 13:36:23.656619314 -0500
31+@@ -398,7 +398,7 @@
32+ else: return []
33+
34+ def _search(self, **args):
35+- data = network.Download("http://search.twitter.com/search.json", util.compact(args))
36++ data = network.Download("https://search.twitter.com/search.json", util.compact(args))
37+ data = data.get_json()["results"]
38+
39+ if type(data) != list:
40
41=== renamed file 'debian/patches/lp_1286639.patch' => 'debian/patches/lp_1286639.patch.moved'
42=== added file 'debian/patches/lp_1287211.patch'
43--- debian/patches/lp_1287211.patch 1970-01-01 00:00:00 +0000
44+++ debian/patches/lp_1287211.patch 2014-03-14 18:35:29 +0000
45@@ -0,0 +1,15 @@
46+Index: gwibber/gwibber/microblog/plugins/facebook/__init__.py
47+===================================================================
48+--- gwibber.orig/gwibber/microblog/plugins/facebook/__init__.py 2014-03-03 13:29:32.000891000 -0500
49++++ gwibber/gwibber/microblog/plugins/facebook/__init__.py 2014-03-03 13:30:17.668607273 -0500
50+@@ -221,9 +221,9 @@
51+ m["likes"] = {}
52+ m["likes"]["liked"] = False
53+ if isinstance(data["likes"], dict):
54+- m["likes"]["count"] = data["likes"]["count"]
55+ if data["likes"].has_key("data"):
56+ m["likes"]["data"] = data["likes"]["data"]
57++ m["likes"]["count"] = len(data["likes"]["data"])
58+ for d in m["likes"]["data"]:
59+ if self.user_id == str(d["id"]):
60+ m["likes"]["liked"] = True
61
62=== renamed file 'debian/patches/lp_1287211.patch' => 'debian/patches/lp_1287211.patch.moved'

Subscribers

People subscribed via source and target branches

to all changes: