Merge lp:~ps-jenkins/compiz/latestsnapshot into lp:compiz/0.9.9

Proposed by PS Jenkins bot
Status: Merged
Approved by: PS Jenkins bot
Approved revision: no longer in the source branch.
Merged at revision: 3613
Proposed branch: lp:~ps-jenkins/compiz/latestsnapshot
Merge into: lp:compiz/0.9.9
Diff against target: 52 lines (+31/-1) (has conflicts)
1 file modified
debian/changelog (+31/-1)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~ps-jenkins/compiz/latestsnapshot
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Pending
Compiz Maintainers Pending
Review via email: mp+149346@code.launchpad.net

Commit message

Releasing 1:0.9.9~daily13.02.19-0ubuntu1 to ubuntu

To post a comment you must log in.
lp:~ps-jenkins/compiz/latestsnapshot updated
3613. By PS Jenkins bot

Releasing 1:0.9.9~daily13.02.19-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.

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 2013-02-19 01:06:21 +0000
3+++ debian/changelog 2013-02-19 17:15:43 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 compiz (1:0.9.9~daily13.02.08-0ubuntu5) raring; urgency=low
7
8 * debian/ccp_plugin.patch:
9@@ -29,14 +30,43 @@
10 -- Sam Spilsbury <smspillaz@gmail.com> Thu, 14 Feb 2013 12:45:17 +0800
11
12 compiz (1:0.9.9~daily13.02.08-0ubuntu2) UNRELEASED; urgency=low
13+=======
14+compiz (1:0.9.9~daily13.02.19-0ubuntu1) raring; urgency=low
15+>>>>>>> MERGE-SOURCE
16
17+ [ Sam Spilsbury ]
18 * debian/patches/100_workaround_virtualbox_hang.patch
19 - VirtualBox uses a shared-memory texture_from_pixmap_implementation
20 which is not compatible with our server grab usage, so force
21 a different bind method when running with virtualbox and binding
22 an externally managed texture
23
24- -- Sam Spilsbury <smspillaz@gmail.com> Sun, 17 Feb 2013 10:26:40 +0800
25+ [ Brandon Schaefer ]
26+ * Unity rendered behind windows (LP: #906231)
27+
28+ [ MC Return ]
29+ * unmaximize_window_key instead of unmaximize_or_minimize_window_key
30+ exposed in g-c-c (LP: #1115128)
31+
32+ [ Sam Spilsbury ]
33+ * [needs-packaging] Please upload: esvn merged (LP: #112433)
34+ * [nvidia] Windows appear blank white (LP: #729979)
35+ * Threads not found on CI (LP: #1124133)
36+ * Unity rendered behind windows (LP: #906231)
37+ * Compiz hangs in glXBindTexImageEXT in VirtualBox (LP: #1127866)
38+ * 1:0.9.8+bzr3319-0ubuntu1 regression: keeps setting gsettings keys to
39+ wrong values (LP: #1063617)
40+ * Creating windows above just-destroyed windows causes newly created
41+ windows to receive invalid stack positions (LP: #1088399)
42+
43+ [ Marco Trevisan (TreviƱo) ]
44+ * Calling setOptionForPlugin does not work for core options (LP:
45+ #1122228)
46+
47+ [ Automatic PS uploader ]
48+ * Automatic snapshot from revision 3611
49+
50+ -- Automatic PS uploader <ps-jenkins@lists.canonical.com> Tue, 19 Feb 2013 08:46:08 +0000
51
52 compiz (1:0.9.9~daily13.02.08-0ubuntu1) raring; urgency=low
53

Subscribers

People subscribed via source and target branches