Checkbox

Merge lp:~zyga/checkbox/plainbox-releases into lp:checkbox

  1. plainbox-releases
  2. Merge into trunk
Proposed by Zygmunt Krynicki
Status: Merged
Approved by: Zygmunt Krynicki
Approved revision: 2552
Merged at revision: 2581
Proposed branch: lp:~zyga/checkbox/plainbox-releases
Merge into: lp:checkbox
Diff against target: 48 lines (+7/-5)
4 files modified
plainbox/.gitmodules (+0/-3)
plainbox/docs/changelog.rst (+5/-0)
plainbox/plainbox/__init__.py (+1/-1)
plainbox/setup.py (+1/-1)
To merge this branch: bzr merge lp:~zyga/checkbox/plainbox-releases
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Review via email: mp+200011@code.launchpad.net

Description of the change

bf181f3 plainbox: remove ancient .gitmodules
75e02d0 plainbox:contrib: rename .policy files to match action id
da41a03 plainbox: bump to 0.4 final in preparation for final release

This branch fixes two tiny bugs https://bugs.launchpad.net/checkbox/+bug/1263919 and https://bugs.launchpad.net/checkbox/+bug/1263912

To post a comment you must log in.
lp:~zyga/checkbox/plainbox-releases updated
2551. By Zygmunt Krynicki

plainbox:docs: update changelog for release

Signed-off-by: Zygmunt Krynicki <email address hidden>

2552. By Zygmunt Krynicki

plainbox: bump to 0.4 final in preparation for final release

Signed-off-by: Zygmunt Krynicki <email address hidden>

Revision history for this message
Zygmunt Krynicki (zyga) wrote :

self approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'plainbox/.gitmodules'
2--- plainbox/.gitmodules 2012-12-03 16:15:23 +0000
3+++ plainbox/.gitmodules 1970-01-01 00:00:00 +0000
4@@ -1,3 +0,0 @@
5-[submodule "checkbox"]
6- path = checkbox
7- url = git://github.com/zyga/checkbox
8
9=== renamed file 'plainbox/contrib/policykit_auth_admin_keep/org.freedesktop.policykit.pkexec.policy' => 'plainbox/contrib/policykit_auth_admin_keep/org.freedesktop.policykit.pkexec.run-plainbox-job.policy'
10=== renamed file 'plainbox/contrib/policykit_yes/org.freedesktop.policykit.pkexec.policy' => 'plainbox/contrib/policykit_yes/org.freedesktop.policykit.pkexec.run-plainbox-job.policy'
11=== modified file 'plainbox/docs/changelog.rst'
12--- plainbox/docs/changelog.rst 2013-12-02 17:31:52 +0000
13+++ plainbox/docs/changelog.rst 2013-12-24 12:59:40 +0000
14@@ -6,6 +6,11 @@
15 accounting of development history please inspect the source history
16 directly.
17
18+PlainBox 0.4
19+^^^^^^^^^^^^
20+
21+* Bugfixes: https://launchpad.net/checkbox/+milestone/plainbox-0.4
22+
23 PlainBox 0.4 beta 2
24 ^^^^^^^^^^^^^^^^^^^
25
26
27=== modified file 'plainbox/plainbox/__init__.py'
28--- plainbox/plainbox/__init__.py 2013-12-02 17:31:52 +0000
29+++ plainbox/plainbox/__init__.py 2013-12-24 12:59:40 +0000
30@@ -35,4 +35,4 @@
31 # PEP386 compliant version declaration.
32 #
33 # This is used by @public decorator to enforce our public API guarantees.
34-__version__ = (0, 4, 0, "beta", 2)
35+__version__ = (0, 4, 0, "final", 0)
36
37=== modified file 'plainbox/setup.py'
38--- plainbox/setup.py 2013-12-02 17:31:52 +0000
39+++ plainbox/setup.py 2013-12-24 12:59:40 +0000
40@@ -44,7 +44,7 @@
41
42 setup(
43 name="plainbox",
44- version="0.4b2",
45+ version="0.4",
46 url="https://launchpad.net/checkbox/",
47 packages=find_packages(),
48 author="Zygmunt Krynicki",

Subscribers

People subscribed via source and target branches